From c30165512905befc0121111c33f2d3b8f5165c54 Mon Sep 17 00:00:00 2001 From: Alexander Richards Date: Tue, 25 Feb 2025 04:50:03 +0100 Subject: [PATCH] make: bump to 4.4.1 (#11035) Leave disabled for the moment. Co-authored-by: waddlesplash --- .../{make-4.3.recipe => make-4.4.1.recipe} | 9 ++++----- .../{make-4.3.patchset => make-4.4.1.patchset} | 18 +++++++++--------- 2 files changed, 13 insertions(+), 14 deletions(-) rename sys-devel/make/{make-4.3.recipe => make-4.4.1.recipe} (83%) rename sys-devel/make/patches/{make-4.3.patchset => make-4.4.1.patchset} (69%) diff --git a/sys-devel/make/make-4.3.recipe b/sys-devel/make/make-4.4.1.recipe similarity index 83% rename from sys-devel/make/make-4.3.recipe rename to sys-devel/make/make-4.4.1.recipe index 7992f0925..12a1aca35 100644 --- a/sys-devel/make/make-4.3.recipe +++ b/sys-devel/make/make-4.4.1.recipe @@ -6,11 +6,11 @@ makefile, which lists each of the non-source files and how to compute it from \ other files. When you write a program, you should write a makefile for it, so \ that it is possible to use Make to build and install the program." HOMEPAGE="https://www.gnu.org/software/make/" -COPYRIGHT="1988-2020 Free Software Foundation, Inc." +COPYRIGHT="1988-2023 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="http://ftpmirror.gnu.org/make/make-$portVersion.tar.gz" -CHECKSUM_SHA256="e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" +CHECKSUM_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" PATCHES="make-$portVersion.patchset" ARCHITECTURES="?all" @@ -44,8 +44,7 @@ defineDebugInfoPackage make \ BUILD() { - # pselect usecase is broken on beta2 - ac_cv_func_pselect=no runConfigure ./configure \ + runConfigure ./configure \ --disable-rpath --with-gnu-ld --disable-dependency-tracking ./build.sh } diff --git a/sys-devel/make/patches/make-4.3.patchset b/sys-devel/make/patches/make-4.4.1.patchset similarity index 69% rename from sys-devel/make/patches/make-4.3.patchset rename to sys-devel/make/patches/make-4.4.1.patchset index a9d3929c8..77d4e890f 100644 --- a/sys-devel/make/patches/make-4.3.patchset +++ b/sys-devel/make/patches/make-4.4.1.patchset @@ -1,37 +1,37 @@ -From f41f5ce2f53d1094f9070e428b0d58a679a1b178 Mon Sep 17 00:00:00 2001 +From f31b86938397bd423a781ce0f989749827256962 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 26 Feb 2016 14:51:15 +0000 Subject: Haiku patch diff --git a/src/arscan.c b/src/arscan.c -index 3ce21db..45bbe0f 100644 +index edd4070..ee88d6b 100644 --- a/src/arscan.c +++ b/src/arscan.c @@ -331,7 +331,7 @@ ar_scan (const char *archive, ar_member_func_t function, const void *varg) #endif #ifndef WINDOWS32 --# if !defined (__ANDROID__) && !defined (__BEOS__) -+# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined (__HAIKU__) +-# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined(MK_OS_ZOS) ++# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined(__HAIKU__) && !defined(MK_OS_ZOS) # include # else /* These platforms don't have but have archives in the same format -- -2.30.2 +2.45.2 -From e38f464cbf874ee7fc19a77d7f00bd29600bd31f Mon Sep 17 00:00:00 2001 +From ebc3c52617c0f666f3a59fdd0160786f9cc05e94 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sun, 21 Nov 2021 15:47:19 +0000 Subject: fix build diff --git a/src/dir.c b/src/dir.c -index 862a18e..620ca26 100644 +index 3e94b98..622a9a0 100644 --- a/src/dir.c +++ b/src/dir.c -@@ -1226,7 +1226,7 @@ read_dirstream (__ptr_t stream) +@@ -1253,7 +1253,7 @@ read_dirstream (void *stream) /* The glob interface wants a 'struct dirent', so mock one up. */ struct dirent *d; size_t len = df->length + 1; @@ -41,5 +41,5 @@ index 862a18e..620ca26 100644 { bufsz *= 2; -- -2.30.2 +2.45.2