# HG changeset patch # User David Demelier # Date 1635512467 -7200 # Node ID 680899f867856e3b680f8fbc4e4e77b5b387ca27 # Parent dbe5116fb25d5e810914c263186f22f0df26aaa1 gnu/make: upgrade to 4.3 diff -r dbe5116fb25d -r 680899f86785 gnu/make/make.sh --- a/gnu/make/make.sh Fri Oct 29 13:10:31 2021 +0200 +++ b/gnu/make/make.sh Fri Oct 29 15:01:07 2021 +0200 @@ -16,9 +16,9 @@ # PKGNAME=make -PKGVERSION=4.2.1 +PKGVERSION=4.3 PKGREVISION=1 -PKGLICENSE="GPLv30+" +PKGLICENSE="GPL-3.0-or-later" PKGSUMMARY="GNU make" PKGDOWNLOAD="http://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" PKGOPTIONS="GUILE NLS" @@ -49,7 +49,7 @@ build() { rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.gz + tar -xvf $PKGNAME-$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION # Change default CC/CXX/OBJC for a better compatibility. @@ -60,8 +60,8 @@ "clang") CXX=clang++ ;; esac - sed -i -e "s|@CC@|$CC|" default.c - sed -i -e "s|@CXX@|$CXX|" default.c + sed -i -e "s|@CC@|$CC|" src/default.c + sed -i -e "s|@CXX@|$CXX|" src/default.c CC="$CC" \ CFLAGS="$CFLAGS" \ diff -r dbe5116fb25d -r 680899f86785 gnu/make/make.sha1 --- a/gnu/make/make.sha1 Fri Oct 29 13:10:31 2021 +0200 +++ b/gnu/make/make.sha1 Fri Oct 29 15:01:07 2021 +0200 @@ -1,1 +1,1 @@ -9cb7f45f6e32c977164ba790e626c359d3a24fee make-4.2.1.tar.gz +3c40e5b49b893dbb14f1e2e1f8fe89b7298cc51d make-4.3.tar.gz diff -r dbe5116fb25d -r 680899f86785 gnu/make/patch-default.patch --- a/gnu/make/patch-default.patch Fri Oct 29 13:10:31 2021 +0200 +++ b/gnu/make/patch-default.patch Fri Oct 29 15:01:07 2021 +0200 @@ -1,5 +1,5 @@ ---- default.c.orig 2019-09-20 14:59:27.355416896 +0200 -+++ default.c 2019-09-20 15:00:13.339418309 +0200 +--- src/default.c.orig 2019-09-20 14:59:27.355416896 +0200 ++++ src/default.c 2019-09-20 15:00:13.339418309 +0200 @@ -529,9 +529,9 @@ # endif /* __MSDOS__ */ "OBJC", "gcc",