mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 06:27:45 +00:00
Ports: Update libmpg123's patches to use git patches
This commit is contained in:
parent
70a8cb0ac3
commit
6c2009f915
2 changed files with 27 additions and 11 deletions
|
@ -1,3 +1,14 @@
|
||||||
|
From 21ff6032ff3fc0afe704d2363661c2a227911649 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Manganiello <adamantike@users.noreply.github.com>
|
||||||
|
Date: Sat, 26 Mar 2022 13:15:31 -0300
|
||||||
|
Subject: [PATCH] Teach the multiple configure files that serenity is a thing
|
||||||
|
|
||||||
|
---
|
||||||
|
configure | 4 ++--
|
||||||
|
configure.ac | 4 ++--
|
||||||
|
m4/libtool.m4 | 18 +++++++++---------
|
||||||
|
3 files changed, 13 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
diff --git a/configure b/configure
|
||||||
index d3404be..809a412 100755
|
index d3404be..809a412 100755
|
||||||
--- a/configure
|
--- a/configure
|
||||||
|
@ -17,7 +28,7 @@ index d3404be..809a412 100755
|
||||||
;;
|
;;
|
||||||
*-*-linux*|*-*-kfreebsd*-gnu)
|
*-*-linux*|*-*-kfreebsd*-gnu)
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 3ca8766..383120e 100644
|
index 3ca8766..fcffff9 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -709,11 +709,11 @@ case $host in
|
@@ -709,11 +709,11 @@ case $host in
|
||||||
|
@ -40,7 +51,7 @@ index a6d21ae..44d3c98 100644
|
||||||
+++ b/m4/libtool.m4
|
+++ b/m4/libtool.m4
|
||||||
@@ -2836,7 +2836,7 @@ linux*android*)
|
@@ -2836,7 +2836,7 @@ linux*android*)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# This must be glibc/ELF.
|
# This must be glibc/ELF.
|
||||||
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||||
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
||||||
|
@ -49,13 +60,13 @@ index a6d21ae..44d3c98 100644
|
||||||
need_version=no
|
need_version=no
|
||||||
@@ -3553,7 +3553,7 @@ irix5* | irix6* | nonstopux*)
|
@@ -3553,7 +3553,7 @@ irix5* | irix6* | nonstopux*)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# This must be glibc/ELF.
|
# This must be glibc/ELF.
|
||||||
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||||
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
||||||
lt_cv_deplibs_check_method=pass_all
|
lt_cv_deplibs_check_method=pass_all
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -4372,7 +4372,7 @@ m4_if([$1], [CXX], [
|
@@ -4372,7 +4372,7 @@ m4_if([$1], [CXX], [
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -68,7 +79,7 @@ index a6d21ae..44d3c98 100644
|
||||||
@@ -4696,7 +4696,7 @@ m4_if([$1], [CXX], [
|
@@ -4696,7 +4696,7 @@ m4_if([$1], [CXX], [
|
||||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||||
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
||||||
case $cc_basename in
|
case $cc_basename in
|
||||||
|
@ -95,7 +106,7 @@ index a6d21ae..44d3c98 100644
|
||||||
@@ -5197,7 +5197,7 @@ _LT_EOF
|
@@ -5197,7 +5197,7 @@ _LT_EOF
|
||||||
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
||||||
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu | serenity*)
|
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu | serenity*)
|
||||||
tmp_diet=no
|
tmp_diet=no
|
||||||
|
@ -104,7 +115,7 @@ index a6d21ae..44d3c98 100644
|
||||||
@@ -5809,7 +5809,7 @@ _LT_EOF
|
@@ -5809,7 +5809,7 @@ _LT_EOF
|
||||||
_LT_TAGVAR(link_all_deplibs, $1)=yes
|
_LT_TAGVAR(link_all_deplibs, $1)=yes
|
||||||
;;
|
;;
|
||||||
|
|
||||||
- linux*)
|
- linux*)
|
||||||
+ linux* | serenity*)
|
+ linux* | serenity*)
|
||||||
case $cc_basename in
|
case $cc_basename in
|
||||||
|
@ -113,9 +124,12 @@ index a6d21ae..44d3c98 100644
|
||||||
@@ -6952,7 +6952,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
@@ -6952,7 +6952,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||||
_LT_TAGVAR(inherit_rpath, $1)=yes
|
_LT_TAGVAR(inherit_rpath, $1)=yes
|
||||||
;;
|
;;
|
||||||
|
|
||||||
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||||
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
|
||||||
case $cc_basename in
|
case $cc_basename in
|
||||||
KCC*)
|
KCC*)
|
||||||
# Kuck and Associates, Inc. (KAI) C++ Compiler
|
# Kuck and Associates, Inc. (KAI) C++ Compiler
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Patches for mpg123 on SerenityOS
|
# Patches for libmpg123 on SerenityOS
|
||||||
|
|
||||||
|
## `0001-Teach-the-multiple-configure-files-that-serenity-is-.patch`
|
||||||
|
|
||||||
|
Teach the multiple configure files that serenity is a thing
|
||||||
|
|
||||||
## `add-serenity-target.patch`
|
|
||||||
|
|
||||||
Add `serenity` as a valid target.
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue