diff options
| author |   Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-09 03:30:10 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:43:44 +0100 |
| commit | 547ab3e32770e318b6d21334e4ecf17af2eef3ca (patch) | |
| tree | 2316dada3302283cc97af903183c058e087ef2d4 /meta/recipes-support/gnutls/gnutls | |
| parent | 626676ba039bc5d9427665a52cbe40a202a542c8 (diff) | |
| download | openembedded-core-contrib-547ab3e32770e318b6d21334e4ecf17af2eef3ca.tar.gz | |
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 <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls')
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch | 43 |
2 files changed, 94 insertions, 0 deletions
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 <nitin.a.kamble@intel.com> +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 <nitin.a.kamble@intel.com> +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 |