From: stephan <stephan@noemail.net>
Date: Tue, 26 Nov 2024 19:19:12 +0000 (+0000)
Subject: Patch autosetup to rename --debug to --autosetup-debug so we can use --debug/--enable... 
X-Git-Tag: major-relase~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19a6315ccfec048cee58d4599ce73644d3c4854e;p=thirdparty%2Fsqlite.git

Patch autosetup to rename --debug to --autosetup-debug so we can use --debug/--enable-debug for its historical purpose. Update autosetup/README.md with details of the patch.

FossilOrigin-Name: 00dffd10f0c77fed53bdbf1536f6ef9b6076775f1b9a10794b87e3ace33ca1d9
---

19a6315ccfec048cee58d4599ce73644d3c4854e
diff --cc autosetup/README.md
index 91bcad3d76,91bcad3d76..4e15d750f6
--- a/autosetup/README.md
+++ b/autosetup/README.md
@@@ -14,6 -14,6 +14,7 @@@ build infrastructure. It is not an [Aut
    - Symbolic Names of Feature Flags
    - Do Not Update Global Shared State
  - [Updating Autosetup](#updating)
++  - [Patching Autosetup for Project-local changes](#patching)
  
  ------------------------------------------------------------------------
  
@@@ -304,8 -304,8 +305,22 @@@ $ fossil status # show the modified fil
  ```
  
  Unless the upgrade made any incompatible changes (which is exceedingly
--rare), that's all there is to it. Check over the diff, test the
--configure process, and check it in.
++rare), that's all there is to it.  Then **apply a patch for the change
++described in the following section**, test the configure process, and
++check it in.
++
++<a name="patching"></a>
++Patching Autosetup for Project-local Changes
++------------------------------------------------------------------------
++
++Autosetup reserves the flag name **`--debug`** for its own purposes,
++and its own special handling of `--enable-...` flags makes `--debug`
++an alias for `--enable-debug`. As we have a long history of using
++`--enable-debug` for this project's own purposes, we patch autosetup
++to use the name `--autosetup-debug` in place of `--debug`. That
++requires (as of this writing) four small edits in
++[](/file/autosetup/autosetup), as demonstrated in [check-in
++3296c8d3](/info/3296c8d3).
  
  
  
diff --cc manifest
index 3f8f3a7d8d,c94527c6e2..bd99398812
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Move\ssome\sof\sthe\sin-comment\sconfigure\sscript\shelp\stext\sinto\sthe\s--help\stext.\sNo\sfunctional\schanges.
- D 2024-11-26T16:12:05.631
 -C Patch\sautosetup\sto\srename\s--debug\sto\s--autosetup-debug\sso\swe\scan\suse\s--debug/--enable-debug\sfor\sits\shistorical\spurpose.\s--with-debug\sis\snow\san\salias\sfor\s--enable-debug\sbut\scan\sbe\sremoved\sentirely\sif\sall\sscripts\swhich\shave\sbeen\sadjusted\sfor\sthe\sautosetup\sbuild\sare\sedited\sto\s(re)use\sthe\solder\sflag\sname.
 -D 2024-11-26T19:02:16.005
++C Patch\sautosetup\sto\srename\s--debug\sto\s--autosetup-debug\sso\swe\scan\suse\s--debug/--enable-debug\sfor\sits\shistorical\spurpose.\sUpdate\sautosetup/README.md\swith\sdetails\sof\sthe\spatch.
++D 2024-11-26T19:19:12.459
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -37,8 -37,8 +37,8 @@@ F autoconf/tea/win/rules.vc 94a18c3e453
  F autoconf/tea/win/targets.vc 96a25a1fa6e9e9cfb348fd3760a5395b4ce8acafc8ed10f0412937ec200d5dbd
  F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
  F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e
--F autosetup/README.md f12fd1556b50ff33ebf5c1476f4640c6010b3093ba8d75ba12b5417884011d5e
- F autosetup/autosetup 9416ffdcdd6e2dbf7f6d1e5c890078518930f8af7722a950eacc28c7f151d2d6 x
++F autosetup/README.md 083b4417637f134875709dfa8ca149ce9b3634725b65e0f7d9b96f2bf56caa3a
+ F autosetup/autosetup df8b53928b1fe3c67db5bc77c8e1eb8160c1b6a26c370e9a06c68748f803b7e4 x
  F autosetup/autosetup-config.guess dfa101c5e8220e864d5e9c72a85e87110df60260d36cb951ad0a85d6d9eaa463 x
  F autosetup/autosetup-config.sub a38fb074d0dece01cf919e9fb534a26011608aa8fa606490864295328526cd73 x
  F autosetup/autosetup-find-tclsh 25905f6c302959db80c2951aa267b4411c5645b598ce761cfc24a166141e2c4c x
@@@ -2199,8 -2199,11 +2199,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 7e634d0569667ce1e17f4a611039cbb726078dc2e6be1f1b19655dc569170ce5
- R b03ff8f40892202b2bfdeabe2bfe4328
 -P ee8449c482b6f9cfb82fa2417da194fc9aa56f54ef3ac83d368537181634ab1c
 -R c2ee4fc9d127d16a71ba8ab0982dbb79
 -T *branch * autosetup-debug-flag
 -T *sym-autosetup-debug-flag *
 -T -sym-trunk * Cancelled\sby\sbranch.
++P ee8449c482b6f9cfb82fa2417da194fc9aa56f54ef3ac83d368537181634ab1c 3296c8d30559eafa20f4748339177149172ecf79b019c42ed0d5ee9cf62a666a
++R 79991bb77dce9de5475d1a6d91321988
++T +closed 3296c8d30559eafa20f4748339177149172ecf79b019c42ed0d5ee9cf62a666a Closed\sby\sintegrate-merge.
  U stephan
- Z e952930a3cd549b7813b14b13b6d132c
 -Z 4f1cf71b215a7b4b77a2398c83036d85
++Z 26e02d52e505c2209fb4076354fecc72
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index baa37c3050,9aee3d801f..56e03a9034
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ee8449c482b6f9cfb82fa2417da194fc9aa56f54ef3ac83d368537181634ab1c
 -3296c8d30559eafa20f4748339177149172ecf79b019c42ed0d5ee9cf62a666a
++00dffd10f0c77fed53bdbf1536f6ef9b6076775f1b9a10794b87e3ace33ca1d9