From: stephan Date: Wed, 30 Oct 2024 04:07:16 +0000 (+0000) Subject: Remove accommodation of the legacy-named shared libraries from the installation rules... X-Git-Tag: major-relase~272 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55865c47a7272f313123f78b8d138d8411d6ac6f;p=thirdparty%2Fsqlite.git Remove accommodation of the legacy-named shared libraries from the installation rules, per discussion. Rename install-includes to install-headers. Quote installation target dir names "just in case". FossilOrigin-Name: 80584e165e4652e76cc3188befcee814f168298486743940bcf46696043686a0 --- diff --git a/main.mk b/main.mk index 8f83265e30..b82b8130a5 100644 --- a/main.mk +++ b/main.mk @@ -360,7 +360,7 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \ $(install-dir.lib) $(install-dir.man1) \ $(install-dir.pkgconfig) $(install-dir.all): - $(INSTALL) -d $@ + $(INSTALL) -d "$@" # # After jimsh is compiled, we run some sanity checks to ensure that @@ -1343,59 +1343,22 @@ so: $(libsqlite3.SO)-$(ENABLE_SHARED) all: so # -# Install the $(libsqlite3.SO) as $(libsqlite3.SO).$(PACKAGE_VERSION) and -# create symlinks which point to it. Do we really need all of this -# hoop-jumping? Can we not simply install the .so as-is to -# libsqlite3.so (without the versioned bits)? +# Install the $(libsqlite3.SO) as $(libsqlite3.SO).$(PACKAGE_VERSION) +# and create symlinks which point to it: # -# Regarding the historcal installation name of libsqlite3.so.0.8.6: -# -# The historical SQLite build always used a version number of 0.8.6 -# for reasons lost to history but having something to do with libtool -# (which is not longer used in this tree). In order to retain filename -# compatibility for systems which have libraries installed using those -# conventions: -# -# 1) If libsqlite3.so.0.8.6 is found in the target installation -# directory then it is re-linked to point to the new -# names. libsqlite3.so.0 historically symlinks to -# libsqlite3.so.0.8.6, and that link is left in place. 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 -# is to enable chains of operations such as the hypothetical (apt -# remove sqlite3-3.47.0 && apt install sqlite3-3.48.0). In such -# cases, condition (1) would never trigger but applications might -# still expect to see the legacy file names. -# -# In either case we also delete libsqlite3.la because it cannot work -# with the non-libtool library this installation installs. +# - libsqlite3.so.$(PACKAGE_VERSION) +# - libsqlite3.so.3 =symlink-> libsqlite3.so.$(PACKAGE_VERSION) +# - libsqlite3.so =symlink-> libsqlite3.so.3 # install-so-1: $(install-dir.lib) $(libsqlite3.SO) - $(INSTALL) $(libsqlite3.SO) $(install-dir.lib) + $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" @echo "Setting up SO symlinks..."; \ - cd $(install-dir.lib) || exit $$?; \ - rm -f $(libsqlite3.SO).3 $(libsqlite3.SO).$(PACKAGE_VERSION) libsqlite3.la || exit $$?; \ + cd "$(install-dir.lib)" || exit $$?; \ + rm -f $(libsqlite3.SO).3 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).3 || exit $$?; \ ln -s $(libsqlite3.SO).3 $(libsqlite3.SO) || exit $$?; \ - ls -la $(libsqlite3.SO) $(libsqlite3.SO).3* || exit $$?; \ - if [ -e $(libsqlite3.SO).0.8.6 ]; then \ - echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ - rm -f $(libsqlite3.SO).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.SO).0*; \ - elif [ x1 = "x$(INSTALL_SO_086_LINKS)" ]; then \ - echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINKS=1"; \ - rm -f $(libsqlite3.SO).0.8.6 $(libsqlite3.SO).0 || exit $$?; \ - ln -s $(libsqlite3.SO).0.8.6 $(libsqlite3.SO).0 || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.SO).0*; \ - fi + ls -la $(libsqlite3.SO) $(libsqlite3.SO).3* install-so-0 install-so-: install-so: install-so-$(ENABLE_SHARED) install: install-so @@ -1404,7 +1367,7 @@ install: install-so # Install $(libsqlite3.LIB) # install-lib-1: $(install-dir.lib) $(libsqlite3.LIB) - $(INSTALL.noexec) $(libsqlite3.LIB) $(install-dir.lib) + $(INSTALL.noexec) $(libsqlite3.LIB) "$(install-dir.lib)" install-lib-0 install-lib-: install-lib: install-lib-$(ENABLE_STATIC) install: install-lib @@ -1412,9 +1375,9 @@ install: install-lib # # Install C header files # -install-includes: sqlite3.h $(install-dir.include) - $(INSTALL.noexec) sqlite3.h "$(TOP)/src/sqlite3ext.h" $(install-dir.include) -install: install-includes +install-headers: sqlite3.h $(install-dir.include) + $(INSTALL.noexec) sqlite3.h "$(TOP)/src/sqlite3ext.h" "$(install-dir.include)" +install: install-headers # # libtclsqlite3... @@ -1437,10 +1400,10 @@ libtcl: $(libtclsqlite3.SO)-$(HAVE_TCL) all: libtcl install-tcl-1: $(libtclsqlite3.SO) pkgIndex.tcl - @$(T.tcllibdir); set -x; dest="$(DESTDIR)$$tcllibdir"; \ - $(INSTALL) -d $$dest; \ - $(INSTALL) $(libtclsqlite3.SO) $$dest; \ - $(INSTALL.noexec) pkgIndex.tcl $$dest + @$(T.tcllibdir); set -x; \ + $(INSTALL) -d "$(DESTDIR)$$tcllibdir"; \ + $(INSTALL) $(libtclsqlite3.SO) "$(DESTDIR)$$tcllibdir"; \ + $(INSTALL.noexec) pkgIndex.tcl "$(DESTDIR)$$tcllibdir" install-tcl-0 install-tcl-: install-tcl: install-tcl-$(HAVE_TCL) install: install-tcl @@ -1860,7 +1823,7 @@ sqlite3$(T.exe)-0 sqlite3$(T.exe)-: sqlite3$(T.exe) all: sqlite3$(T.exe)-$(HAVE_WASI_SDK) install-shell-0: sqlite3$(TEXT) $(install-dir.bin) - $(INSTALL) -s sqlite3$(TEXT) $(install-dir.bin) + $(INSTALL) -s sqlite3$(TEXT) "$(install-dir.bin)" install-shell-1 install-shell-: install: install-shell-$(HAVE_WASI_SDK) @@ -1868,7 +1831,7 @@ sqldiff$(T.exe): $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.o $(T.link) -o $@ $(TOP)/tool/sqldiff.c sqlite3.o $(LDFLAGS.libsqlite3) install-diff: sqldiff$(T.exe) $(install-dir.bin) - $(INSTALL) -s sqldiff$(TEXT) $(install-dir.bin) + $(INSTALL) -s sqldiff$(TEXT) "$(install-dir.bin)" #install: install-diff dbhash$(T.exe): $(TOP)/tool/dbhash.c sqlite3.o sqlite3.h @@ -1891,18 +1854,18 @@ sqlite3_rsync$(T.exe): $(RSYNC_SRC) xbin: sqlite3_rsync$(T.exe) install-rsync: sqlite3_rsync$(T.exe) $(install-dir.bin) - $(INSTALL) sqlite3_rsync$(TEXT) $(install-dir.bin) + $(INSTALL) sqlite3_rsync$(TEXT) "$(install-dir.bin)" #install: install-rsync install-man1: $(install-dir.man1) - $(INSTALL.noexec) $(TOP)/sqlite3.1 $(install-dir.man1) + $(INSTALL.noexec) $(TOP)/sqlite3.1 "$(install-dir.man1)" install: install-man1 # # sqlite3.pc is typically generated by the configure script but could # conceivably be generated by hand. install-pc: sqlite3.pc $(install-dir.pkgconfig) - $(INSTALL.noexec) sqlite3.pc $(install-dir.pkgconfig) + $(INSTALL.noexec) sqlite3.pc "$(install-dir.pkgconfig)" scrub$(T.exe): $(TOP)/ext/misc/scrub.c sqlite3.o $(T.link) -o $@ -I. -DSCRUB_STANDALONE \ diff --git a/manifest b/manifest index 119017f246..bcbb90c3a6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Generic\smakefile\scleanups. -D 2024-10-30T03:51:21.497 +C Remove\saccommodation\sof\sthe\slegacy-named\sshared\slibraries\sfrom\sthe\sinstallation\srules,\sper\sdiscussion.\sRename\sinstall-includes\sto\sinstall-headers.\sQuote\sinstallation\starget\sdir\snames\s"just\sin\scase". +D 2024-10-30T04:07:16.329 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28 @@ -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 824f35f64c3d4b49f04979059a147c9207acef3354cb3425a6ea0c56b5671cff +F main.mk 7795769763a5c6b12f76404b03ae568b8d3a0029d854d9b3c1355704c58c8f7a 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 ee6e15f12ee55fd13cf31317d876e6ba03a7ae1fb9056f0013106948d81b31d9 -R b96df9919f9f382400249a198137582b +P 6f86ff2e8c190e83c15dab532660a2a0c359621d1fcce4e6852e56ac6b7f71e3 +R a4ac118514215cff67837ab2e030efc3 U stephan -Z 7519d85a792eaa797087b3d9e5d4717f +Z c62cc911a577bebb7f954fde1bfa7f5c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8dd7669517..4fb3a304be 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f86ff2e8c190e83c15dab532660a2a0c359621d1fcce4e6852e56ac6b7f71e3 +80584e165e4652e76cc3188befcee814f168298486743940bcf46696043686a0