Ports/sqlite: Replace the stub libtool patch with the full version

This commit is contained in:
Tim Schumacher 2023-08-04 16:23:24 +02:00 committed by Jelle Raaijmakers
parent a0869159cd
commit a8f5cf9da7
Notes: sideshowbarker 2024-07-17 11:30:05 +09:00
3 changed files with 84 additions and 33 deletions

View file

@ -1,31 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <akaster@serenityos.org>
Date: Sat, 8 Jan 2022 05:33:27 -0700
Subject: [PATCH] Teach configure about serenity
---
configure | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
index 367f505..df6217c 100755
--- a/configure
+++ b/configure
@@ -11067,6 +11067,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_shlibpath_var=no
;;
+ serenity*)
+ ;;
*)
ld_shlibs=no
;;
@@ -12147,6 +12149,8 @@ uts4*)
shlibpath_var=LD_LIBRARY_PATH
;;
+serenity*)
+ ;;
*)
dynamic_linker=no
;;

View file

@ -0,0 +1,73 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
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 dea9860d00ee4a325301481f2225c5621552c703..fa51ac2b21c55159562b59aaad4421513b9e7b29 100755
--- a/configure
+++ b/configure
@@ -7030,6 +7030,10 @@ tpf*)
os2*)
lt_cv_deplibs_check_method=pass_all
;;
+
+serenity*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -10199,6 +10203,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
;;
@@ -11733,6 +11741,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
hardcode_shlibpath_var=no
;;
+ serenity*)
+ ld_shlibs=yes
+ ;;
+
*)
ld_shlibs=no
;;
@@ -12817,6 +12829,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
;;

View file

@ -1,9 +1,18 @@
# Patches for sqlite on SerenityOS
## `0001-Teach-configure-about-serenity.patch`
## `0001-libtool-Enable-shared-library-support-for-SerenityOS.patch`
Teach configure about serenity
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.
## `0002-Disable-vfs-locking.patch`