summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-05-16 19:21:39 +0430
committerAli Mohammad Pur <Ali.mpfard@gmail.com>2022-05-19 20:17:10 +0430
commit89c59f20d23087732d07cf833f12fb1e2a489cc6 (patch)
tree853d3920987718b2cd63f7c9effa9c1a41ed74d0
parentd6076bfce7cc9e38686498962b6849b0083f96ab (diff)
downloadserenity-89c59f20d23087732d07cf833f12fb1e2a489cc6.zip
Ports: Update gsl's patches to use git patches
Note that the previous patches have been split in this commit as well.
-rw-r--r--Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch (renamed from Ports/gsl/patches/configure.patch)37
-rw-r--r--Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch27
-rw-r--r--Ports/gsl/patches/ReadMe.md12
3 files changed, 58 insertions, 18 deletions
diff --git a/Ports/gsl/patches/configure.patch b/Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch
index 656b6c24e1..1677e62323 100644
--- a/Ports/gsl/patches/configure.patch
+++ b/Ports/gsl/patches/0001-Teach-config.sub-about-serenity.patch
@@ -1,19 +1,17 @@
---- a/configure 2021-06-01 22:31:12.000000000 +0800
-+++ b/configure 2021-09-08 00:04:20.540891640 +0800
-@@ -6166,6 +6166,10 @@
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-+*serenity*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
---- a/config.sub 2017-07-23 22:03:39.000000000 +0800
-+++ b/config.sub 2021-09-08 00:02:45.724734622 +0800
-@@ -117,7 +117,7 @@
+From 54f21f92a7076d5e853f9ca37c57f34d54d01c67 Mon Sep 17 00:00:00 2001
+From: Rodrigo Tobar <rtobarc@gmail.com>
+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* | \
@@ -22,7 +20,7 @@
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
-@@ -1277,6 +1277,9 @@
+@@ -1277,6 +1277,9 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
@@ -32,7 +30,7 @@
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 @@
+@@ -1404,6 +1407,9 @@ case $os in
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -42,3 +40,6 @@
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
;;
+--
+2.36.1
+
diff --git a/Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch b/Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch
new file mode 100644
index 0000000000..2aef1547a9
--- /dev/null
+++ b/Ports/gsl/patches/0002-Make-configure-pass-all-dependency-checks-for-sereni.patch
@@ -0,0 +1,27 @@
+From 4476d98e7c01bf1d5f45fe24a28ceac279949454 Mon Sep 17 00:00:00 2001
+From: Rodrigo Tobar <rtobarc@gmail.com>
+Date: Wed, 8 Sep 2021 00:13:16 +0800
+Subject: [PATCH 2/2] Make configure pass all dependency checks for serenity
+
+---
+ configure | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index b593652..28269b6 100755
+--- a/configure
++++ b/configure
+@@ -6166,6 +6166,10 @@ bsdi[45]*)
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
++*serenity*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+--
+2.36.1
+
diff --git a/Ports/gsl/patches/ReadMe.md b/Ports/gsl/patches/ReadMe.md
new file mode 100644
index 0000000000..46d4815db0
--- /dev/null
+++ b/Ports/gsl/patches/ReadMe.md
@@ -0,0 +1,12 @@
+# 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`
+
+Make configure pass all dependency checks for serenity
+
+