summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm
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:38:34 +0100
commitae33bda011ce0c0a0e0dcd36bb38ba0186fa353d (patch)
treea903955477d7111c5faa00066860992c2b12ef25 /meta/recipes-devtools/rpm/rpm
parent68df093c55fd0ef1fddbff99442dd9b35f598dfc (diff)
downloadast2050-yocto-poky-ae33bda011ce0c0a0e0dcd36bb38ba0186fa353d.zip
ast2050-yocto-poky-ae33bda011ce0c0a0e0dcd36bb38ba0186fa353d.tar.gz
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. (From OE-Core rev: ad4a54a0f5bb667f5d5e3df2bcf841b05e0d0f2c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch32
1 files changed, 32 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 0000000..8b5f8d6
--- /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
+
OpenPOWER on IntegriCloud