summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-02 17:01:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:56 +0100
commit85db7e794bd84f323408661b6e0b1cb87a5430a6 (patch)
tree5f526c092b990455dad2b20161755fe493d914fa /meta/recipes-devtools
parent8512519bb2b7b6bfa03c1be591240a9fc886c280 (diff)
downloadpoky-85db7e794bd84f323408661b6e0b1cb87a5430a6.tar.gz
poky-85db7e794bd84f323408661b6e0b1cb87a5430a6.tar.bz2
poky-85db7e794bd84f323408661b6e0b1cb87a5430a6.zip
rpm: fix build with automake 1.12
(From OE-Core rev: 8e78a88b664ffe32f182987eb0f5e5ea6345d416) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch21
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch b/meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..abbb15d5bf
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm_fix_for_automake-1.12.patch
@@ -0,0 +1,21 @@
+Upstream-Status: 2012/05/02
+
+automake 1.12 has depricated automatic de-ANSI-fication.
+
+fix this issue:
+| configure.ac:564: error: automatic de-ANSI-fication support has been removed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+Index: rpm-5.4.0/configure.ac
+===================================================================
+--- rpm-5.4.0.orig/configure.ac
++++ rpm-5.4.0/configure.ac
+@@ -561,7 +561,6 @@ dnl # platform specific checks
+ AC_SEARCH_LIBS([strerror],[cposix])
+
+ dnl # standard checks
+-AM_C_PROTOTYPES
+ AC_C_INLINE
+ AC_C_BIGENDIAN
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index d79d199970..43999e56a6 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl file"
extrarpmdeps_virtclass-native = "python-native file-native"
-PR = "r37"
+PR = "r38"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -71,6 +71,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpmdeps-oecore.patch \
file://rpm-resolvedep.patch \
file://rpm-respect-arch.patch \
+ file://rpm_fix_for_automake-1.12.patch \
"
# file://rpm-autoconf.patch \