From 66f4ffe30957c17b4bf8c118ef8366fc02931bb8 Mon Sep 17 00:00:00 2001 From: Cameron Youell Date: Mon, 27 Mar 2023 21:25:12 +1100 Subject: Ports/make: Update make to version 4.4 --- Ports/AvailablePorts.md | 2 +- Ports/make/package.sh | 8 ++--- .../0001-Include-ar.h-for-serenity-as-well.patch | 2 +- ...-Hardcode-default-path-because-is-missing.patch | 31 ++++++++++++++++ .../0002-Stub-getdtablesize-for-serenity.patch | 42 ---------------------- Ports/make/patches/ReadMe.md | 6 ++-- 6 files changed, 39 insertions(+), 52 deletions(-) create mode 100644 Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch delete mode 100644 Ports/make/patches/0002-Stub-getdtablesize-for-serenity.patch (limited to 'Ports') diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 5198ef3918..00f733921d 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -163,7 +163,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.3 | https://www.gnu.org/software/make/ | +| [`make`](make/) | GNU make | 4.4 | 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 444b7ccba7..6829055480 100755 --- a/Ports/make/package.sh +++ b/Ports/make/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=make -version=4.3 -useconfigure=true -use_fresh_config_sub=true +port='make' +version='4.4' +useconfigure='true' +use_fresh_config_sub='true' config_sub_paths=("build-aux/config.sub") files="https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz make-${version}.tar.gz https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz.sig make-${version}.tar.gz.sig 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 f1eb202107..5f1b17fec1 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,7 +8,7 @@ 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 3ce21db..c48a569 100644 +index b6ed45a87754085aa1776c85e0181ba6edb0d7e6..2ae76f8134a581f3607a7d0c507d1d2e21dc3abc 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) diff --git a/Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch b/Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch new file mode 100644 index 0000000000..38022a6499 --- /dev/null +++ b/Ports/make/patches/0002-Hardcode-default-path-because-is-missing.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cameron Youell +Date: Mon, 27 Mar 2023 21:18:24 +1100 +Subject: [PATCH] Hardcode default path because `confstr` is missing + +--- + src/job.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/job.c b/src/job.c +index 8116855..914935a 100644 +--- a/src/job.c ++++ b/src/job.c +@@ -2387,6 +2387,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) + { ++#ifndef __serenity__ + 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) + confstr (_CS_PATH, dp, l); + p = dp; + } ++#else ++ p = strdup("/bin:/usr/bin"); ++#endif + } + + cmd = (char *)find_in_given_path (argv[0], p, NULL, 0); diff --git a/Ports/make/patches/0002-Stub-getdtablesize-for-serenity.patch b/Ports/make/patches/0002-Stub-getdtablesize-for-serenity.patch deleted file mode 100644 index d44cce6e99..0000000000 --- a/Ports/make/patches/0002-Stub-getdtablesize-for-serenity.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Andreas Kling -Date: Tue, 15 Dec 2020 01:06:18 +0100 -Subject: [PATCH] Stub getdtablesize() for serenity - ---- - lib/getdtablesize.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c -index 0fe7092..a14d697 100644 ---- a/lib/getdtablesize.c -+++ b/lib/getdtablesize.c -@@ -20,6 +20,10 @@ - /* Specification. */ - #include - -+#ifdef __serenity__ -+# include -+#endif -+ - #if defined _WIN32 && ! defined __CYGWIN__ - - # include -@@ -109,6 +113,9 @@ getdtablesize (void) - int - getdtablesize (void) - { -+#ifdef __serenity__ -+ return FD_SETSIZE; -+#else - struct rlimit lim; - - if (getrlimit (RLIMIT_NOFILE, &lim) == 0 -@@ -119,6 +126,7 @@ getdtablesize (void) - return lim.rlim_cur; - - return INT_MAX; -+#endif - } - - #endif diff --git a/Ports/make/patches/ReadMe.md b/Ports/make/patches/ReadMe.md index b4c5657d4a..c8b959a4d2 100644 --- a/Ports/make/patches/ReadMe.md +++ b/Ports/make/patches/ReadMe.md @@ -5,8 +5,6 @@ Include ar.h for serenity as well -## `0002-Stub-getdtablesize-for-serenity.patch` - -Stub getdtablesize() for serenity - +## `0002-Hardcode-default-path-because-is-missing.patch` +Hardcode default path because `confstr` is missing -- cgit v1.2.3