When building a shared library on Mac, one must specify the original *.o

files that go into that library.  It does not work to specify a prior shared
library containing a subset of the files to be included.

FossilOrigin-Name: 5adc7d5dabbd9e2b18b3e13ab4e6463bfa8b5c1d604c94c8e67e6b812873ed30

diff --git a/main.mk b/main.mk
index 454528ba41453d70a1e5b51fcbecd1c928220fab..06d44ec18416a03d8fc6640865537371cc0a388f 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1382,11 +1382,11 @@ install: install-headers
 pkgIndex.tcl:
        echo 'package ifneeded sqlite3 $(PACKAGE_VERSION) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
 libtclsqlite3.SO = libtclsqlite3$(T.dll)
-$(libtclsqlite3.SO): $(T.tcl.env.sh) tclsqlite.o $(libsqlite3.SO)
+$(libtclsqlite3.SO): $(T.tcl.env.sh) tclsqlite.o $(LIBOBJ)
        $(T.tcl.env.source); \
        $(T.link.shared) -o $@ tclsqlite.o \
                $$TCL_INCLUDE_SPEC $$TCL_STUB_LIB_SPEC $(LDFLAGS.libsqlite3) \
-               $(libsqlite3.SO) -Wl,-rpath,$$TCLLIBDIR
+               $(LIBOBJ) -Wl,-rpath,$$TCLLIBDIR
 # ^^^ that rpath bit is defined as TCL_LD_SEARCH_FLAGS in
 # tclConfig.sh, but it's defined in such a way as to be useless for a
 # _static_ makefile.

diff --git a/manifest b/manifest
index a8a9ea8f080068cc30284afa48a76b480e978961..6aa280c67538c7cc8359d57085d3f3a9ec1e52ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sunnecessary\sbold\stext\sin\s./configure\soutput.
-D 2024-10-31T11:21:35.065
+C When\sbuilding\sa\sshared\slibrary\son\sMac,\sone\smust\sspecify\sthe\soriginal\s*.o\nfiles\sthat\sgo\sinto\sthat\slibrary.\s\sIt\sdoes\snot\swork\sto\sspecify\sa\sprior\sshared\nlibrary\scontaining\sa\ssubset\sof\sthe\sfiles\sto\sbe\sincluded.
+D 2024-10-31T11:53:18.461
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -697,7 +697,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk fea07cfa9091e5029b30980530353ba85a644acebe0ff9061c1bde7115863a8a
+F main.mk 4941b5880b4ea528258e2186e814463e438a812677478e318920f312408121c7
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2198,8 +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 cfb4bfcf1498b3740d210c24a71be343e8e0f262f3d9bddd45a673011307068c
-R deeda53f6d9982318710f230fa82388b
+P d1368dc12b05e9828cb86a608771b666914c0e027ac4c42dea0042b0345d8b22
+R 7a5385e858f58e3f1a354ee71815c1fa
 U drh
-Z 8e7ce6a7f971554c634e2af4fa35d784
+Z bb2214a3239826088ee34db0ce5245b8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9650e63d1bdf290008874f46982f5adcab423083..e1354bc5a0f748ec3acfd25a992ec0dde567608d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1368dc12b05e9828cb86a608771b666914c0e027ac4c42dea0042b0345d8b22
+5adc7d5dabbd9e2b18b3e13ab4e6463bfa8b5c1d604c94c8e67e6b812873ed30