changeset 1226:680899f86785

gnu/make: upgrade to 4.3
author David Demelier <markand@malikania.fr>
date Fri, 29 Oct 2021 15:01:07 +0200
parents dbe5116fb25d
children 8d69cb370f29
files gnu/make/make.sh gnu/make/make.sha1 gnu/make/patch-default.patch
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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" \
--- 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
--- 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",