diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index c1f6615b72..609f9f7d08 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -2223,6 +2223,9 @@ proc sqlite-determine-codegen-tcl {} { # so that we can avoid the situation that we later, at # make-time, try to compile jimsh but it then fails due to # missing headers (i.e. fail earlier rather than later). + # + # One of HAVE_REALPATH or HAVE__FULLPATH are required here for + # jimsh's [file normalize] to work. if {$sysh && [cc-check-functions realpath]} { define-append CFLAGS_JIMSH -DHAVE_REALPATH define BTCLSH "\$(JIMSH)" diff --git a/manifest b/manifest index 32accdcbde..8aaf446f4c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Configure-script\spatches\sfrom\s[forum:fe9e99eb27c8|forum\spost\sfe9e99eb27c8]\sto\saddress\scygwin/msys\scross-compilation\sissues\srelated\sto\s--with-tcl\sand\s--with-tclsh.\sStashing\sin\sa\sbranch\spending\stesting\son\sthose\splatorms.\sIt\sdoes\snot\sadversely\saffect\sany\snative-build\ssystems\stested\sso\sfar. -D 2026-09-12T10:43:45.904 +C Minor\sinternal\sdoc\saddition\sexplaining\sa\sbuild\sflag\sfor\sjimsh. +D 2026-09-15T10:20:57.747 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -48,7 +48,7 @@ F autosetup/find_tclconfig.tcl 3394bcd1aad45d6af48262f50808d4f0ac4f1088ba8fa9d08 F autosetup/jimsh0.c daf13a86959fe2d055ed42d9417ceb63d698ae4b71bde959a0979ab729a83819 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 67683f214977a416baafc4c1020f9940ff047a7306b2292c5872d6287460b7d5 -F autosetup/sqlite-config.tcl 4f0bcb5848f253f9bfce1d3ce5b58a3103c428ace7b06887a8ff3e9ad49a9130 +F autosetup/sqlite-config.tcl b4f06bb14643fb9c0986ebaa440f3877c97bdd3350b0404a7201cd9bba898a78 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca F autosetup/teaish/core.tcl e014dd95900c7f9a34e8e0f460f47e94841059827bce8b4c49668b0c7ae3f1a0 @@ -2221,11 +2221,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P e308b0fce47e184860564f0535174017eb7d5d7efc4f86dd1eb8d234f75e4d08 -R 7af4476b19e56dd530cd636f45d540c3 -T *branch * cygwin-msys-tclsh-forum-fe9e99eb -T *sym-cygwin-msys-tclsh-forum-fe9e99eb * -T -sym-trunk * Cancelled\sby\sbranch. +P 4470bed69bd9d7a2187d7187a44d10128f771c782241bd3685bf1683f8e80f4e +R 08fa19fd17d7660ce65d2bd418e6ecd8 U stephan -Z 8578e248bf60ab2f47b148f63f428307 +Z 729a55fcd7384aef1cbf260b0abaeef4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 20f9f31c0c..8e52ac9a7d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4470bed69bd9d7a2187d7187a44d10128f771c782241bd3685bf1683f8e80f4e +8eff1b5cda7a8429b918afd531a6f352e7e4cc1afc770b9e3b3888fe021ca8a1