mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 05:37:34 +00:00
Ports: Update gsl's patches to use git patches
Note that the previous patches have been split in this commit as well.
This commit is contained in:
parent
d6076bfce7
commit
89c59f20d2
3 changed files with 58 additions and 18 deletions
|
@ -1,19 +1,17 @@
|
||||||
--- a/configure 2021-06-01 22:31:12.000000000 +0800
|
From 54f21f92a7076d5e853f9ca37c57f34d54d01c67 Mon Sep 17 00:00:00 2001
|
||||||
+++ b/configure 2021-09-08 00:04:20.540891640 +0800
|
From: Rodrigo Tobar <rtobarc@gmail.com>
|
||||||
@@ -6166,6 +6166,10 @@
|
Date: Wed, 8 Sep 2021 00:13:16 +0800
|
||||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
Subject: [PATCH 1/2] Teach config.sub about serenity
|
||||||
;;
|
|
||||||
|
|
||||||
+*serenity*)
|
---
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
config.sub | 8 +++++++-
|
||||||
+ ;;
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||||
+
|
|
||||||
cygwin*)
|
diff --git a/config.sub b/config.sub
|
||||||
# func_win32_libid is a shell function defined in ltmain.sh
|
index c765b34..c524678 100755
|
||||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
--- a/config.sub
|
||||||
--- a/config.sub 2017-07-23 22:03:39.000000000 +0800
|
+++ b/config.sub
|
||||||
+++ b/config.sub 2021-09-08 00:02:45.724734622 +0800
|
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||||
@@ -117,7 +117,7 @@
|
|
||||||
case $maybe_os in
|
case $maybe_os in
|
||||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||||
|
@ -22,7 +20,7 @@
|
||||||
kopensolaris*-gnu* | \
|
kopensolaris*-gnu* | \
|
||||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||||
os=-$maybe_os
|
os=-$maybe_os
|
||||||
@@ -1277,6 +1277,9 @@
|
@@ -1277,6 +1277,9 @@ case $basic_machine in
|
||||||
we32k)
|
we32k)
|
||||||
basic_machine=we32k-att
|
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)
|
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||||
basic_machine=sh-unknown
|
basic_machine=sh-unknown
|
||||||
;;
|
;;
|
||||||
@@ -1404,6 +1407,9 @@
|
@@ -1404,6 +1407,9 @@ case $os in
|
||||||
-linux*)
|
-linux*)
|
||||||
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
||||||
;;
|
;;
|
||||||
|
@ -42,3 +40,6 @@
|
||||||
-sunos5*)
|
-sunos5*)
|
||||||
os=`echo $os | sed -e 's|sunos5|solaris2|'`
|
os=`echo $os | sed -e 's|sunos5|solaris2|'`
|
||||||
;;
|
;;
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
|
@ -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
|
||||||
|
|
12
Ports/gsl/patches/ReadMe.md
Normal file
12
Ports/gsl/patches/ReadMe.md
Normal file
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue