From 251ea54cc8249f21d0addfdb4ed34a671e56e994 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Sun, 2 Jul 2023 04:56:07 +0330 Subject: [PATCH] Ports: Bump the version of make to 4.4.1 --- Ports/AvailablePorts.md | 2 +- Ports/make/package.sh | 2 +- .../patches/0001-Include-ar.h-for-serenity-as-well.patch | 6 +++--- ...-Hardcode-default-path-because-confstr-is-missing.patch} | 6 +++--- Ports/make/patches/ReadMe.md | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) rename Ports/make/patches/{0002-Hardcode-default-path-because-is-missing.patch => 0002-Hardcode-default-path-because-confstr-is-missing.patch} (78%) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index bf6690493b..c75f9a600b 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -174,7 +174,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`lzo`](lzo/) | LZO lossless data compression algorithm | 2.10 | https://www.oberhumer.com/opensource/lzo/ | | [`lzop`](lzop/) | LZO lossless data compression utility | 1.04 | https://www.lzop.org/ | | [`m4`](m4/) | GNU M4 | 1.4.19 | https://www.gnu.org/software/m4/ | -| [`make`](make/) | GNU make | 4.4 | https://www.gnu.org/software/make/ | +| [`make`](make/) | GNU make | 4.4.1 | https://www.gnu.org/software/make/ | | [`mandoc`](mandoc/) | mandoc | 1.14.5 | https://mandoc.bsd.lv/ | | [`mawk`](mawk/) | mawk | 1.3.4-20200120 | https://invisible-island.net/mawk/ | | [`mbedtls`](mbedtls/) | Mbed TLS | 3.1.0 | https://tls.mbed.org/ | diff --git a/Ports/make/package.sh b/Ports/make/package.sh index 6829055480..2e859ace94 100755 --- a/Ports/make/package.sh +++ b/Ports/make/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port='make' -version='4.4' +version='4.4.1' useconfigure='true' use_fresh_config_sub='true' config_sub_paths=("build-aux/config.sub") diff --git a/Ports/make/patches/0001-Include-ar.h-for-serenity-as-well.patch b/Ports/make/patches/0001-Include-ar.h-for-serenity-as-well.patch index 5f1b17fec1..fc2beee1c1 100644 --- a/Ports/make/patches/0001-Include-ar.h-for-serenity-as-well.patch +++ b/Ports/make/patches/0001-Include-ar.h-for-serenity-as-well.patch @@ -8,15 +8,15 @@ Subject: [PATCH] Include ar.h for serenity as well 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arscan.c b/src/arscan.c -index b6ed45a87754085aa1776c85e0181ba6edb0d7e6..2ae76f8134a581f3607a7d0c507d1d2e21dc3abc 100644 +index edd4070c3f86fcecc44ac2025d1256a47de700a0..6c7a7f4c595a9b00ffcbc0e4fade63d2efbca816 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(__serenity__) +-# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined(MK_OS_ZOS) ++# if !defined (__ANDROID__) && !defined (__BEOS__) && !defined(MK_OS_ZOS) && !defined(__serenity__) # include # else /* These platforms don't have but have archives in the same format diff --git a/Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch b/Ports/make/patches/0002-Hardcode-default-path-because-confstr-is-missing.patch similarity index 78% rename from Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch rename to Ports/make/patches/0002-Hardcode-default-path-because-confstr-is-missing.patch index 38022a6499..c358b12dcb 100644 --- a/Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch +++ b/Ports/make/patches/0002-Hardcode-default-path-because-confstr-is-missing.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Hardcode default path because `confstr` is missing 1 file changed, 4 insertions(+) diff --git a/src/job.c b/src/job.c -index 8116855..914935a 100644 +index ea885614a3862ea1a40d2ed12d78985c17d2ceb7..28d12a84cd9406633b4c8868fbc7527e07e56942 100644 --- a/src/job.c +++ b/src/job.c -@@ -2387,6 +2387,7 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv) +@@ -2430,6 +2430,7 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv) /* execvp() will use a default PATH if none is set; emulate that. */ if (p == NULL) { @@ -19,7 +19,7 @@ index 8116855..914935a 100644 size_t l = confstr (_CS_PATH, NULL, 0); if (l) { -@@ -2394,6 +2395,9 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv) +@@ -2437,6 +2438,9 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv) confstr (_CS_PATH, dp, l); p = dp; } diff --git a/Ports/make/patches/ReadMe.md b/Ports/make/patches/ReadMe.md index c8b959a4d2..be993d463f 100644 --- a/Ports/make/patches/ReadMe.md +++ b/Ports/make/patches/ReadMe.md @@ -5,6 +5,8 @@ Include ar.h for serenity as well -## `0002-Hardcode-default-path-because-is-missing.patch` +## `0002-Hardcode-default-path-because-confstr-is-missing.patch` Hardcode default path because `confstr` is missing + +