diff --git a/Ports/libassuan/package.sh b/Ports/libassuan/package.sh index 7874c62046..d94f5caaa9 100755 --- a/Ports/libassuan/package.sh +++ b/Ports/libassuan/package.sh @@ -13,11 +13,5 @@ pre_configure() { } configure() { - run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}" -} - -install() { - run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install - ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libassuan.so -Wl,-soname,libassuan.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libassuan.a -Wl,--no-whole-archive -lgpg-error - rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libassuan.la + run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" --disable-static --enable-shared "${configopts[@]}" } diff --git a/Ports/libassuan/patches/0001-Include-sys-time.h.patch b/Ports/libassuan/patches/0001-Include-sys-time.h.patch index a345cb09a6..5293785d91 100644 --- a/Ports/libassuan/patches/0001-Include-sys-time.h.patch +++ b/Ports/libassuan/patches/0001-Include-sys-time.h.patch @@ -1,7 +1,7 @@ -From f5ca6465464e4649a81fa3694e69e71efd3e5f46 Mon Sep 17 00:00:00 2001 +From 4bd9445c203d7d46d40a31c54699681fc6042de7 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 14 Apr 2021 04:32:19 +0200 -Subject: [PATCH] Include sys/time.h +Subject: [PATCH 1/2] Include sys/time.h --- src/assuan-socket.c | 1 + diff --git a/Ports/libassuan/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/libassuan/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch new file mode 100644 index 0000000000..d10d0c34c6 --- /dev/null +++ b/Ports/libassuan/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -0,0 +1,76 @@ +From 2b1a1933641853db42a37f772efc6d5271e3db16 Mon Sep 17 00:00:00 2001 +From: Tim Schumacher +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 7bee4db..dfbc3ea 100755 +--- a/configure ++++ b/configure +@@ -5961,6 +5961,10 @@ sysv4 | sysv4.3*) + tpf*) + lt_cv_deplibs_check_method=pass_all + ;; ++ ++serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + + fi +@@ -8990,6 +8994,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 + ;; +@@ -10406,6 +10414,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } + hardcode_shlibpath_var=no + ;; + ++ serenity*) ++ ld_shlibs=yes ++ ;; ++ + *) + ld_shlibs=no + ;; +@@ -11421,6 +11433,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/libassuan/patches/ReadMe.md b/Ports/libassuan/patches/ReadMe.md index f3857f2997..5b132c8241 100644 --- a/Ports/libassuan/patches/ReadMe.md +++ b/Ports/libassuan/patches/ReadMe.md @@ -5,3 +5,17 @@ Include sys/time.h +## `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. +