From 7ceccb7b8270d5fd67d2f96907e2635542966ec5 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 25 May 2022 22:20:15 +0200 Subject: [PATCH] Ports: Replace the `gsl` `config.sub` patch with our download --- Ports/gsl/package.sh | 1 + ...ss-all-dependency-checks-for-sereni.patch} | 2 +- ...0001-Teach-config.sub-about-serenity.patch | 45 ------------------- Ports/gsl/patches/ReadMe.md | 7 +-- 4 files changed, 3 insertions(+), 52 deletions(-) rename Ports/gsl/patches/{0002-Make-configure-pass-all-dependency-checks-for-sereni.patch => 0001-Make-configure-pass-all-dependency-checks-for-sereni.patch} (90%) delete mode 100644 Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch diff --git a/Ports/gsl/package.sh b/Ports/gsl/package.sh index a5cf146540..749bf1113d 100755 --- a/Ports/gsl/package.sh +++ b/Ports/gsl/package.sh @@ -8,3 +8,4 @@ https://ftp.gnu.org/gnu/gsl/gsl-${version}.tar.gz.sig gsl-${version}.tar.gz.sig https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" auth_type=sig auth_opts=("--keyring" "./gnu-keyring.gpg" "gsl-${version}.tar.gz.sig") +use_fresh_config_sub=true diff --git a/Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch b/Ports/gsl/patches/0001-Make-configure-pass-all-dependency-checks-for-sereni.patch similarity index 90% rename from Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch rename to Ports/gsl/patches/0001-Make-configure-pass-all-dependency-checks-for-sereni.patch index 2aef1547a9..172147593e 100644 --- a/Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch +++ b/Ports/gsl/patches/0001-Make-configure-pass-all-dependency-checks-for-sereni.patch @@ -1,7 +1,7 @@ From 4476d98e7c01bf1d5f45fe24a28ceac279949454 Mon Sep 17 00:00:00 2001 From: Rodrigo Tobar Date: Wed, 8 Sep 2021 00:13:16 +0800 -Subject: [PATCH 2/2] Make configure pass all dependency checks for serenity +Subject: [PATCH 1/1] Make configure pass all dependency checks for serenity --- configure | 4 ++++ diff --git a/Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch b/Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch deleted file mode 100644 index 1677e62323..0000000000 --- a/Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 54f21f92a7076d5e853f9ca37c57f34d54d01c67 Mon Sep 17 00:00:00 2001 -From: Rodrigo Tobar -Date: Wed, 8 Sep 2021 00:13:16 +0800 -Subject: [PATCH 1/2] Teach config.sub about serenity - ---- - config.sub | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/config.sub b/config.sub -index c765b34..c524678 100755 ---- a/config.sub -+++ b/config.sub -@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | *serenity* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os -@@ -1277,6 +1277,9 @@ case $basic_machine in - we32k) - basic_machine=we32k-att - ;; -+ *serenity*) -+ basic_machine="${SERENITY_ARCH}-pc" -+ ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -@@ -1404,6 +1407,9 @@ case $os in - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ *-serenity*) -+ os=-serenity -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; --- -2.36.1 - diff --git a/Ports/gsl/patches/ReadMe.md b/Ports/gsl/patches/ReadMe.md index 46d4815db0..3079007fdd 100644 --- a/Ports/gsl/patches/ReadMe.md +++ b/Ports/gsl/patches/ReadMe.md @@ -1,11 +1,6 @@ # Patches for gsl on SerenityOS -## `0001-Teach-config.sub-about-serenity.patch` - -Teach config.sub about serenity - - -## `0002-Make-configure-pass-all-dependency-checks-for-sereni.patch` +## `0001-Make-configure-pass-all-dependency-checks-for-sereni.patch` Make configure pass all dependency checks for serenity