commit: 8209c30452a589405b4bb486e72345a4de08de83 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Dec 5 11:36:09 2024 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Dec 5 11:38:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8209c304
dev-db/sqlite: Apply buildtclext patch to 3.47.1 Closes: https://bugs.gentoo.org/945906 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> .../sqlite/files/sqlite-3.47.1-buildtclext.patch | 33 ++++++++++++++++++++++ dev-db/sqlite/sqlite-3.47.1.ebuild | 1 + 2 files changed, 34 insertions(+) diff --git a/dev-db/sqlite/files/sqlite-3.47.1-buildtclext.patch b/dev-db/sqlite/files/sqlite-3.47.1-buildtclext.patch new file mode 100644 index 000000000000..d7a95ec52739 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.47.1-buildtclext.patch @@ -0,0 +1,33 @@ +# https://bugs.gentoo.org/945906 +# https://www.sqlite.org/src/info?name=e24a3efec8c168b6 +--- a/tool/buildtclext.tcl ++++ b/tool/buildtclext.tcl +@@ -107,7 +107,7 @@ if {$tcl_platform(platform)=="windows"} { + set fd [open $LIBDIR/tclConfig.sh rb] + set tclConfig [read $fd] + close $fd +- ++ + # Extract parameter we will need from the tclConfig.sh file + # + set TCLMAJOR 8 +@@ -140,14 +140,17 @@ if {$tcl_platform(platform)=="windows"} { + if {[string length $OPTS]>1} { + append LDFLAGS $OPTS + } +- set CMD [subst $cmd] + if {$TCLMAJOR>8} { + set OUT libtcl9sqlite$VERSION.$SUFFIX + } else { + set OUT libsqlite$VERSION.$SUFFIX + } ++ set @ $OUT; # Workaround for https://sqlite.org/forum/forumpost/0683a49cb02f31a1 ++ # in which Gentoo edits their tclConfig.sh to include an soname ++ # linker flag which includes ${@} (the target file's name). ++ set CMD [subst $cmd] + } +- ++ + # Show information about prior installs + # + if {$infoonly} { diff --git a/dev-db/sqlite/sqlite-3.47.1.ebuild b/dev-db/sqlite/sqlite-3.47.1.ebuild index 6f71237f381c..a5d7c70c508f 100644 --- a/dev-db/sqlite/sqlite-3.47.1.ebuild +++ b/dev-db/sqlite/sqlite-3.47.1.ebuild @@ -52,6 +52,7 @@ fi PATCHES=( "${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch + "${FILESDIR}"/${PN}-3.47.1-buildtclext.patch ) _fossil_fetch() {
