summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/make
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/make')
-rw-r--r--meta/recipes-devtools/make/files/SCCS.patch17
-rw-r--r--meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch39
-rw-r--r--meta/recipes-devtools/make/make.inc11
-rw-r--r--meta/recipes-devtools/make/make_3.81.bb12
-rw-r--r--meta/recipes-devtools/make/make_3.82.bb13
5 files changed, 92 insertions, 0 deletions
diff --git a/meta/recipes-devtools/make/files/SCCS.patch b/meta/recipes-devtools/make/files/SCCS.patch
new file mode 100644
index 000000000..c7ec3bd07
--- /dev/null
+++ b/meta/recipes-devtools/make/files/SCCS.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- make-3.80/configure.in~SCCS
++++ make-3.80/configure.in
+@@ -264,7 +264,7 @@
+ [Define this if the SCCS 'get' command understands the '-G<file>' option.]);;
+ esac
+ fi
+-rm -f s.conftest conftoast
++rm -f s.conftest conftoast SCCS/*s.conftest
+
+ # Check the system to see if it provides GNU glob. If not, use our
+ # local version.
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 000000000..941365fa2
--- /dev/null
+++ b/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Backport [The fix is already in upstream cvs repo, but not in the stable release]
+
+When working on the self-hosted-image work, I found in the target
+"bitbake eglibc-initial -c install" always failed:
+
+make[1]: Entering directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc'
+/usr/bin/install -c -m 644 include/limits.h /usr/include/limits.h
+/usr/bin/install: cannot remove `/usr/include/limits.h': Permission denied
+make[1]: *** [/usr/include/limits.h] Error 1
+make[1]: Leaving directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc'
+make: *** [install-headers] Error 2
+ERROR: oe_runmake faile
+
+Debugging shows the install_root variable in eglibc's makefiles is strangely
+reset at some place.
+
+Further investigation shows this is a bug of make-3.82:
+
+http://savannah.gnu.org/bugs/?30723
+http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.243&r2=1.244
+http://old.nabble.com/-bug--30723--implicit-re-executing-of-subdirs-breaks-$(origin)-with-make-3.82-td29394353.html
+
+The patch was got from the second link above(the upstream cvs repo of make).
+
+Thu Dec 1 16:05:59 CST 2011
+Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
+
+diff -Nru make-3.82.orig//main.c make-3.82/main.c
+--- make-3.82.orig//main.c 2010-07-19 15:10:53.000000000 +0800
++++ make-3.82/main.c 2011-12-01 16:04:11.818522186 +0800
+@@ -2093,7 +2093,7 @@
+ const char *pv = define_makeflags (1, 1);
+ char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+ sprintf (p, "MAKEFLAGS=%s", pv);
+- putenv (p);
++ putenv (allocated_variable_expand (p));
+ }
+
+ if (ISDB (DB_BASIC))
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc
new file mode 100644
index 000000000..5de74e426
--- /dev/null
+++ b/meta/recipes-devtools/make/make.inc
@@ -0,0 +1,11 @@
+SUMMARY = "GNU tool that controls the build process"
+DESCRIPTION = "Make is a tool which controls the generation of executables and other non-source files of a \
+program from the program's source files. Make gets its knowledge of how to build your program from a file \
+called the makefile, which lists each of the non-source files and how to compute it from other files."
+HOMEPAGE = "http://www.gnu.org/software/make/"
+SECTION = "devel"
+
+SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
+ file://SCCS.patch"
+
+inherit autotools gettext
diff --git a/meta/recipes-devtools/make/make_3.81.bb b/meta/recipes-devtools/make/make_3.81.bb
new file mode 100644
index 000000000..9458c3913
--- /dev/null
+++ b/meta/recipes-devtools/make/make_3.81.bb
@@ -0,0 +1,12 @@
+PR = "r0"
+
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
+ file://tests/COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
+ file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
+
+require make.inc
+
+SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6"
+SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8"
+
diff --git a/meta/recipes-devtools/make/make_3.82.bb b/meta/recipes-devtools/make/make_3.82.bb
new file mode 100644
index 000000000..8167c01f3
--- /dev/null
+++ b/meta/recipes-devtools/make/make_3.82.bb
@@ -0,0 +1,13 @@
+PR = "r2"
+LICENSE = "GPLv3 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
+require make.inc
+
+SRC_URI += "file://expand_MAKEFLAGS.patch"
+
+SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
+SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
+
+BBCLASSEXTEND = "native"