procps: Do not detect 32/64 bit compiler options

It gets its wrong in detecting 64bit options
and OE we already pass the right options as compiler
defaults

(From OE-Core rev: ec3add1752a410fada04b4788c142b91ef63ffa3)

(From OE-Core rev: 32b826720626ec2d426ff7dbfe5607bc0dbd8082)

(From OE-Core rev: fc1839d8a54a97b695396b507b53949b7a7dee74)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 27 insertions, 0 deletions

diff --git a/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch b/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch
new file mode 100644
index 0000000000..1523c3dfb2
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch
@@ -0,0 +1,26 @@
+Do not try to detect 64bit/32bit system
+we already feed that information via compiler
+defaults
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate [OE specific]
+Index: procps-3.2.8/Makefile
+===================================================================
+--- procps-3.2.8.orig/Makefile  2014-05-03 01:00:01.707387583 -0700
++++ procps-3.2.8/Makefile       2014-05-03 08:53:08.087175369 -0700
+@@ -118,15 +118,6 @@
+ # until you go looking for a 64-bit curses library.
+ check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+ 
+-# Be 64-bit if at all possible. In a cross-compiling situation, one may
+-# do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT
+-# attempt to use a 32-bit executable on a 64-bit kernel. Packagers MUST
+-# produce separate executables for ppc and ppc64, s390 and s390x,
+-# i386 and x86-64, mips and mips64, sparc and sparc64, and so on.
+-# Failure to do so will cause data corruption.
+-m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,))
+-ALL_CFLAGS += $(m64)
+-
+ ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
+ ALL_CFLAGS += $(call check_gcc,-Wpadded,)
+ ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,)
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index e4b82e007a..71fc890d30 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -11,6 +11,7 @@ SRC_URI += "file://procmodule.patch \
             file://60_linux_version_init.patch \
             file://procps-3.2.7-top-remcpu.patch \
             file://procps-3.2.8-ps-cgroup.patch \
+            file://detect_bitness.patch \
            "
 
 SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"