From b51bc1aa4edd780ae30ed7038f65b8c2d8a19113 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Tue, 7 Jun 2022 15:16:56 +0200 Subject: [PATCH] Ports/fontconfig: Import the `libtool` patch This previously went unnoticed because `fontconfig` was never linked into a shared library manually. --- Ports/fontconfig/package.sh | 9 ++- ...hared-library-support-for-SerenityOS.patch | 73 +++++++++++++++++++ Ports/fontconfig/patches/ReadMe.md | 14 ++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 Ports/fontconfig/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch diff --git a/Ports/fontconfig/package.sh b/Ports/fontconfig/package.sh index 412b380bea..345b7386d5 100755 --- a/Ports/fontconfig/package.sh +++ b/Ports/fontconfig/package.sh @@ -6,7 +6,14 @@ use_fresh_config_sub="true" depends=("libxml2" "freetype") files="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${version}.tar.xz fontconfig-${version}.tar.xz dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac" auth_type="sha256" -configopts=("--prefix=/usr/local" "--enable-libxml2" "LDFLAGS=-ldl -lxml2") +configopts=( + "--with-sysroot=${SERENITY_INSTALL_ROOT}" + "--prefix=/usr/local" + "--disable-static" + "--enable-shared" + "--enable-libxml2" + "LDFLAGS=-ldl -lxml2" +) export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/libxml2" export LIBXML2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/libxml2/" diff --git a/Ports/fontconfig/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/fontconfig/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch new file mode 100644 index 0000000000..388a18e3dc --- /dev/null +++ b/Ports/fontconfig/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 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 cd2e462..23e9943 100755 +--- a/configure ++++ b/configure +@@ -7525,6 +7525,10 @@ tpf*) + os2*) + lt_cv_deplibs_check_method=pass_all + ;; ++ ++serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + + fi +@@ -10990,6 +10994,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 + ;; +@@ -12520,6 +12528,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } + hardcode_shlibpath_var=no + ;; + ++ serenity*) ++ ld_shlibs=yes ++ ;; ++ + *) + ld_shlibs=no + ;; +@@ -13595,6 +13607,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 + ;; diff --git a/Ports/fontconfig/patches/ReadMe.md b/Ports/fontconfig/patches/ReadMe.md index bb7d3655a2..291807b1d1 100644 --- a/Ports/fontconfig/patches/ReadMe.md +++ b/Ports/fontconfig/patches/ReadMe.md @@ -10,3 +10,17 @@ Stub out FcRandom() Manually link against lxml2 and ldl +## `0003-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. +