From: stephan Date: Fri, 15 Nov 2024 15:31:13 +0000 (+0000) Subject: buildtclext.tcl: work around a case, reported in [forum:0683a49cb02f31a1|forum post... X-Git-Tag: major-relase~154 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48c8447574de60699df68ee2f928c2d71a93cef2;p=thirdparty%2Fsqlite.git buildtclext.tcl: work around a case, reported in [forum:0683a49cb02f31a1|forum post 0683a49cb0], in which package maintainers edit their copy of tclConfig.sh to change the TCL_SHLIB_LD command. FossilOrigin-Name: e24a3efec8c168b69d665ab20e8d715210208e6cf291ac93549fdd175a9009d6 --- diff --git a/manifest b/manifest index 92cde3b804..e30f66e03f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\sadd\soptional\spkg-config\ssupport\sfor\sdetecting\sICU. -D 2024-11-15T10:53:57.203 +C buildtclext.tcl:\swork\saround\sa\scase,\sreported\sin\s[forum:0683a49cb02f31a1|forum\spost\s0683a49cb0],\sin\swhich\spackage\smaintainers\sedit\stheir\scopy\sof\stclConfig.sh\sto\schange\sthe\sTCL_SHLIB_LD\scommand. +D 2024-11-15T15:31:13.141 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2105,7 +2105,7 @@ F tool/GetTclKit.bat d84033c6a93dfe735d247f48ba00292a1cc284dcf69963e5e672444e045 F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91 F tool/build-all-msvc.bat c817b716e0edeecaf265a6775b63e5f45c34a6544f1d4114a222701ed5ac79ab x F tool/build-shell.sh 369c4b171cc877ad974fef691e4da782b4c1e99fe8f4361316c735f64d49280f -F tool/buildtclext.tcl b64d250517b148e644d26fcbc097851867a0df52cd4bafe9bcd94b8421e1428a +F tool/buildtclext.tcl f046701e0bfa7c70116555dd4c3fbd7a8b61779c10a9e7586936c77a118c4b09 F tool/cg_anno.tcl c1f875f5a4c9caca3d59937b16aff716f8b1883935f1b4c9ae23124705bc8099 x F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2 F tool/cktclsh.sh 6075eef9c6b9ba4b38fef2ca2a66d25f2311bd3c610498d18a9b01f861629cca @@ -2198,9 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 1925a68fc2323f0788aac9c3c2bb3005182eb3286037bc383181b6aa150d4270 6ca457542e1dceac2d68fe3d29ff1f0beb31a77ca3073bd7d8a6c62faabcdc1d -R 02dd7c141e8d6d129c07207797697869 -T +closed 6ca457542e1dceac2d68fe3d29ff1f0beb31a77ca3073bd7d8a6c62faabcdc1d Closed\sby\sintegrate-merge. +P 3e5b8077c6c6ce72ecab3110eb45943b9765372df789088982dbd6046a7c2523 +R 94ae9c25b190024c5b115d0e3a9b04f4 U stephan -Z 467aed797000c9f6ea51561768e3c8cb +Z 33e57c416f120305271764524e72e9c6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1f254347f8..afec1a488e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3e5b8077c6c6ce72ecab3110eb45943b9765372df789088982dbd6046a7c2523 +e24a3efec8c168b69d665ab20e8d715210208e6cf291ac93549fdd175a9009d6 diff --git a/tool/buildtclext.tcl b/tool/buildtclext.tcl index 6d9e4c3063..ba16fc3cde 100644 --- 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} {