summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-12-01 09:21:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 10:50:10 (GMT)
commitfa25490782bddf83c276cf27790edec379256508 (patch)
tree6517fc2377405d183ef0de1fa1b328a15c222e2b
parent55c40d4c8475956f13ac2309cb19d58843cbcd15 (diff)
downloadpoky-fa25490782bddf83c276cf27790edec379256508.tar.gz
make: expand MAKEFLAGS before we re-exec after rebuilding makefiles.
This patch was got from the upstream cvs repo of make to fix the bug of make-3.82: http://savannah.gnu.org/bugs/?30723 RP: Tweaked patch status to Backport (From OE-Core rev: c2094366ea0771c520d52f0b73b8df1bd74e7941) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch39
-rw-r--r--meta/recipes-devtools/make/make_3.82.bb4
2 files changed, 42 insertions, 1 deletions
diff --git a/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch b/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
new file mode 100644
index 0000000..941365f
--- /dev/null
+++ b/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Backport [The fix is already in upstream cvs repo, but not in the stable release]
2
3When working on the self-hosted-image work, I found in the target
4"bitbake eglibc-initial -c install" always failed:
5
6make[1]: Entering directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc'
7/usr/bin/install -c -m 644 include/limits.h /usr/include/limits.h
8/usr/bin/install: cannot remove `/usr/include/limits.h': Permission denied
9make[1]: *** [/usr/include/limits.h] Error 1
10make[1]: Leaving directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc'
11make: *** [install-headers] Error 2
12ERROR: oe_runmake faile
13
14Debugging shows the install_root variable in eglibc's makefiles is strangely
15reset at some place.
16
17Further investigation shows this is a bug of make-3.82:
18
19http://savannah.gnu.org/bugs/?30723
20http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.243&r2=1.244
21http://old.nabble.com/-bug--30723--implicit-re-executing-of-subdirs-breaks-$(origin)-with-make-3.82-td29394353.html
22
23The patch was got from the second link above(the upstream cvs repo of make).
24
25Thu Dec 1 16:05:59 CST 2011
26Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
27
28diff -Nru make-3.82.orig//main.c make-3.82/main.c
29--- make-3.82.orig//main.c 2010-07-19 15:10:53.000000000 +0800
30+++ make-3.82/main.c 2011-12-01 16:04:11.818522186 +0800
31@@ -2093,7 +2093,7 @@
32 const char *pv = define_makeflags (1, 1);
33 char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
34 sprintf (p, "MAKEFLAGS=%s", pv);
35- putenv (p);
36+ putenv (allocated_variable_expand (p));
37 }
38
39 if (ISDB (DB_BASIC))
diff --git a/meta/recipes-devtools/make/make_3.82.bb b/meta/recipes-devtools/make/make_3.82.bb
index 61fbb32..bea3339 100644
--- a/meta/recipes-devtools/make/make_3.82.bb
+++ b/meta/recipes-devtools/make/make_3.82.bb
@@ -1,8 +1,10 @@
1PR = "r0" 1PR = "r1"
2LICENSE="GPLv3&LGPLv2" 2LICENSE="GPLv3&LGPLv2"
3LIC_FILES_CHKSUM = "file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 3LIC_FILES_CHKSUM = "file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" 4 file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
5require make.inc 5require make.inc
6 6
7SRC_URI += "file://expand_MAKEFLAGS.patch"
8
7SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f" 9SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
8SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966" 10SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"