From 547ab3e32770e318b6d21334e4ecf17af2eef3ca Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 9 Jul 2012 03:30:10 -0700 Subject: gnutls: Fix build with automake 1.12.1 Added new patches: avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch gnutls_fix_for_automake_1.12.1.patch more details in patch headers. Signed-off-by: Nitin A Kamble Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 51 ++++++++++++++++++++++ .../gnutls/gnutls_fix_for_automake_1.12.1.patch | 43 ++++++++++++++++++ meta/recipes-support/gnutls/gnutls_2.12.20.bb | 2 + 3 files changed, 96 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch create mode 100644 meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch new file mode 100644 index 0000000000..dde683f26d --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch @@ -0,0 +1,51 @@ +Upsteam-Status: Inappropriate + +automake 1.12.x has depricated AM_PROG_MKDIR_P , and throws a warning for that, +and the warnings are treated as errors becuase of the -Werror parameter. + +These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not +eliminated these depricated macros yet. So disable the treatment of warnings +as errors until gettext is updeated to remove the depricated macros. + +Signed-Off-by: Nitin A Kamble +2012/07/09 + +Index: gnutls-2.12.19/configure.ac +=================================================================== +--- gnutls-2.12.19.orig/configure.ac ++++ gnutls-2.12.19/configure.ac +@@ -26,7 +26,7 @@ AC_INIT([GnuTLS], [2.12.19], [bug-gnutls + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + +Index: gnutls-2.12.19/lib/configure.ac +=================================================================== +--- gnutls-2.12.19.orig/lib/configure.ac ++++ gnutls-2.12.19/lib/configure.ac +@@ -26,7 +26,7 @@ AC_INIT([libgnutls], [2.12.19], [bug-gnu + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + +Index: gnutls-2.12.19/libextra/configure.ac +=================================================================== +--- gnutls-2.12.19.orig/libextra/configure.ac ++++ gnutls-2.12.19/libextra/configure.ac +@@ -26,7 +26,7 @@ AC_INIT([libgnutls-extra], [2.12.19], [b + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + diff --git a/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch b/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch new file mode 100644 index 0000000000..1625255583 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch @@ -0,0 +1,43 @@ +Upsteam-Status: Pending + +Avoids these kind of warnings: +Warning: 'libgnutls.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-Off-by: Nitin A Kamble +Date: 2012/07/09 +Index: gnutls-2.12.19/configure.ac +=================================================================== +--- gnutls-2.12.19.orig/configure.ac ++++ gnutls-2.12.19/configure.ac +@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) + + 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_MSG_RESULT([*** +Index: gnutls-2.12.19/lib/configure.ac +=================================================================== +--- gnutls-2.12.19.orig/lib/configure.ac ++++ gnutls-2.12.19/lib/configure.ac +@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) + + 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_PROG_CC +Index: gnutls-2.12.19/libextra/configure.ac +=================================================================== +--- gnutls-2.12.19.orig/libextra/configure.ac ++++ gnutls-2.12.19/libextra/configure.ac +@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) + + 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_PROG_CC diff --git a/meta/recipes-support/gnutls/gnutls_2.12.20.bb b/meta/recipes-support/gnutls/gnutls_2.12.20.bb index 3a10dbf924..9d33f14bc2 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.20.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.20.bb @@ -5,6 +5,8 @@ PR = "${INC_PR}.2" 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://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 \ " -- cgit 1.2.3-korg