[OE-core] [PATCH 28/40] gnutls: fix build with automake 1.12
nitin.a.kamble at intel.com
nitin.a.kamble at intel.com
Fri May 4 21:30:34 UTC 2012
From: Nitin A Kamble <nitin.a.kamble at intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
---
.../gnutls_fix_for_automake-1.12.patch | 53 ++++++++++++++++++++
meta/recipes-support/gnutls/gnutls_2.12.18.bb | 3 +-
2 files changed, 55 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.18/gnutls_fix_for_automake-1.12.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls_fix_for_automake-1.12.patch b/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls_fix_for_automake-1.12.patch
new file mode 100644
index 0000000..87603cb
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls_fix_for_automake-1.12.patch
@@ -0,0 +1,53 @@
+Upstream-Status: Pending
+
+This patch fixes following kind of issue with automake 1.12
+
+| automake: warnings are treated as errors
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libgnutls.la': linking libtool libraries using a non-POSIX
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble at intel.com>
+2012/05/03
+
+Index: gnutls-2.12.18/configure.ac
+===================================================================
+--- gnutls-2.12.18.orig/configure.ac
++++ gnutls-2.12.18/configure.ac
+@@ -36,6 +36,9 @@ AC_MSG_RESULT([***
+
+ dnl Checks for programs.
+ AC_PROG_CC
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ AC_PROG_LN_S
+ GTK_DOC_CHECK(1.1)
+ AC_PATH_PROG([GAA], [gaa])
+Index: gnutls-2.12.18/lib/configure.ac
+===================================================================
+--- gnutls-2.12.18.orig/lib/configure.ac
++++ gnutls-2.12.18/lib/configure.ac
+@@ -31,6 +31,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ lgl_EARLY
+
+ AC_LIBTOOL_WIN32_DLL
+Index: gnutls-2.12.18/libextra/configure.ac
+===================================================================
+--- gnutls-2.12.18.orig/libextra/configure.ac
++++ gnutls-2.12.18/libextra/configure.ac
+@@ -31,6 +31,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ xgl_EARLY
+
+ AC_LIBTOOL_WIN32_DLL
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.18.bb b/meta/recipes-support/gnutls/gnutls_2.12.18.bb
index 7355855..b0b0f8c 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.18.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.18.bb
@@ -1,10 +1,11 @@
require gnutls.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI += "file://gnutls-openssl.patch \
file://correct_rpl_gettimeofday_signature.patch \
file://configure-fix.patch \
+ file://gnutls_fix_for_automake-1.12.patch \
"
SRC_URI[md5sum] = "e9215d00d2930e09bc8f23f02b54f2d1"
--
1.7.7
More information about the Openembedded-core
mailing list