summaryrefslogtreecommitdiff
path: root/Ports/libiconv/patches
diff options
context:
space:
mode:
Diffstat (limited to 'Ports/libiconv/patches')
-rw-r--r--Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch25
-rw-r--r--Ports/libiconv/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch (renamed from Ports/libiconv/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch)10
-rw-r--r--Ports/libiconv/patches/ReadMe.md7
3 files changed, 6 insertions, 36 deletions
diff --git a/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch b/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch
deleted file mode 100644
index 3acfa2ee29..0000000000
--- a/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 74f7065ed6f9cf338f53657ea08e980328dd27c6 Mon Sep 17 00:00:00 2001
-From: Vincent Sanders <vince@kyllikki.org>
-Date: Sun, 6 Oct 2019 11:11:16 +0100
-Subject: [PATCH 1/2] Stub out getprogname() for serenity
-
----
- srclib/getprogname.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/srclib/getprogname.c b/srclib/getprogname.c
-index 22d71eb..7cc112d 100644
---- a/srclib/getprogname.c
-+++ b/srclib/getprogname.c
-@@ -244,6 +244,8 @@ getprogname (void)
- }
- }
- return NULL;
-+# elif defined __serenity__
-+ return "?";
- # else
- # error "getprogname module not ported to this OS"
- # endif
---
-2.36.1
-
diff --git a/Ports/libiconv/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/libiconv/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch
index 0ddb432ec4..de144fd65b 100644
--- a/Ports/libiconv/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch
+++ b/Ports/libiconv/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch
@@ -17,10 +17,10 @@ static library into a shared library.
1 file changed, 23 insertions(+)
diff --git a/configure b/configure
-index 3488d1d..33b4956 100755
+index 668c3dd..a2857fc 100755
--- a/configure
+++ b/configure
-@@ -7376,6 +7376,10 @@ tpf*)
+@@ -8649,6 +8649,10 @@ tpf*)
os2*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -31,7 +31,7 @@ index 3488d1d..33b4956 100755
esac
fi
-@@ -10688,6 +10692,10 @@ lt_prog_compiler_static=
+@@ -12125,6 +12129,10 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-Bstatic'
;;
@@ -42,7 +42,7 @@ index 3488d1d..33b4956 100755
*)
lt_prog_compiler_can_build_shared=no
;;
-@@ -12206,6 +12214,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+@@ -13657,6 +13665,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
hardcode_shlibpath_var=no
;;
@@ -53,7 +53,7 @@ index 3488d1d..33b4956 100755
*)
ld_shlibs=no
;;
-@@ -13274,6 +13286,17 @@ uts4*)
+@@ -14729,6 +14741,17 @@ uts4*)
shlibpath_var=LD_LIBRARY_PATH
;;
diff --git a/Ports/libiconv/patches/ReadMe.md b/Ports/libiconv/patches/ReadMe.md
index 779a29f555..1ee364b2bc 100644
--- a/Ports/libiconv/patches/ReadMe.md
+++ b/Ports/libiconv/patches/ReadMe.md
@@ -1,11 +1,6 @@
# Patches for libiconv on SerenityOS
-## `0001-Stub-out-getprogname-for-serenity.patch`
-
-Stub out getprogname() for serenity
-
-
-## `0002-libtool-Enable-shared-library-support-for-SerenityOS.patch`
+## `0001-libtool-Enable-shared-library-support-for-SerenityOS.patch`
libtool: Enable shared library support for SerenityOS