diff options
Diffstat (limited to 'Ports/SDL2_mixer/patches')
3 files changed, 92 insertions, 2 deletions
diff --git a/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch index eef1a7b92c..388c78c89e 100644 --- a/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch +++ b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch @@ -1,7 +1,7 @@ -From a8e2b31abe3f56f21b4835af00620ce29ce6becb Mon Sep 17 00:00:00 2001 +From 45c3472482141099e7a14fa67c159b0dcd4164da Mon Sep 17 00:00:00 2001 From: Andreas Kling <kling@serenityos.org> Date: Mon, 8 Mar 2021 13:15:35 +0100 -Subject: [PATCH] Skip building the playmus and playwav utilities +Subject: [PATCH 1/2] Skip building the playmus and playwav utilities --- Makefile.in | 14 ++------------ diff --git a/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch new file mode 100644 index 0000000000..9e91003bd6 --- /dev/null +++ b/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -0,0 +1,76 @@ +From 2bc8e2c1b321c59ef39c7dbe95871f0f08d1d139 Mon Sep 17 00:00:00 2001 +From: Tim Schumacher <timschumi@gmx.de> +Date: Sun, 29 May 2022 15:01:28 +0200 +Subject: [PATCH 2/2] libtool: Enable shared library support for SerenityOS + +For some odd reason, libtool handles the configuration for shared +libraries entirely statically and in its configure script. If no +shared library support is "present", building shared libraries is +disabled entirely. + +Fix that by just adding the appropriate configuration options for +`serenity`. This allows us to finally create dynamic libraries +automatically using libtool, without having to manually link the +static library into a shared library. +--- + configure | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +diff --git a/configure b/configure +index 4df0be5..9a5f606 100755 +--- a/configure ++++ b/configure +@@ -4480,6 +4480,10 @@ sysv4 | sysv4.3*) + tpf*) + lt_cv_deplibs_check_method=pass_all + ;; ++ ++serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + + fi +@@ -7268,6 +7272,10 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + lt_prog_compiler_static='-Bstatic' + ;; + ++ serenity*) ++ lt_prog_compiler_can_build_shared=yes ++ ;; ++ + *) + lt_prog_compiler_can_build_shared=no + ;; +@@ -8504,6 +8512,10 @@ rm -f core conftest.err conftest.$ac_objext \ + hardcode_shlibpath_var=no + ;; + ++ serenity*) ++ ld_shlibs=yes ++ ;; ++ + *) + ld_shlibs=no + ;; +@@ -9406,6 +9418,17 @@ uts4*) + shlibpath_var=LD_LIBRARY_PATH + ;; + ++serenity*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}${versuffix} ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}${major}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ dynamic_linker='SerenityOS LibELF' ++ ;; ++ + *) + dynamic_linker=no + ;; +-- +2.36.1 + diff --git a/Ports/SDL2_mixer/patches/ReadMe.md b/Ports/SDL2_mixer/patches/ReadMe.md index 3744f95d5d..4509c5b1cd 100644 --- a/Ports/SDL2_mixer/patches/ReadMe.md +++ b/Ports/SDL2_mixer/patches/ReadMe.md @@ -5,3 +5,17 @@ Skip building the playmus and playwav utilities +## `0002-libtool-Enable-shared-library-support-for-SerenityOS.patch` + +libtool: Enable shared library support for SerenityOS + +For some odd reason, libtool handles the configuration for shared +libraries entirely statically and in its configure script. If no +shared library support is "present", building shared libraries is +disabled entirely. + +Fix that by just adding the appropriate configuration options for +`serenity`. This allows us to finally create dynamic libraries +automatically using libtool, without having to manually link the +static library into a shared library. + |