325eedfc14
This commit as a heavy overhaul removes the dependency on a version-dependent
third-party patch which obfuscates what is going on and prevents transparent
maintenance. As an intermediate step the split package 'sqlite-extensions'
is temporarily removed, but is added back in the subsequent commit to make
more understandable the commit series this commit is part of.
The overall goal is to compile the splite package together with packaging
all of its MSYS2 split-packages straight out of the box for each sqlite
package release.
* PKGBUILD:
- switch from source package 'sqlite-autoconf-XXXXXXX.tar.gz' to
'sqlite-src-XXXXXXX.zip' which contains the extension source code
- remove 'sqlite-3.28.0-msys2.patch' which is obsolete since its changes
are overridden by 'autoreconf'
- remove 'sqlite-3.28.0-msys2.patch' provided by third party and comprising
not well maintained sqlite extension code
- add three patches for flawless package compilation
- build package rather in separate build directory instead in source
code directory (VPATH compilation)
- note that targets of the split package 'tcl-sqlite' are now built by
the main 'make' run (instead of a separate configure step when using
sqlite-autoconf-XXXXXXX.tar.gz as source package)
- sqlite split-packages are restructured as follows, in line with the overall
structure of the sqlite package (as of 3.32.3):
- sqlite-compress : moved to 'sqlite-extensions'
- sqlite-extensions : added back in subsequent commit (!)
- sqlite-icu : extension obsolete since icu compiled into sqlite3.exe
by default
- sqlite-rbu : extension moved to 'sqlite-extensions', executable
to 'sqlite'
- sqlite-vfslog : moved to 'sqlite-extensions'
* sqlite-3.28.0-msys2.patch: removed since obsolete after running 'autoreconf'.
* sqlite3-3.32.3-1.src.patch: removed as third-party patch
* other patches: fix compilation and installation bugs
28 lines
1005 B
Diff
28 lines
1005 B
Diff
From 40ca95b26d0dfc122fdc4d25d204236ae6aac06f Mon Sep 17 00:00:00 2001
|
|
From: Jannick <thirdedition@gmx.net>
|
|
Date: Sat, 8 Aug 2020 14:07:41 +0200
|
|
Subject: [PATCH 2/3] Makefile.in: fix rule compiling rbu.exe
|
|
|
|
---
|
|
Makefile.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 1341dee..2820e37 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -1368,8 +1368,8 @@ KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ
|
|
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
|
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
|
|
|
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
|
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
|
+rbu$(TEXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
|
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo $(TLIBS)
|
|
|
|
loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
|
$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
|
--
|
|
2.28.0.windows.1
|
|
|