|
| 1 | +From 64fe648e9cb54a0ee8ee9e9d7feefebcb2381adb Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Sat, 8 Aug 2020 14:09:51 +0200 |
| 4 | +Subject: [PATCH] Makefile.in: fix libtclsqlite package installation bug |
| 5 | + |
| 6 | +The shared object of libtclsqlite3 referenced by pkgIndex.tcl is NOT |
| 7 | +placed next to pkgIndex.tcl after installation by libtool. |
| 8 | + |
| 9 | +- using the flag -module instructs libtool to place the shared object |
| 10 | + libtclsqlite3 in TCLLIBDIR upon installation. |
| 11 | +- paste the shared library name from the libtool file 'libtclsqlite3.la' |
| 12 | + into 'pkgIndex.tcl'. |
| 13 | +--- |
| 14 | + Makefile.in | 6 +++--- |
| 15 | + 1 file changed, 3 insertions(+), 3 deletions(-) |
| 16 | + |
| 17 | +diff --git a/Makefile.in b/Makefile.in |
| 18 | +index f92741f..589c9f6 100644 |
| 19 | +--- a/Makefile.in |
| 20 | ++++ b/Makefile.in |
| 21 | +@@ -644,7 +644,7 @@ libsqlite3.la: $(LIBOBJ) |
| 22 | + ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" |
| 23 | + |
| 24 | + libtclsqlite3.la: tclsqlite.lo libsqlite3.la |
| 25 | +- $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ |
| 26 | ++ $(LTLINK) -module -no-undefined -o $@ tclsqlite.lo \ |
| 27 | + libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ |
| 28 | + -rpath "$(TCLLIBDIR)" \ |
| 29 | + -version-info "8:6:8" \ |
| 30 | +@@ -1434,8 +1434,8 @@ install: sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_instal |
| 31 | + $(INSTALL) -d $(DESTDIR)$(pkgconfigdir) |
| 32 | + $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir) |
| 33 | + |
| 34 | +-pkgIndex.tcl: |
| 35 | +- echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@ |
| 36 | ++pkgIndex.tcl: libtclsqlite3.la |
| 37 | ++ echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir '`source ./$< && echo $$dlname`'] sqlite3]' > $@ |
| 38 | + tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl |
| 39 | + $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR) |
| 40 | + $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR) |
| 41 | +-- |
| 42 | +2.28.0.windows.1 |
| 43 | + |
0 commit comments