Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs.
Signed-off-by: Marko Lindqvist <cazf...@gmail.com> --- .../gnutls/gnutls/obsolete_automake_macros.patch | 39 ++++++++++++++++++++ meta/recipes-support/gnutls/gnutls_2.12.21.bb | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch diff --git a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch new file mode 100644 index 0000000..be01303 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch @@ -0,0 +1,39 @@ +Upstream-Status: Submitted (https://savannah.gnu.org/support/index.php?108219) + +Signed-off-by: Marko Lindqvist <cazf...@gmail.com> +diff -Nurd gnutls-2.12.21/configure.ac gnutls-2.12.21/configure.ac +--- gnutls-2.12.21/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/configure.ac 2013-01-03 07:53:41.662739378 +0200 +@@ -29,7 +29,7 @@ + AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_MSG_RESULT([*** + *** Checking for compilation programs... +diff -Nurd gnutls-2.12.21/lib/configure.ac gnutls-2.12.21/lib/configure.ac +--- gnutls-2.12.21/lib/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/lib/configure.ac 2013-01-03 08:07:38.150721027 +0200 +@@ -29,7 +29,7 @@ + AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_PROG_CC + lgl_EARLY +diff -Nurd gnutls-2.12.21/libextra/configure.ac gnutls-2.12.21/libextra/configure.ac +--- gnutls-2.12.21/libextra/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/libextra/configure.ac 2013-01-03 08:10:56.654716669 +0200 +@@ -29,7 +29,7 @@ + AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_PROG_CC + xgl_EARLY diff --git a/meta/recipes-support/gnutls/gnutls_2.12.21.bb b/meta/recipes-support/gnutls/gnutls_2.12.21.bb index 6b2ef3a..7b4426b 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.21.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.21.bb @@ -1,12 +1,13 @@ require gnutls.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "file://gnutls-openssl.patch \ file://correct_rpl_gettimeofday_signature.patch \ file://configure-fix.patch \ file://gnutls_fix_for_automake_1.12.1.patch \ file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ + file://obsolete_automake_macros.patch \ ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \ file://remove-gets.patch \ " -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
