main/sqlite: move -tcl subpackage to its own aport

This fixes circular dependency tcl -> sqlite -> tcl introduced by commit
36233eccb51b (main/sqlite: add -tcl subpackage).

2 files changed, 82 insertions, 23 deletions

diff --git a/main/sqlite-tcl/APKBUILD b/main/sqlite-tcl/APKBUILD
new file mode 100644
index 0000000000..877bbb0288
--- /dev/null
+++ b/main/sqlite-tcl/APKBUILD
@@ -0,0 +1,65 @@
+# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
+pkgname=sqlite-tcl
+pkgver=3.31.1
+pkgrel=0
+pkgdesc="Sqlite Tcl Extension Architecture (TEA)"
+url="https://www.sqlite.org/"
+arch="all"
+license="Public-Domain"
+makedepends="readline-dev tcl-dev sqlite-dev libtool autoconf automake"
+subpackages="$pkgname-doc"
+options="!check" # no testsuite from upstream
+
+# compute _ver
+_a=${pkgver%%.*}
+_b=${pkgver#${_a}.}
+_b=${_b%%.*}
+_c=${pkgver#${_a}.${_b}.}
+_c=${_c%%.*}
+case $pkgver in
+	*.*.*.*)_d=${pkgver##*.};;
+	*.*.*)	_d=0;;
+esac
+[ $_b -lt 10 ] && _b=0$_b
+[ $_c -lt 10 ] && _c=0$_c
+[ $_d -lt 10 ] && _d=0$_d
+_ver=${_a}${_b}${_c}${_d}
+
+# these variables depend on _ver being set
+source="https://www.sqlite.org/2020/sqlite-autoconf-$_ver.tar.gz"
+builddir="$srcdir/sqlite-autoconf-$_ver/tea"
+
+prepare() {
+	if [ -f "$startdir"/../sqlite/APKBUILD ]; then
+		(
+		_tclver=$pkgver
+		. "$startdir"/../sqlite/APKBUILD
+		if [ "$_tclver" != "$pkgver" ]; then
+			die "sqlite version mismatch ($_tclver != $pkgver)"
+		fi
+		)
+	fi
+}
+
+build() {
+	./configure \
+		--build="$CBUILD" \
+		--host="$CHOST" \
+		--prefix=/usr \
+		--with-system-sqlite \
+		--enable-threads
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	install -Dm644 license.terms \
+		"$pkgdir"/usr/share/licenses/$pkgname/license.terms
+}
+
+sha512sums="d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617  sqlite-autoconf-3310100.tar.gz"
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 8c892a23ca..33be2fa5df 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 pkgname=sqlite
+# NOTE: pkgver needs to correspond with sqlite-tcl
 pkgver=3.31.1
-pkgrel=1
+pkgrel=2
 pkgdesc="C library that implements an SQL database engine"
 url="https://www.sqlite.org/"
 arch="all"
 license="Public-Domain"
-makedepends="readline-dev tcl-dev libtool autoconf automake"
-subpackages="$pkgname-static $pkgname-dev $pkgname-tcl:_tcl $pkgname-libs $pkgname-doc"
+makedepends="readline-dev"
+subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-libs"
 
 # compute _ver
 _a=${pkgver%%.*}
@@ -27,7 +28,7 @@ _ver=${_a}${_b}${_c}${_d}
 
 # these variables depend on _ver being set
 builddir="$srcdir/$pkgname-autoconf-$_ver"
-source="https://www.sqlite.org/2020/sqlite-autoconf-$_ver.tar.gz
+source="https://www.sqlite.org/2020/$pkgname-autoconf-$_ver.tar.gz
 	license.txt
 	"
 
@@ -54,6 +55,18 @@ _amalgamation="-DSQLITE_ENABLE_FTS4 \
 	-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
 	-DSQLITE_ENABLE_JSON1"
 
+prepare() {
+	if [ -f "$startdir"/../sqlite-tcl/APKBUILD ]; then
+		(
+		_sqlitever=$pkgver
+		. "$startdir"/../sqlite-tcl/APKBUILD
+		if [ "$_sqlitever" != "$pkgver" ]; then
+			warning "sqlite-tcl version mismatch ($_sqlitever != $pkgver)"
+		fi
+		)
+	fi
+}
+
 build() {
 	export CFLAGS="$CFLAGS $_amalgamation"
 	./configure \
@@ -66,22 +79,11 @@ build() {
 		--enable-dynamic-extensions \
 		--enable-fts3
 
-	cd tea
-	./configure \
-		--build="$CBUILD" \
-		--host="$CHOST" \
-		--prefix=/usr \
-		--with-system-sqlite \
-		--enable-threads
-	cd "$builddir"
-
-
 	# rpath removal
 	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 	make
-	make -C tea
 }
 
 check() {
@@ -90,7 +92,6 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	make -C tea DESTDIR="$pkgdir" install
 
 	install -Dm0644 sqlite3.1 \
 		"$pkgdir"/usr/share/man/man1/sqlite3.1
@@ -112,12 +113,5 @@ static() {
 	mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
 }
 
-_tcl() {
-	pkgdesc="sqlite Tcl Extension Architecture (TEA)"
-
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/sqlite$pkgver "$subpkgdir"/usr/lib/
-}
-
 sha512sums="d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617  sqlite-autoconf-3310100.tar.gz
 5bde14bec5bf18cc686b8b90a8b2324c8c6600bca1ae56431a795bb34b8b5ae85527143f3b5f0c845c776bce60eaa537624104cefc3a47b3820d43083f40c6e9  license.txt"