From bbd54a5a25edac2ecedf0516c07b28c3610d1eb4 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 25 May 2022 22:46:40 +0200 Subject: [PATCH] Ports: Replace the `gnuapl` `config.sub` patch with our download --- Ports/gnuapl/package.sh | 1 + .../0001-Include-fcntl-find-fcntl.h.patch | 2 +- ...tub-out-the-performance-report-macro.patch | 2 +- .../patches/0003-Remove-use-of-sbrk.patch | 2 +- ...0004-Teach-config.sub-about-serenity.patch | 25 ------------------- Ports/gnuapl/patches/ReadMe.md | 5 ---- 6 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 Ports/gnuapl/patches/0004-Teach-config.sub-about-serenity.patch diff --git a/Ports/gnuapl/package.sh b/Ports/gnuapl/package.sh index fb928da2a62..251620a64aa 100755 --- a/Ports/gnuapl/package.sh +++ b/Ports/gnuapl/package.sh @@ -7,3 +7,4 @@ workdir="apl-${version}" configopts=("CXX_WERROR=no") files="https://ftpmirror.gnu.org/gnu/apl/apl-${version}.tar.gz apl-${version}.tar.gz 144f4c858a0d430ce8f28be90a35920dd8e0951e56976cb80b55053fa0d8bbcb" auth_type=sha256 +use_fresh_config_sub=true diff --git a/Ports/gnuapl/patches/0001-Include-fcntl-find-fcntl.h.patch b/Ports/gnuapl/patches/0001-Include-fcntl-find-fcntl.h.patch index d1bf3dfa5ed..f1a628dd0c4 100644 --- a/Ports/gnuapl/patches/0001-Include-fcntl-find-fcntl.h.patch +++ b/Ports/gnuapl/patches/0001-Include-fcntl-find-fcntl.h.patch @@ -1,7 +1,7 @@ From 579a391c43b9f0972205d565b3baf908cfd79330 Mon Sep 17 00:00:00 2001 From: Tobias Christiansen Date: Fri, 11 Mar 2022 19:01:35 +0100 -Subject: [PATCH 1/4] Include fcntl find fcntl.h +Subject: [PATCH 1/3] Include fcntl find fcntl.h `fcntl.h` was included as `sys/fcntl.h`, which is not where this lives in Serenity. diff --git a/Ports/gnuapl/patches/0002-Stub-out-the-performance-report-macro.patch b/Ports/gnuapl/patches/0002-Stub-out-the-performance-report-macro.patch index 25cb52e6b2c..50dde170751 100644 --- a/Ports/gnuapl/patches/0002-Stub-out-the-performance-report-macro.patch +++ b/Ports/gnuapl/patches/0002-Stub-out-the-performance-report-macro.patch @@ -1,7 +1,7 @@ From 44e3ce1d066e2bcc574081ed828368974e0262a2 Mon Sep 17 00:00:00 2001 From: Tobias Christiansen Date: Fri, 11 Mar 2022 19:01:35 +0100 -Subject: [PATCH 2/4] Stub out the performance report macro +Subject: [PATCH 2/3] Stub out the performance report macro The Macro for performance reporting was throwing compile errors, so we just stub it out. --- diff --git a/Ports/gnuapl/patches/0003-Remove-use-of-sbrk.patch b/Ports/gnuapl/patches/0003-Remove-use-of-sbrk.patch index 6d4b6afaa89..89d14b67a3f 100644 --- a/Ports/gnuapl/patches/0003-Remove-use-of-sbrk.patch +++ b/Ports/gnuapl/patches/0003-Remove-use-of-sbrk.patch @@ -1,7 +1,7 @@ From c7d2b841f46831b159ed715cc5f313129ba6fb10 Mon Sep 17 00:00:00 2001 From: Tobias Christiansen Date: Fri, 11 Mar 2022 19:01:35 +0100 -Subject: [PATCH 3/4] Remove use of sbrk() +Subject: [PATCH 3/3] Remove use of sbrk() Again, for performance reporting the function `sbrk` is needed which we don't have. We just stub it out. --- diff --git a/Ports/gnuapl/patches/0004-Teach-config.sub-about-serenity.patch b/Ports/gnuapl/patches/0004-Teach-config.sub-about-serenity.patch deleted file mode 100644 index 71c8442490a..00000000000 --- a/Ports/gnuapl/patches/0004-Teach-config.sub-about-serenity.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b60680828e48ca362e86913de773a37b7a06bc74 Mon Sep 17 00:00:00 2001 -From: Tobias Christiansen -Date: Fri, 11 Mar 2022 19:01:35 +0100 -Subject: [PATCH 4/4] Teach config.sub about serenity - ---- - config.sub | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.sub b/config.sub -index eb0389a..bde853e 100755 ---- a/config.sub -+++ b/config.sub -@@ -1290,7 +1290,7 @@ case $os in - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -serenity* ) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) --- -2.36.1 - diff --git a/Ports/gnuapl/patches/ReadMe.md b/Ports/gnuapl/patches/ReadMe.md index 977b3af1379..48d35a2b95c 100644 --- a/Ports/gnuapl/patches/ReadMe.md +++ b/Ports/gnuapl/patches/ReadMe.md @@ -20,8 +20,3 @@ Remove use of sbrk() Again, for performance reporting the function `sbrk` is needed which we don't have. We just stub it out. -## `0004-Teach-config.sub-about-serenity.patch` - -Teach config.sub about serenity - -