From: stephan <stephan@noemail.net>
Date: Sun, 3 Nov 2024 19:42:41 +0000 (+0000)
Subject: If any autotools-conventional dir names are explicitly overridden via ./configure... 
X-Git-Tag: major-relase~241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97c709b5be269b4ec454905db26ee842e6a3a20f;p=thirdparty%2Fsqlite.git

If any autotools-conventional dir names are explicitly overridden via ./configure --dirname=X then export those names as-is to the makefile, otherwise derive them from $prefix. This is, at least in part, a compromise to provide package maintainers a way to specify a libdir which will be incorporated into the -rpath link flag (which we can only determine at configure-time).

FossilOrigin-Name: 832abe8a8a347718e47f73a1f9be1fb084a1c28cac6b1c70f6c9a9cabeb0fb53
---

97c709b5be269b4ec454905db26ee842e6a3a20f
diff --cc auto.def
index 46a0721731,59827879d0..09024a207a
--- a/auto.def
+++ b/auto.def
@@@ -216,6 -216,11 +216,12 @@@ proj-xfer-options-aliases 
    with-readline-inc => with-readline-cflags
    with-readline-lib => with-readline-ldflags
  }
+ #
+ # "Re-export" the autoconf-conventional --XYZdir flags into something
 -# which is more easily overridable from a make invocation.
++# which is more easily overridable from a make invocation. See the docs
++# for [proj-redirect-autoconf-dir-vars] for the explanation of why.
+ #
+ proj-redirect-autoconf-dir-vars
  
  set srcdir $::autosetup(srcdir)
  set top_srcdir [get-define abs_top_srcdir]
diff --cc autosetup/proj.tcl
index 3a831a269b,06c51ee14b..d386d4d499
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@@ -790,12 -796,12 +790,20 @@@ proc proj-check-emsdk {} 
  # flag. Defines LDFLAGS_RPATH to that/those flag(s) or an empty
  # string. Returns 1 if it finds an option, else 0.
  #
++# By default, the rpath is set to $prefix/lib. However, if
++# --libdir=...  is explicitly passed to configure then that value is
++# used.
++#
  # Achtung: we have seen platforms which report that a given option
  # checked here will work but then fails at build-time, and the current
  # order of checks reflects that.
  proc proj-check-rpath {} {
    set rc 1
--  set lp "[get-define prefix]/lib"
++  if {[proj-opt-was-provided libdir]} {
++    set lp "[get-define libdir]"
++  } else {
++    set lp "[get-define prefix]/lib"
++  }
    # If we _don't_ use cc-with {} here (to avoid updating the global
    # CFLAGS or LIBS or whatever it is that cc-check-flags updates) then
    # downstream tests may fail because the resulting rpath gets
diff --cc manifest
index e92afdde31,ad27f8950b..36f3ef8c3b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Workaround\sfor\sa\scompiler-specific\sjimsh\scompilation\serror\sreported\sin\s[forum:18e420d0b1404d63|forum\spost\s18e420d0].\sReported\supstream\sas\s[https://github.com/msteveb/jimtcl/issues/322|ticket\s#322].
- D 2024-11-03T18:30:45.368
 -C An\sexperiment\sin\shybridizing\soverriding\sof\sautotools-conventional\sXYZdir\svars,\sthe\sgoal\sbeing\sto\sbe\sable\sto\sprovide\sboth\soverrriding\sof\sthem\sat\sconfigure-time\sand\smake-time\swith\ssensible\ssemantics.\sBased\son\snotes\sfrom\s[forum:00d12a41f7|forum\spost\s00d12a41f7].
 -D 2024-11-02T05:50:22.194
++C If\sany\sautotools-conventional\sdir\snames\sare\sexplicitly\soverridden\svia\s./configure\s--dirname=X\sthen\sexport\sthose\snames\sas-is\sto\sthe\smakefile,\sotherwise\sderive\sthem\sfrom\s$prefix.\sThis\sis,\sat\sleast\sin\spart,\sa\scompromise\sto\sprovide\spackage\smaintainers\sa\sway\sto\sspecify\sa\slibdir\swhich\swill\sbe\sincorporated\sinto\sthe\s-rpath\slink\sflag\s(which\swe\scan\sonly\sdetermine\sat\sconfigure-time).
++D 2024-11-03T19:42:41.677
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@@ -13,7 -13,7 +13,7 @@@ F art/icon-80x90.gif 65509ce3e5f86a9cd6
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
- F auto.def 9cf971c8877aa7b999c3b3b41fe802feea49a50ea98afc0f9964cfc5cc69057b
 -F auto.def 9a0c7a3165be8abf0e6c67cf02af7d7c5669def7416e40fd3d54fd8cae9b6d14
++F auto.def d47bb3030f1b77a3131a4192fe17fb50da13bb6d9405306368ae9c06bca9455c
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
  F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
  F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@@ -47,9 -47,9 +47,9 @@@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9
  F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
  F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
  F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
 -F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
 +F autosetup/jimsh0.c 9860c2bd7825cb9d21616237e59a2dfa29acbd98c00da5f842e5abe222e69288
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
- F autosetup/proj.tcl cb7983c8eb47c9518c3039556e655e5237952d9c068fe36c624e9f6a73cd1098
 -F autosetup/proj.tcl 952eb7d6a9d0f1f50c85c823089665eadd718e0f85372198a4e743b67e41481d
++F autosetup/proj.tcl d0008015b481ed5a4e952b72e703a905ba232f979a3740614d2ea716a19f6718
  F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
  F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f
  F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9
@@@ -2198,8 -2198,12 +2198,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P ad19237845b7791dd90fa4b3586f39f6ab700462e826baf53d4cde7f7fa06449
- R fbc9af98c69bf3f4eab9e4f1eaa6856c
 -P 24aba7ee58f3048d70ff0c2b2cda26bc04bfb46b3055d25d62ab5ff97b106be2
 -R 6f6eddd40305846c7e8dc49e81bcb71c
 -T *branch * autosetup-dir-overrides
 -T *sym-autosetup-dir-overrides *
 -T +closed *
 -T -sym-trunk * Cancelled\sby\sbranch.
++P 29b94495956802d0eedcd669e45308c56278e43aab62bd7c3bb7153b47c9d4c0 cc259bf5f176bf89b6effedfc716d19d2437fc761c20870d1c69205d4bcee12b
++R 79d48715ac1148c0c1fcdae652e09505
  U stephan
- Z cd366cd0592f2836fdc5215675eb9eb6
 -Z 7916dea993020a5fa99a26daa68b6c79
++Z 9bbd3b23f124df01ef5b1e7cf0c3306e
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c52d720347,0e82160c45..052272ac5c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29b94495956802d0eedcd669e45308c56278e43aab62bd7c3bb7153b47c9d4c0
 -cc259bf5f176bf89b6effedfc716d19d2437fc761c20870d1c69205d4bcee12b
++832abe8a8a347718e47f73a1f9be1fb084a1c28cac6b1c70f6c9a9cabeb0fb53