]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add the --disable-rpath configure script flag to address [forum:13cac3b56516f849...
authorstephan <stephan@noemail.net>
Sun, 22 Jun 2025 22:48:11 +0000 (22:48 +0000)
committerstephan <stephan@noemail.net>
Sun, 22 Jun 2025 22:48:11 +0000 (22:48 +0000)
FossilOrigin-Name: a59d9bb25e518f5d79f654615b92f6c50cfb704b5abee0f820912644b89366c5

autosetup/sqlite-config.tcl
manifest
manifest.uuid

index bb81123204c3ed0c3c653a483268481995ef95e2..4dd065095ed87ea5b9f2381b8feefba493b25fca 100644 (file)
@@ -336,8 +336,8 @@ proc sqlite-configure {buildMode configScript} {
           => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
       }
       {canonical autoconf} {
-        # A potential TODO without a current use case:
-        #rpath=1 => {Disable use of the rpath linker flag}
+        rpath=1 => {Disable use of the rpath linker flag}
+
         # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
         soname:=legacy
           => {SONAME for libsqlite3.so. "none", or not using this flag, sets no
@@ -2140,7 +2140,6 @@ proc sqlite-handle-tcl {} {
 ########################################################################
 # Handle the --enable/disable-rpath flag.
 proc sqlite-handle-rpath {} {
-  proj-check-rpath
   # autosetup/cc-shared.tcl sets the rpath flag definition in
   # [get-define SH_LINKRPATH], but it does so on a per-platform basis
   # rather than as a compiler check. Though we should do a proper
@@ -2149,12 +2148,13 @@ proc sqlite-handle-rpath {} {
   # for which sqlite-env-is-unix-on-windows returns a non-empty
   # string.
 
-#  if {[proj-opt-truthy rpath]} {
-#    proj-check-rpath
-#  } else {
-#    msg-result "Disabling use of rpath."
-#    define LDFLAGS_RPATH ""
-#  }
+  # https://sqlite.org/forum/forumpost/13cac3b56516f849
+  if {[proj-opt-truthy rpath]} {
+    proj-check-rpath
+  } else {
+    msg-result "Disabling use of rpath."
+    define LDFLAGS_RPATH ""
+  }
 }
 
 ########################################################################
index 1eb863ecd235aa6ac7fbb9093bb460c6db4dbf98..ff7f37d32c20851380305283997046797bd286cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C API\sdoc\stypo\sfixes\sfrom\sbrickviking.
-D 2025-06-22T12:04:47.540
+C Add\sthe\s--disable-rpath\sconfigure\sscript\sflag\sto\saddress\s[forum:13cac3b56516f849\s|\sforum\spost\s13cac3b56516f849].
+D 2025-06-22T22:48:11.178
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -47,7 +47,7 @@ F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1
 F autosetup/jimsh0.c 563b966c137a4ce3c9333e5196723b7ac0919140a9d7989eb440463cd855c367
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl 6aac1eb3059fc511c8e1659f33b96eb2a216a371ed9b28be6661374061be9b15
-F autosetup/sqlite-config.tcl 0bcb12c99a1673a2009164a3318890d5820701d329bf12702daa96a38d064bde
+F autosetup/sqlite-config.tcl 3177dedd7bd49465fa06677fd743c4966eee5702a9ddf4914c2c1af5e5972a52
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca
 F autosetup/teaish/core.tcl aee092fc71986d1272b835ea7492bb55ffc213a289502e4f14da80cf67b7e3c3
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 764235a3d15fda55af85ebe3b5885fa27336cc0e979f1be2f6770b66a84bbe87
-R 88dda41b8529d33bc5b3cb17084c9f67
+P 18e07f8f53693d0dace3c4025a572c1a10582290a338aa7f0913c83842a69b05
+R e16d3d115bdbd54cf6c22a5382f1620d
 U stephan
-Z 802d0d39f303a33ae18d90ea047f6a78
+Z 414f602491ba6e84a4de4f46e062a449
 # Remove this line to create a well-formed Fossil manifest.
index 541ff1881bca69fec582d793df96acc1507c298b..ea14ad013b419353070b411f0af9c0f5a5d60b24 100644 (file)
@@ -1 +1 @@
-18e07f8f53693d0dace3c4025a572c1a10582290a338aa7f0913c83842a69b05
+a59d9bb25e518f5d79f654615b92f6c50cfb704b5abee0f820912644b89366c5