Ports: Bump GNU make to version 4.3

3 files changed, 87 insertions, 27 deletions

diff --git a/Ports/make/package.sh b/Ports/make/package.sh
index ecf9a26290..3e930b2ddb 100755
--- a/Ports/make/package.sh
+++ b/Ports/make/package.sh
@@ -1,10 +1,10 @@
 #!/bin/bash ../.port_include.sh
 port=make
-version=4.2.1
+version=4.3
 useconfigure=true
-files="https://ftp.gnu.org/gnu/make/make-${version}.tar.bz2 make-${version}.tar.bz2
-http://ftp.gnu.org/gnu/make/make-${version}.tar.bz2.sig make-${version}.tar.bz2.sig
+files="https://ftp.gnu.org/gnu/make/make-${version}.tar.gz make-${version}.tar.gz
+http://ftp.gnu.org/gnu/make/make-${version}.tar.gz.sig make-${version}.tar.gz.sig
 https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg make-${version}.tar.bz2.sig"
+auth_opts="--keyring ./gnu-keyring.gpg make-${version}.tar.gz.sig"
 configopts="--target=i686-pc-serenity --with-sysroot=/ --without-guile"
diff --git a/Ports/make/patches/make-4.2-serenity.patch b/Ports/make/patches/make-4.2-serenity.patch
deleted file mode 100644
index a921ccc02b..0000000000
--- a/Ports/make/patches/make-4.2-serenity.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru make/arscan.c make-serenity/arscan.c
---- make/arscan.c	2016-05-21 22:21:52.000000000 +0200
-+++ make-serenity/arscan.c	2019-07-21 16:11:09.161133749 +0200
-@@ -331,7 +331,7 @@
- #endif
- 
- #ifndef WINDOWS32
--# if !defined (__ANDROID__) && !defined (__BEOS__)
-+# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined (__serenity__)
- #  include <ar.h>
- # else
-    /* These platforms don't have <ar.h> but have archives in the same format
-diff -ru make/config/config.sub make-serenity/config/config.sub
---- make/config/config.sub	2016-05-22 15:27:16.000000000 +0200
-+++ make-serenity/config/config.sub	2019-07-21 16:15:39.469065104 +0200
-@@ -1374,6 +1374,7 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
diff --git a/Ports/make/patches/make-4.3-serenity.patch b/Ports/make/patches/make-4.3-serenity.patch
new file mode 100644
index 0000000000..6404ea6965
--- /dev/null
+++ b/Ports/make/patches/make-4.3-serenity.patch
@@ -0,0 +1,83 @@
+diff -ru make-4.3-clean/build-aux/config.sub make-4.3/build-aux/config.sub
+--- make-4.3-clean/build-aux/config.sub	2019-09-15 20:23:28.000000000 +0200
++++ make-4.3/build-aux/config.sub	2020-12-15 00:51:50.738132015 +0100
+@@ -1343,7 +1343,7 @@
+ 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ 	     | sym* | kopensolaris* | plan9* \
+ 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
++	     | aos* | aros* | cloudabi* | sortix* | twizzler* | serenity* \
+ 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+ 	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+ 	     | knetbsd* | mirbsd* | netbsd* \
+diff -ru make-4.3-clean/lib/getdtablesize.c make-4.3/lib/getdtablesize.c
+--- make-4.3-clean/lib/getdtablesize.c	2020-01-19 21:34:01.000000000 +0100
++++ make-4.3/lib/getdtablesize.c	2020-12-15 00:53:49.661168383 +0100
+@@ -20,6 +20,10 @@
+ /* Specification.  */
+ #include <unistd.h>
+ 
++#ifdef __serenity__
++# include <sys/select.h>
++#endif
++
+ #if defined _WIN32 && ! defined __CYGWIN__
+ 
+ # include <stdio.h>
+@@ -109,6 +113,9 @@
+ int
+ getdtablesize (void)
+ {
++#ifdef __serenity__
++  return FD_SETSIZE;
++#else
+   struct rlimit lim;
+ 
+   if (getrlimit (RLIMIT_NOFILE, &lim) == 0
+@@ -119,6 +126,7 @@
+     return lim.rlim_cur;
+ 
+   return INT_MAX;
++#endif
+ }
+ 
+ #endif
+diff -ru make-4.3-clean/lib/getprogname.c make-4.3/lib/getprogname.c
+--- make-4.3-clean/lib/getprogname.c	2020-01-19 21:34:01.000000000 +0100
++++ make-4.3/lib/getprogname.c	2020-12-15 00:51:50.738132015 +0100
+@@ -51,6 +51,10 @@
+ # include <sys/procfs.h>
+ #endif
+ 
++#ifdef __serenity__
++# include <unistd.h>
++#endif
++
+ #include "dirname.h"
+ 
+ #ifndef HAVE_GETPROGNAME             /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */
+@@ -245,6 +249,12 @@
+         }
+     }
+   return NULL;
++# elif defined __serenity__
++  char* buffer = malloc(1024);
++  if (get_process_name(buffer, 1024) < 0)
++      return NULL;
++  return buffer;
++
+ # else
+ #  error "getprogname module not ported to this OS"
+ # endif
+diff -ru make-4.3-clean/src/arscan.c make-4.3/src/arscan.c
+--- make-4.3-clean/src/arscan.c	2020-01-03 08:11:27.000000000 +0100
++++ make-4.3/src/arscan.c	2020-12-15 00:51:50.738132015 +0100
+@@ -331,7 +331,7 @@
+ #endif
+ 
+ #ifndef WINDOWS32
+-# if !defined (__ANDROID__) && !defined (__BEOS__)
++# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined(__serenity__)
+ #  include <ar.h>
+ # else
+    /* These platforms don't have <ar.h> but have archives in the same format