From: stephan <stephan@noemail.net>
Date: Mon, 24 Feb 2025 05:10:09 +0000 (+0000)
Subject: Add some internal notes about potential changes for the rpath flag handling.
X-Git-Tag: major-release~242^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a63dee09a6184dea956a2d91d9a43a1c97971ec4;p=thirdparty%2Fsqlite.git

Add some internal notes about potential changes for the rpath flag handling.

FossilOrigin-Name: 6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index d32119e755..cca6f9075b 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -249,6 +249,7 @@ proc sqlite-config-bootstrap {buildMode} {
           => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
       }
       {*} {
+        # A potential TODO without a current use case:
         #rpath=1 => {Disable use of the rpath linker flag}
         # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
         soname:=legacy
@@ -1901,8 +1902,17 @@ proc sqlite-handle-tcl {} {
 ########################################################################
 # Handle the --enable/disable-rpath flag.
 proc sqlite-handle-rpath {} {
+  proj-check-rpath
+  # autosetup/cc-chared.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
+  # compiler check (as proj-check-rpath does), we may want to consider
+  # adopting its approach of clearing the rpath flags for environments
+  # for which sqlite-env-is-unix-on-windows returns a non-empty
+  # string.
+
 #  if {[proj-opt-truthy rpath]} {
-    proj-check-rpath
+#    proj-check-rpath
 #  } else {
 #    msg-result "Disabling use of rpath."
 #    define LDFLAGS_RPATH ""
diff --git a/manifest b/manifest
index fd660a7982..9af16dd0e4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sjimsh0.c\sfrom\supstream\sautosetup\sto\saddress\s[https://github.com/msteveb/autosetup/issues/75|autosetup\sticket\s#75],\striggered\sby\sthis\sbuild\sin\sthe\sGentoo\sproject.
-D 2025-02-24T04:47:34.727
+C Add\ssome\sinternal\snotes\sabout\spotential\schanges\sfor\sthe\srpath\sflag\shandling.
+D 2025-02-24T05:10:09.506
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22
-F autosetup/sqlite-config.tcl ecdf12a482eb4779e7af48f917d31742ea881ad4ab989518c83e3400d9f8106f
+F autosetup/sqlite-config.tcl 3e6815229a2e43d0ceb35c051ccdb7888feacc6ff94ed9da9dca1d81494ca105
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2210,8 +2210,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 38ba8e837c2679f12a4019612f7188cb4afffd43cef7af4a4aa02e62c20885ac
-R 4c0aa0676d1a4513bf4ed482d0d66271
+P ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56
+R eeeefd36d893cc55dc27e27479712352
 U stephan
-Z f85c47e7c816fa6b50a85716ddc8c88a
+Z 2cdb20385f544083be489e48d188981f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9936289a52..bca7853b2c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56
+6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987