From: stephan Date: Thu, 29 May 2025 20:33:39 +0000 (+0000) Subject: Fix the missing -lm link flag for the sqlite3 shell when building the autoconf bundle... X-Git-Tag: version-3.50.1~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=726b2db5112bebc4ab1429b600cb9009bb8480be;p=thirdparty%2Fsqlite.git Fix the missing -lm link flag for the sqlite3 shell when building the autoconf bundle with --disable-static-shell, as reported in [forum:5adf1c932a | forum post 5adf1c932a]. FossilOrigin-Name: 80d5a9daa6b34b628d6b5ef8b852d0a29a71fda46dd797091d9cdd3342037a9c --- diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index aaa23b7def..a77386faed 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -224,7 +224,7 @@ install: install-lib # ENABLE_STATIC_SHELL = @ENABLE_STATIC_SHELL@ sqlite3-shell-link-flags.1 = $(TOP)/sqlite3.c $(LDFLAGS.libsqlite3) -sqlite3-shell-link-flags.0 = -L. -lsqlite3 $(LDFLAGS.zlib) +sqlite3-shell-link-flags.0 = -L. -lsqlite3 $(LDFLAGS.zlib) $(LDFLAGS.math) sqlite3-shell-deps.1 = $(TOP)/sqlite3.c sqlite3-shell-deps.0 = $(libsqlite3.DLL) # diff --git a/manifest b/manifest index e40c550bc5..bcfa57b125 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.50.0 -D 2025-05-29T14:26:00.000 +C Fix\sthe\smissing\s-lm\slink\sflag\sfor\sthe\ssqlite3\sshell\swhen\sbuilding\sthe\sautoconf\sbundle\swith\s--disable-static-shell,\sas\sreported\sin\s[forum:5adf1c932a\s|\sforum\spost\s5adf1c932a]. +D 2025-05-29T20:33:39.940 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -17,7 +17,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def 82c32443a91c1062f7a48beec37dbb2d8d03447b1286bce8df5ebb6d8d353f8a F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 36516827bb5d2309422bbcbf53e873fa22ef179f5c25b1d3dc6a7255e63270b7 +F autoconf/Makefile.in d0926d2309e563b5ebdfd711e5c218533acab79829a05eef4e97c3a92e17bf42 F autoconf/Makefile.msc f15ad424ca2820df8e39d9157965710af0a64d87773706706a12ea4f96e3a0d8 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt b749816b8452b3af994dc6d607394bef3df1736d7e09359f1087de8439a52807 @@ -2207,12 +2207,15 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f037ca064daeb81cb386da2a372d8e2d2dce55a3a13bc7bea4968ca51bf2843a -R fc3e14ac4195ac71d03a1c1ffcef6f5e -T +bgcolor * green -T +sym-major-release * -T +sym-release * -T +sym-version-3.50.0 * -U drh -Z 5eb6447fe81d0ef07434d8f3c30d7b86 +P dfc790f998f450d9c35e3ba1c8c89c17466cb559f87b0239e4aab9d34e28f742 +Q +e6bf6b1b31a260b27b487fda9b7057066aa0a0445f6dadec18a4e2f93ab928f9 +R 6a3363f98db2c88adb39a14f695cabb9 +T *branch * branch-3.50 +T *sym-branch-3.50 * +T -sym-major-release * Cancelled\sby\sbranch. +T -sym-release * Cancelled\sby\sbranch. +T -sym-trunk * Cancelled\sby\sbranch. +T -sym-version-3.50.0 * Cancelled\sby\sbranch. +U stephan +Z 11e50d16300da88b02cc1ceaf16ccada # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 819b683fc3..f775fcdcaf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dfc790f998f450d9c35e3ba1c8c89c17466cb559f87b0239e4aab9d34e28f742 +80d5a9daa6b34b628d6b5ef8b852d0a29a71fda46dd797091d9cdd3342037a9c