aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libidn
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-07-10 02:44:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:47:34 +0100
commitc654e26007b4b014bc614fde15b7a8d9cf52d849 (patch)
treea26ab9e93c9ce8595268df7a65cb5c2818a62001 /meta/recipes-extended/libidn
parentaa3032aef2af5a91c1af77b9323fe762b055cd93 (diff)
downloadopenembedded-core-contrib-c654e26007b4b014bc614fde15b7a8d9cf52d849.tar.gz
openembedded-core-contrib-c654e26007b4b014bc614fde15b7a8d9cf52d849.tar.bz2
openembedded-core-contrib-c654e26007b4b014bc614fde15b7a8d9cf52d849.zip
libidn: fix build with automake 1.12
Added a new patch avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch More details in the 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-extended/libidn')
-rw-r--r--meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch25
-rw-r--r--meta/recipes-extended/libidn/libidn_1.25.bb5
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
new file mode 100644
index 0000000000..d3a921178e
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
@@ -0,0 +1,25 @@
+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/10
+
+Index: libidn-1.24/configure.ac
+===================================================================
+--- libidn-1.24.orig/configure.ac
++++ libidn-1.24/configure.ac
+@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2011 Si
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS(config.h)
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ AM_SILENT_RULES([yes])
+
+ # Library code modified: REVISION++
diff --git a/meta/recipes-extended/libidn/libidn_1.25.bb b/meta/recipes-extended/libidn/libidn_1.25.bb
index 755a8189a3..6584eddd46 100644
--- a/meta/recipes-extended/libidn/libidn_1.25.bb
+++ b/meta/recipes-extended/libidn/libidn_1.25.bb
@@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c9d9d207a3468a696a03368913d360b \
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \
file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb"
-PR = "r0"
+PR = "r1"
inherit pkgconfig autotools gettext
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
- file://libidn_fix_for_automake-1.12.patch "
+ file://libidn_fix_for_automake-1.12.patch \
+ file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch "
SRC_URI[md5sum] = "45ffabce4b8ca87fe98fe4542668d33d"
SRC_URI[sha256sum] = "7fe625328a6a5d837d723c462c1788affb84d9c9fc0ae5cd0ce9ac7724c34716"