libselinux: drop flag: -Wno-unused-but-set-variable

The flag: -Wno-unused-but-set-variable isn't supported on older
versions of gcc such as gcc-4.1.2 which is the native compiler for
RHEL-5.9. I've droped this warning flag for both the native and target builds.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

2 files changed, 23 insertions, 3 deletions

diff --git a/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch b/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch
new file mode 100644
index 0000000..9deb67d
--- /dev/null
+++ b/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch
@@ -0,0 +1,17 @@
+Subject: libselinux: drop flag: -Wno-unused-but-set-variable
+
+Upstream status: inappropriate (older compilers only).
+
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+--- libselinux-2.1.12.orig/src/Makefile
++++ libselinux-2.1.12/src/Makefile
+@@ -79,7 +79,7 @@
+ 
+ override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS)
+ 
+-SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \
++SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-parameter \
+                -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations
+ 
+ RANLIB=ranlib
diff --git a/recipes-security/selinux/libselinux_2.1.12.bb b/recipes-security/selinux/libselinux_2.1.12.bb
index 34f9c2c..d881534 100644
--- a/recipes-security/selinux/libselinux_2.1.12.bb
+++ b/recipes-security/selinux/libselinux_2.1.12.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 include selinux_20120924.inc
 include ${BPN}.inc
@@ -8,5 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
 SRC_URI[md5sum] = "73270f384a032fad34b5fe075fa05ce2"
 SRC_URI[sha256sum] = "8dad879380e0ce1e4ab67195a08f6052c1396493bcb12fe92a033f49f7dbca9e"
 
-SRC_URI += "file://libselinux-fix-init-load-policy.patch \
-        file://libselinux-pcre-link-order.patch"
+SRC_URI += "\
+        file://libselinux-fix-init-load-policy.patch \
+        file://libselinux-pcre-link-order.patch \
+        file://libselinux-drop-Wno-unused-but-set-variable.patch \
+        "