diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch | 24 | ||||
-rw-r--r-- | meta/recipes-extended/mdadm/mdadm_3.2.2.bb | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch new file mode 100644 index 0000000000..79ba2cf9e9 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | UpstreamStatus: pending | ||
2 | |||
3 | By hardcoding CC's definition in the Makefile, all the gcc parameters | ||
4 | set by tune settings are lost. Causing compile failure with x32 toolchain | ||
5 | |||
6 | As the bitbake defined CC is good, there is no need to redfine CC in the | ||
7 | make file, hence making the CC definition in the Makefile conditional. | ||
8 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07 | ||
10 | |||
11 | Index: mdadm-3.2.2/Makefile | ||
12 | =================================================================== | ||
13 | --- mdadm-3.2.2.orig/Makefile | ||
14 | +++ mdadm-3.2.2/Makefile | ||
15 | @@ -40,7 +40,8 @@ KLIBC=/home/src/klibc/klibc-0.77 | ||
16 | |||
17 | KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 | ||
18 | |||
19 | -CC = $(CROSS_COMPILE)gcc | ||
20 | +CC ?= $(CROSS_COMPILE)gcc | ||
21 | + | ||
22 | CXFLAGS = -ggdb | ||
23 | CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter | ||
24 | ifdef WARN_UNUSED | ||
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb index 97878edb68..02109e36ac 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb | |||
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | |||
8 | file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ | 8 | file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ |
9 | file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" | 9 | file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" |
10 | 10 | ||
11 | PR = "r2" | 11 | PR = "r3" |
12 | 12 | ||
13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ | 13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ |
14 | file://0001-mdadm-fix-build-failures-ppc64.patch \ | 14 | file://0001-mdadm-fix-build-failures-ppc64.patch \ |
15 | file://mdadm-3.2.2_fix_for_x32.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651" | 18 | SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651" |
@@ -22,7 +23,6 @@ CFLAGS += "-fno-strict-aliasing" | |||
22 | inherit autotools | 23 | inherit autotools |
23 | 24 | ||
24 | do_compile() { | 25 | do_compile() { |
25 | export CROSS_COMPILE="${TARGET_PREFIX}" | ||
26 | oe_runmake | 26 | oe_runmake |
27 | } | 27 | } |
28 | 28 | ||