summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-05-03 08:56:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 17:59:15 +0100
commit7743cd220ff487830a24017ea2efceba468346a9 (patch)
treeae5e89ffa198fb7396ab9ff77369e9b35a30abac /meta
parent03ce8a7ba0566dc98c418ed78f4102e795f665d5 (diff)
downloadpoky-7743cd220ff487830a24017ea2efceba468346a9.tar.gz
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) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch26
-rw-r--r--meta/recipes-extended/procps/procps_3.2.8.bb1
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 @@
1Do not try to detect 64bit/32bit system
2we already feed that information via compiler
3defaults
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Inappropriate [OE specific]
7Index: procps-3.2.8/Makefile
8===================================================================
9--- procps-3.2.8.orig/Makefile 2014-05-03 01:00:01.707387583 -0700
10+++ procps-3.2.8/Makefile 2014-05-03 08:53:08.087175369 -0700
11@@ -118,15 +118,6 @@
12 # until you go looking for a 64-bit curses library.
13 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 ;)
14
15-# Be 64-bit if at all possible. In a cross-compiling situation, one may
16-# do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT
17-# attempt to use a 32-bit executable on a 64-bit kernel. Packagers MUST
18-# produce separate executables for ppc and ppc64, s390 and s390x,
19-# i386 and x86-64, mips and mips64, sparc and sparc64, and so on.
20-# Failure to do so will cause data corruption.
21-m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,))
22-ALL_CFLAGS += $(m64)
23-
24 ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
25 ALL_CFLAGS += $(call check_gcc,-Wpadded,)
26 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 94ac3db772..b314bfe33c 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 \
11 file://60_linux_version_init.patch \ 11 file://60_linux_version_init.patch \
12 file://procps-3.2.7-top-remcpu.patch \ 12 file://procps-3.2.7-top-remcpu.patch \
13 file://procps-3.2.8-ps-cgroup.patch \ 13 file://procps-3.2.8-ps-cgroup.patch \
14 file://detect_bitness.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0" 17SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"