Mercurial > mxe-octave
view src/gnutls-1-fixes.patch @ 2748:3dc2260fa84d
package gnutls: automake 1.12 compatibility
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Thu, 20 Sep 2012 11:48:55 +0200 |
parents | 99516e73b368 |
children | 1a91124dd342 |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 2192552e7e1321b985803eca20a433c19b9384d1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 28 Oct 2011 09:23:41 +0200 Subject: [PATCH 1/4] add missing static library linking diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index c45f8f3..57d0dbb 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system URL: http://www.gnu.org/software/gnutls/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LTLIBNETTLE@ +Libs.private: @LTLIBNETTLE@ @LIBS@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- 1.7.10.4 From b11d2c59f0c8793717d8c718c8d4836fcae86a2b Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 24 Nov 2011 15:06:06 +0100 Subject: [PATCH 2/4] disable doc and test (MXE specific) diff --git a/Makefile.am b/Makefile.am index 0afe4bd..da7436a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests SUBDIRS = gl lib extra po -SUBDIRS += src doc tests +SUBDIRS += src if HAVE_GUILE SUBDIRS += guile -- 1.7.10.4 From 49019993012db5eea6d9b3f37c4d2c9b4c619a8a Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 6 Jun 2012 09:57:24 +0200 Subject: [PATCH 3/4] AM_PROG_AR for automake 1.12 compatibility Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html diff --git a/configure.ac b/configure.ac index 83c3577..6e2897b 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ dnl Checks for programs. AC_PROG_CC AM_PROG_AS AC_PROG_CXX +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) gl_EARLY # For includes/gnutls/gnutls.h.in. -- 1.7.10.4 From 82e1e1d59d357dfdebbe88575a440d0d7675533d Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 18 Jul 2012 00:58:59 +0200 Subject: [PATCH 4/4] relax automake diff --git a/configure.ac b/configure.ac index 6e2897b..024d31e 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.17], [bug-gnutls@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) +AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Wno-override]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_CONFIG_HEADER(config.h) -- 1.7.10.4