diff --git a/Ports/SDL2_ttf/package.sh b/Ports/SDL2_ttf/package.sh index 2bd5ba829c8..9b7d73287fb 100755 --- a/Ports/SDL2_ttf/package.sh +++ b/Ports/SDL2_ttf/package.sh @@ -12,11 +12,8 @@ configure() { --host="${SERENITY_ARCH}-pc-serenity" \ --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ --with-x=no \ + --disable-static \ + --enable-shared \ FT2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" \ LIBS="-lgui -lgfx -lipc -lcore -lcompress" } - -install() { - run make install DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" - run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.so -Wl,-soname,libSDL2_ttf.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.a -Wl,--no-whole-archive -lfreetype -} diff --git a/Ports/SDL2_ttf/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/SDL2_ttf/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch new file mode 100644 index 00000000000..2e3ca4323aa --- /dev/null +++ b/Ports/SDL2_ttf/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -0,0 +1,94 @@ +From 1aec7f15c8d70f249b051a65823215c382fa0498 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 | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/configure b/configure +index 02724d0..fec4760 100755 +--- a/configure ++++ b/configure +@@ -4841,6 +4841,10 @@ tpf*) + os2*) + lt_cv_deplibs_check_method=pass_all + ;; ++ ++serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + + fi +@@ -7634,6 +7638,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 + ;; +@@ -8919,6 +8927,10 @@ rm -f core conftest.err conftest.$ac_objext \ + hardcode_shlibpath_var=no + ;; + ++ serenity*) ++ ld_shlibs=yes ++ ;; ++ + *) + ld_shlibs=no + ;; +@@ -9846,6 +9858,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 + ;; +@@ -15654,6 +15677,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_ttf/patches/ReadMe.md b/Ports/SDL2_ttf/patches/ReadMe.md new file mode 100644 index 00000000000..81ce350f494 --- /dev/null +++ b/Ports/SDL2_ttf/patches/ReadMe.md @@ -0,0 +1,16 @@ +# Patches for SDL2_ttf 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. +