diff options
Diffstat (limited to 'databases/sqlite3/files')
-rw-r--r-- | databases/sqlite3/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | databases/sqlite3/files/patch-autosetup_pkg-config.tcl | 11 | ||||
-rw-r--r-- | databases/sqlite3/files/patch-main.mk | 28 |
3 files changed, 39 insertions, 11 deletions
diff --git a/databases/sqlite3/files/patch-Makefile.in b/databases/sqlite3/files/patch-Makefile.in deleted file mode 100644 index 70aa8e8a281e..000000000000 --- a/databases/sqlite3/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2022-11-26 11:17:35 UTC -+++ Makefile.in -@@ -1299,7 +1299,7 @@ tcltest: ./testfixture$(TEXE) - # The veryquick.test TCL tests. - # - tcltest: ./testfixture$(TEXE) -- ./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS) -+ mkdir $(TOP)/testdir && touch $(TOP)/test-out.txt && chown nobody $(TOP)/testdir $(TOP)/test-out.txt && su -m nobody -c "./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)" - - # Runs all the same tests cases as the "tcltest" target but uses - # the testrunner.tcl script to run them in multiple cores diff --git a/databases/sqlite3/files/patch-autosetup_pkg-config.tcl b/databases/sqlite3/files/patch-autosetup_pkg-config.tcl new file mode 100644 index 000000000000..9f89a774d6f0 --- /dev/null +++ b/databases/sqlite3/files/patch-autosetup_pkg-config.tcl @@ -0,0 +1,11 @@ +--- autosetup/pkg-config.tcl.orig 2025-07-02 07:23:27 UTC ++++ autosetup/pkg-config.tcl +@@ -78,7 +78,7 @@ proc pkg-config-init {{required 1}} { + # but it doesn't seem to work that way in practice + set env(PKG_CONFIG_PATH) "" + # Do we need to try /usr/local as well or instead? +- set env(PKG_CONFIG_LIBDIR) $sysroot/usr/lib/pkgconfig:$sysroot/usr/share/pkgconfig ++ set env(PKG_CONFIG_LIBDIR) $system/usr/libdata/pkgconfig:$sysroot/usr/local/libdata/pkgconfig + set env(PKG_CONFIG_SYSROOT_DIR) $sysroot + } + } diff --git a/databases/sqlite3/files/patch-main.mk b/databases/sqlite3/files/patch-main.mk new file mode 100644 index 000000000000..74065dcf6d5a --- /dev/null +++ b/databases/sqlite3/files/patch-main.mk @@ -0,0 +1,28 @@ +--- main.mk.orig 2025-06-28 14:24:16 UTC ++++ main.mk +@@ -140,6 +140,7 @@ libdir ?= $(exec_prefix)/lib + exec_prefix ?= $(prefix) + bindir ?= $(exec_prefix)/bin + libdir ?= $(exec_prefix)/lib ++libdatadir ?= $(exec_prefix)/libdata + # This makefile does not use any of: + # sbindir ?= $(exec_prefix)/sbin + # sysconfdir ?= /etc +@@ -469,7 +470,7 @@ install-dir.include = $(DESTDIR)$(includedir) + install-dir.bin = $(DESTDIR)$(bindir) + install-dir.lib = $(DESTDIR)$(libdir) + install-dir.include = $(DESTDIR)$(includedir) +-install-dir.pkgconfig = $(DESTDIR)$(libdir)/pkgconfig ++install-dir.pkgconfig = $(DESTDIR)$(libdatadir)/pkgconfig + install-dir.man1 = $(DESTDIR)$(mandir)/man1 + install-dir.all = $(install-dir.bin) $(install-dir.include) \ + $(install-dir.lib) $(install-dir.man1) \ +@@ -1810,7 +1811,7 @@ tcltest: ./testfixture$(T.exe) + # The veryquick.test TCL tests. + # + tcltest: ./testfixture$(T.exe) +- ./testfixture$(T.exe) $(TOP)/test/veryquick.test $(TESTOPTS) ++ mkdir $(TOP)/testdir && touch $(TOP)/test-out.txt && chown nobody $(TOP)/testdir $(TOP)/test-out.txt && su -m nobody -c "./testfixture$(T.exe) $(TOP)/test/veryquick.test $(TESTOPTS)" + + # + # Runs all the same tests cases as the "tcltest" target but uses |