From 15da72b273012385133ae43ad45239b22e6aae81 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 29 Jan 2011 00:57:02 +0100
Subject: comptools: add make-3.81

Since the advent of make-3.82, some packages now break due to changes
in make-3.82, being stricter than 3.81 when interpreting the Makefiles.

This has bugged us a bit too much so far, and I believe fixing all
of them is a long road, while simply building make-3.81 is the easiest
route for now.

Of course, in the long term, packages will get fixed upstream, and we
should back-port the fixes to old versions, and get rid of building
make-3.81. In the meantime...

Reported several times on the mailing list.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/config/companion_tools.in b/config/companion_tools.in
index b0e77c2..d5b78ee 100644
--- a/config/companion_tools.in
+++ b/config/companion_tools.in
@@ -10,6 +10,7 @@ config COMP_TOOLS
     prompt "Build some companion tools"
     help
       Crosstool-NG relies on some external tools to be recent enough, namely:
+        make = 3.81 (in some cases)
         m4 >= 1.4.12
         autoconf >= 2.63
         automake >= 1.10.2
@@ -20,6 +21,10 @@ config COMP_TOOLS
 
 if COMP_TOOLS
 
+config COMP_TOOLS_make
+    bool
+    prompt "make"
+
 config COMP_TOOLS_m4
     bool
     prompt "m4"
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
new file mode 100644
index 0000000..fd9c288
--- /dev/null
+++ b/scripts/build/companion_tools/050-make.sh
@@ -0,0 +1,26 @@
+# Build script for make
+
+CT_MAKE_VERSION=3.81
+
+do_companion_tools_make_get() {
+    CT_GetFile "make-${CT_MAKE_VERSION}" \
+               {http,ftp}://ftp.gnu.org/gnu/make
+}
+
+do_companion_tools_make_extract() {
+    CT_Extract "make-${CT_MAKE_VERSION}"
+    CT_Patch "make" "${CT_MAKE_VERSION}"
+}
+
+do_companion_tools_make_build() {
+    CT_DoStep EXTRA "Installing make"
+    mkdir -p "${CT_BUILD_DIR}/build-make"
+    CT_Pushd "${CT_BUILD_DIR}/build-make"
+
+    CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
+                     --prefix="${CT_TOOLS_OVERIDE_DIR}"
+    CT_DoExecLog ALL make
+    CT_DoExecLog ALL make install
+    CT_Popd
+    CT_EndStep
+}
-- 
cgit v0.10.2-6-g49f6