diff --git a/Makefile.in b/Makefile.in index 0e7887f377..3a1c491997 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,7 +113,7 @@ TOP = @abs_top_srcdir@ # localstatedir = /var # runstatedir = /run # infodir = $(datadir)/info -# libexec = $(exec_prefix)/libexec +# libexecdir = $(exec_prefix)/libexec # prefix = @prefix@ datadir = @datadir@ diff --git a/auto.def b/auto.def index 77db2d41a7..cf50eecf0f 100644 --- a/auto.def +++ b/auto.def @@ -413,7 +413,7 @@ if {[cc-check-includes zlib.h] && [proj-check-function-in-lib deflate z]} { } proj-check-rpath ; # Determine proper rpath-handling flag -if {0 && [proj-check-soname]} { +if {0 && [proj-check-soname libsqlite3.so.3]} { # It's not yet clear whether we gain anything from setting -soname define LDFLAGS_SONAME_LIBSQLITE3 [get-define LDFLAGS_SONAME_PREFIX]libsqlite3.so.3 } else { diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index c5f057c2d4..eee526dea6 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -827,12 +827,18 @@ proc proj-check-rpath {} { ######################################################################## # Checks whether CC supports the -Wl,soname,lib... flag. If so, it -# returns 1 and defines LDFLAGS_SONAME_PREFIX to the flag's prefix, -# which the client would need to append "libwhatever.N" to. If not, it +# returns 1 and defines LDFLAGS_SONAME_PREFIX to the flag's prefix, to +# which the client would need to append "libwhatever.N". If not, it # returns 0 and defines LDFLAGS_SONAME_PREFIX to an empty string. -proc proj-check-soname {} { +# +# The libname argument is only for purposes of running the flag +# compatibility test, and is not included in the resulting +# LDFLAGS_SONAME_PREFIX. It is provided so that clients may +# potentially avoid some end-user confusion by using their own lib's +# name here (which shows up in the "checking..." output). +proc proj-check-soname {{libname "libfoo.so.0"}} { cc-with {} { - if {[cc-check-flags "-Wl,-soname,libfoo.so.0"]} { + if {[cc-check-flags "-Wl,-soname,${libname}"]} { define LDFLAGS_SONAME_PREFIX "-Wl,-soname," return 1 } else { @@ -1096,7 +1102,7 @@ proc proj-redirect-autoconf-dir-vars {} { localstatedir localstatedir /var runstatedir runstatedir /run infodir infodir ${datadir}/info - libexec libexec ${exec_prefix}/libexec + libexecdir libexecdir ${exec_prefix}/libexec } { # puts "flag=$flag var=$makeVar makeDeref=$makeDeref" if {[proj-opt-was-provided $flag]} { diff --git a/main.mk b/main.mk index 99366ea26b..a89aa5e9dc 100644 --- a/main.mk +++ b/main.mk @@ -141,7 +141,7 @@ libdir ?= $(exec_prefix)/lib # localstatedir ?= /var # runstatedir ?= /run # infodir ?= $(datadir)/info -# libexec ?= $(exec_prefix)/libexec +# libexecdir ?= $(exec_prefix)/libexec ### end of autotools-compatible install dir vars @@ -1381,11 +1381,12 @@ all: so # conventions: # # 1) If libsqlite3.so.0 is found in the target installation directory -# then it is re-linked to point to the newer-style names. We cannot -# retain both the old and new installation because they both share -# the high-level name $(libsqlite3.SO). The down-side of this is -# that it may well upset packaging tools when we replace -# libsqlite3.so (from a legacy package) with a new symlink. +# then it and libsqlite3.so.0.8.6 are re-linked to point to the +# newer-style names. We cannot retain both the old and new +# installation because they both share the high-level name +# $(libsqlite3.SO). The down-side of this is that it may well upset +# packaging tools when we replace libsqlite3.so (from a legacy +# package) with a new symlink. # # 2) If INSTALL_SO_086_LINKS=1 and point (1) does not apply then links # to the legacy-style names are created. The primary intent of this diff --git a/manifest b/manifest index 253cdecf2a..af91b13380 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Ensure\sthat\sthe\sext/wasm\sfiddle\sbuild\sundefines\scertain\sshell\sfeature\sflags\swhich\sit\scannot\suse\sbut\smight\sbe\sinherited\sfrom\sthe\stop-level\smakefile. -D 2024-11-04T10:16:15.685 +C Fix\stypo\sof\s--libexec\s==>\s--libexecdir,\sdiscovered\svia\saudit\sof\sa\sdownstream\sbuild\sscript.\sUnrelated\sdoc\stouchups. +D 2024-11-04T12:11:20.215 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28 -F Makefile.in 5f7d14ad4b7a2e150efaffdef6b0351fb2f7a58e2f5dfc24a06064bf779a4ed7 +F Makefile.in 3cb3754680dc2f06f6858ef8068ad1c947709dfae705466d383f25d7f222f4ab F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 -F auto.def df0c81945586931dad81173d1c997deeecfa1a422db4bcd5ff4c9b425ed8aa44 +F auto.def dc62d3c918d2750248e6811b24c2cbbd51d1457d7f6ffd11e0bf61dd5770cb3e F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -49,7 +49,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82 F autosetup/jimsh0.c d40e381ea4526a067590e7b91bd4b2efa6d4980d286f908054c647b3df4aee14 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 40e3a4ffd4677ddd98426ef1b398a45eba51038c295f6ea95eff207b79401669 +F autosetup/proj.tcl 0bcced417a59fc56da5e6cc6a83e10cca4e10710c0f2f1ae9bc82b366d17699d F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9 @@ -697,7 +697,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 548b0263d0bfa7f9219c340a48f1b8be3d51244942d7afbf55633c6a5e9574a6 +F main.mk a066ab09a00cfc641359db6fde6d466201c2bf51d95bf48086e5bc3ea401640d F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2198,8 +2198,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 1586eaceb1716fbeafc4af691d0f80206cd5390388b099d4939e6be5d3eb975b -R 73cc0db79188b923e5ebd7ada97d907d +P 99bb5d9b68edc3c5439f0776bce74532dd0131894c31dc8227d084e926c4638c +R 4f2c4e757a85bb00a8c970e35c0cdef2 U stephan -Z 1e2b27c01bd1350b57bba6fb5cb67540 +Z 236eab552ea1842cd9bb8ad82e3ed96f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f8ced9d60e..baa0a3c1e5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -99bb5d9b68edc3c5439f0776bce74532dd0131894c31dc8227d084e926c4638c +a60e5d76d06ae0568fbc6e068a7012c77778607cd60da92a1b84ff8f33049a93