aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-07-08 08:39:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-10 17:37:40 +0100
commitad4a54a0f5bb667f5d5e3df2bcf841b05e0d0f2c (patch)
tree46cf1b4041da304c3a7b836fec449670fcb39a9d
parentfd408c49fffbc63dc79954420a5cfa46809bd5ca (diff)
downloadopenembedded-core-contrib-ad4a54a0f5bb667f5d5e3df2bcf841b05e0d0f2c.tar.gz
openembedded-core-contrib-ad4a54a0f5bb667f5d5e3df2bcf841b05e0d0f2c.tar.bz2
openembedded-core-contrib-ad4a54a0f5bb667f5d5e3df2bcf841b05e0d0f2c.zip
rpm: disable -Wno-override-init
Fixed rpm-native.do_configure error on CentOS 5.x: cc1: error: unrecognized command line option "-Wno-override-init" The -Wno-override-init was commented in rpm-5.4.9, but commented out in rpm-5.4.14 thus it is failed to build on CentOS 5.x, comment it again to fix the problem. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch32
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4+cvs.bb1
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb1
3 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch b/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
new file mode 100644
index 00000000000..8b5f8d66c8a
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
@@ -0,0 +1,32 @@
+From 70d881873b443c9bad502db9665595455d4f0ac9 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 8 Jul 2014 07:41:10 +0800
+Subject: [PATCH] configure.ac: disable -Wno-override-init
+
+Fixed rpm-native.do_configure error on CentOS 5.x:
+
+cc1: error: unrecognized command line option "-Wno-override-init"
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index adeffe0..6746b4c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -163,7 +163,7 @@ AC_ARG_ENABLE(build-warnings,
+ # XXX gcc-4.2 on Mac OS X hasn't
+ # CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
+ # XXX rpmio/set.c needs this
+- CFLAGS="$CFLAGS -Wno-override-init"
++# CFLAGS="$CFLAGS -Wno-override-init"
+ elif test ".`$CC -V 2>&1 | grep 'Sun C'`" != .; then
+ dnl # Sun Studio (usually "cc")
+ CFLAGS="$CFLAGS -v"
+--
+1.8.2.1
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index 4ab22e7602e..27d01dd49a2 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
@@ -108,6 +108,7 @@ SRC_URI = "cvs://anonymous@rpm5.org/cvs;tag=rpm-5_4;module=rpm \
file://rpm-fix-logio-cp.patch \
file://rpm-db5-or-db6.patch \
file://rpm-rpmpgp-fix.patch \
+ file://rpm-disable-Wno-override-init.patch \
"
# Uncomment the following line to enable platform score debugging
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index cc836befe08..15c1738ac7d 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -91,6 +91,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
file://rpm-payload-use-hashed-inode.patch \
file://rpm-fix-logio-cp.patch \
file://rpm-db5-or-db6.patch \
+ file://rpm-disable-Wno-override-init.patch \
"
# Uncomment the following line to enable platform score debugging