From: stephan <stephan@noemail.net>
Date: Sat, 9 Nov 2024 14:34:20 +0000 (+0000)
Subject: Fix a deps problem, introduced in [1bd9de719], which breaks the build on systems... 
X-Git-Tag: major-relase~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1b88ec9539b6135754adeff130715f92e97de53;p=thirdparty%2Fsqlite.git

Fix a deps problem, introduced in [1bd9de719], which breaks the build on systems where HAVE_TCL=0.

FossilOrigin-Name: 7953a8bdcba7242c98f786283270d7b3f8830058a29f2d810457eef697855325
---

diff --git a/main.mk b/main.mk
index e4dcbc2a28..21dd01cfde 100644
--- a/main.mk
+++ b/main.mk
@@ -981,8 +981,8 @@ T.tcl.env.sh = ./.tclenv.sh
 $(T.tcl.env.sh): $(TCLSH_CMD) $(TCL_CONFIG_SH) $(MAKEFILE_LIST)
 	@if [ x = "x$(TCL_CONFIG_SH)" ]; then \
 		echo 'TCL_CONFIG_SH must be set to point to a "tclConfig.sh"' 1>&2; exit 1; \
-	fi
-	@if [ x != "x$(TCLLIBDIR)" ]; then echo TCLLIBDIR="$(TCLLIBDIR)"; else \
+	fi; \
+	if [ x != "x$(TCLLIBDIR)" ]; then echo TCLLIBDIR="$(TCLLIBDIR)"; else \
 		ld= ; \
 		for d in `echo "puts stdout \\$$auto_path" | $(TCLSH_CMD)`; do \
 			if [ -d "$$d" ]; then ld=$$d; break; fi; \
@@ -990,8 +990,8 @@ $(T.tcl.env.sh): $(TCLSH_CMD) $(TCL_CONFIG_SH) $(MAKEFILE_LIST)
 		if [ x = "x$$ld" ]; then echo "Cannot determine TCLLIBDIR" 1>&2; exit 1; fi; \
 		echo "TCLLIBDIR=$$ld/sqlite3"; \
 	fi > $@; \
-	echo ". \"$(TCL_CONFIG_SH)\" || exit \$$?" >> $@
-	@echo "Created $@"
+	echo ". \"$(TCL_CONFIG_SH)\" || exit \$$?" >> $@; \
+	echo "Created $@"
 
 #
 # $(T.tcl.env.source) is shell code to be run as part of any
@@ -1335,7 +1335,9 @@ tclsqlite-stubs.o:	$(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON)
 tclsqlite3$(T.exe):	$(T.tcl.env.sh) tclsqlite-shell.o $(libsqlite3.SO)
 	$(T.link.tcl) -o $@ tclsqlite-shell.o \
 		 $(libsqlite3.SO) $$TCL_INCLUDE_SPEC $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
-tcl: tclsqlite3$(T.exe)
+tclsqlite3$(T.exe)-1: tclsqlite3$(T.exe)
+tclsqlite3$(T.exe)-0 tclsqlite3$(T.exe)-:
+tcl: tclsqlite3$(T.exe)-$(HAVE_TCL)
 
 # Rules to build opcodes.c and opcodes.h
 #
@@ -1478,7 +1480,9 @@ install: install-headers
 #
 pkgIndex.tcl:
 	echo 'package ifneeded sqlite3 $(PACKAGE_VERSION) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
-tcl: pkgIndex.tcl
+pkgIndex.tcl-1: pkgIndex.tcl
+pkgIndex.tcl-0 pkgIndex.tcl-:
+tcl: pkgIndex.tcl-$(HAVE_TCL)
 libtclsqlite3.SO = libtclsqlite3$(T.dll)
 $(libtclsqlite3.SO): $(T.tcl.env.sh) tclsqlite.o $(LIBOBJ)
 	$(T.tcl.env.source); \
diff --git a/manifest b/manifest
index d36672438a..b458d79dd1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\susage\sof\sproj-assert\sby\smaking\sthe\sexpr\sprefix\simplicit.\sAdd\san\soptional\sdescription\sarg\sto\sproj-assert,\sdefaulting\sto\sthe\sbody\sof\sthe\sassertion\sscript.
-D 2024-11-09T10:23:04.469
+C Fix\sa\sdeps\sproblem,\sintroduced\sin\s[1bd9de719],\swhich\sbreaks\sthe\sbuild\son\ssystems\swhere\sHAVE_TCL=0.
+D 2024-11-09T14:34:20.060
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -696,7 +696,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 af87776a921824639555d040d7a917de0f295b3dfa70079105b4fb42fdf425c3
+F main.mk efb8f627c5793126ff7a86d698676f4e6509a296b0b113ec284e6f723561f0bc
 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 906563a7e07fca81effb31a77ee5d7cdacd4cc6157e16e1139da70c92716869a
-R 80ec48dbf7e84a814515b0c1aedd20af
+P ada7b36c37c59ea02e54462b0eb8b93ff6ab45863edfd67b19f1e1a7bb2f97de
+R bf8863b8add1d028b446d64a9e7551d4
 U stephan
-Z 18ce4bb625331a3aaef20d9b98a0b830
+Z 22d08ab5c31638260d1b0957cd0fc1f8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5e89fd1d2c..13fe96534d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ada7b36c37c59ea02e54462b0eb8b93ff6ab45863edfd67b19f1e1a7bb2f97de
+7953a8bdcba7242c98f786283270d7b3f8830058a29f2d810457eef697855325