From 4e1b18118baec8f383049f11761a98da60cae24b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Tue, 10 Dec 2019 20:42:32 -0300
Subject: [PATCH] Revert "GNU make upgraded to alpha version 4.2.92"

This reverts commit b682c2a24ef6c12591f7b10c0d519054a5304034.
---
 recipes/devel/make/recipe          | 19 +++++++++++++++----
 sources/SOURCELIST.txt             |  2 +-
 sources/make-4.2.1.tar.bz2.sha256  |  1 +
 sources/make-4.2.92.tar.bz2.sha256 |  1 -
 stages/1/07-make                   |  7 +++++--
 5 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 sources/make-4.2.1.tar.bz2.sha256
 delete mode 100644 sources/make-4.2.92.tar.bz2.sha256

diff --git a/recipes/devel/make/recipe b/recipes/devel/make/recipe
index b38810a5..b1e0a19e 100644
--- a/recipes/devel/make/recipe
+++ b/recipes/devel/make/recipe
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 program=make
-version=4.2.92
-release=1
+version=4.2.1
+release=3
 
 # Set 'outdir' for a nice and well-organized output directory
 outdir="${outdir}/${arch}/devel"
@@ -24,8 +24,7 @@ outdir="${outdir}/${arch}/devel"
 tarname=${program}-${version}.tar.bz2
 
 # Remote source(s)
-#fetch=ftp://ftp.gnu.org/gnu/make/$tarname
-fetch=http://alpha.gnu.org/gnu/make/$tarname
+fetch=ftp://ftp.gnu.org/gnu/make/$tarname
 
 description="
 The weighted make.
@@ -58,6 +57,18 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
+    # Update for hosts based on musl
+    cp -f "${worktree}/archive/common/config.guess" config/config.guess
+    cp -f "${worktree}/archive/common/config.sub" config/config.sub
+
+    # Apply patches from upstream.
+    #
+    # Detect Guile 2.2
+    # http://git.savannah.nongnu.org/cgit/make.git/commit/?id=fbf71ec25a5986d9003ac16ee9e23675feac9053
+    patch -p1 < "${worktree}/patches/make/fbf71ec25a5986d9003ac16ee9e23675feac9053"
+
+    autoreconf -vif
+
     ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \
      $configure_args \
      --libdir=/usr/lib${libSuffix} \
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index 8dce9932..356b32c4 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -14,7 +14,7 @@ ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz
 ftp://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.lz
 ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz
 ftp://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.bz2
-http://alpha.gnu.org/gnu/make/make-4.2.92.tar.bz2
+ftp://ftp.gnu.org/gnu/make/make-4.2.1.tar.bz2
 ftp://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.bz2
 ftp://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz
 ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz
diff --git a/sources/make-4.2.1.tar.bz2.sha256 b/sources/make-4.2.1.tar.bz2.sha256
new file mode 100644
index 00000000..92e5ce41
--- /dev/null
+++ b/sources/make-4.2.1.tar.bz2.sha256
@@ -0,0 +1 @@
+d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589  make-4.2.1.tar.bz2
diff --git a/sources/make-4.2.92.tar.bz2.sha256 b/sources/make-4.2.92.tar.bz2.sha256
deleted file mode 100644
index bb422e89..00000000
--- a/sources/make-4.2.92.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-846be0bf15b5228953aae039c8bb9be420b82bc5238a49c82d81a84092c871e3  make-4.2.92.tar.bz2
diff --git a/stages/1/07-make b/stages/1/07-make
index ff22c8b3..3c020d2c 100755
--- a/stages/1/07-make
+++ b/stages/1/07-make
@@ -1,7 +1,6 @@
 # Build script for make.
 #
 # Copyright (c) 2014-2017 Matias Fonzo, <selk@dragora.org>.
-# Copyright (c) 2019 Matias Fonzo, <selk@dragora.org>.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=4.2.92
+version=4.2.1
 
 cd -- "$TMPDIR"
 rm -rf make-${version}
@@ -24,6 +23,10 @@ unpack "${worktree}/sources/make-${version}.tar.bz2"
 # Build instructions
 cd make-${version}
 
+# Update for hosts based on musl
+cp -f "${worktree}/archive/common/config.guess" config/config.guess
+cp -f "${worktree}/archive/common/config.sub" config/config.sub
+
 # Import and export toolchain variables
 . "${worktree}/stages/env.d/cross-staticenv"
 
-- 
2.11.4.GIT