From 9b4b068166d7b1e79d12ccbb7390b45f589ec13a Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 3 Jun 2022 16:06:46 +0200 Subject: [PATCH] Ports: Replace manually linking `SDL2_gfx` with a libtool patch --- Ports/SDL2_gfx/package.sh | 7 +- ...hared-library-support-for-SerenityOS.patch | 76 +++++++++++++++++++ Ports/SDL2_gfx/patches/ReadMe.md | 16 ++++ 3 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 Ports/SDL2_gfx/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch create mode 100644 Ports/SDL2_gfx/patches/ReadMe.md diff --git a/Ports/SDL2_gfx/package.sh b/Ports/SDL2_gfx/package.sh index 71c91b56814..62a84c3c839 100755 --- a/Ports/SDL2_gfx/package.sh +++ b/Ports/SDL2_gfx/package.sh @@ -7,9 +7,4 @@ auth_type=sha256 depends=("SDL2") useconfigure=true use_fresh_config_sub=true -configopts=("--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local") - -install() { - run make install DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" - run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.so -Wl,-soname,libSDL2_gfx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.a -Wl,--no-whole-archive -} +configopts=("--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local" "--disable-static" "--enable-shared") diff --git a/Ports/SDL2_gfx/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/SDL2_gfx/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch new file mode 100644 index 00000000000..ba7b8de21da --- /dev/null +++ b/Ports/SDL2_gfx/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -0,0 +1,76 @@ +From 0f827bb1e7e70c292982d68d1be79c0c64317333 Mon Sep 17 00:00:00 2001 +From: Tim Schumacher +Date: Sun, 29 May 2022 15:01:28 +0200 +Subject: [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. +--- + configure | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +diff --git a/configure b/configure +index ddcc961..4767551 100755 +--- a/configure ++++ b/configure +@@ -4600,6 +4600,10 @@ sysv4 | sysv4.3*) + tpf*) + lt_cv_deplibs_check_method=pass_all + ;; ++ ++serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + + fi +@@ -7874,6 +7878,10 @@ lt_prog_compiler_static= + lt_prog_compiler_static='-Bstatic' + ;; + ++ serenity*) ++ lt_prog_compiler_can_build_shared=yes ++ ;; ++ + *) + lt_prog_compiler_can_build_shared=no + ;; +@@ -9291,6 +9299,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } + hardcode_shlibpath_var=no + ;; + ++ serenity*) ++ ld_shlibs=yes ++ ;; ++ + *) + ld_shlibs=no + ;; +@@ -10282,6 +10294,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_gfx/patches/ReadMe.md b/Ports/SDL2_gfx/patches/ReadMe.md new file mode 100644 index 00000000000..40b7059f8f2 --- /dev/null +++ b/Ports/SDL2_gfx/patches/ReadMe.md @@ -0,0 +1,16 @@ +# Patches for SDL2_gfx on SerenityOS + +## `0001-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. +