fix #6260 sqlcipher and tcl conflict (#6263)

packages/libsqlite-tcl/build.sh

@@ -0,0 +1,22 @@
+TERMUX_PKG_HOMEPAGE=https://www.sqlite.org
+TERMUX_PKG_DESCRIPTION="tcl bindings for SQLite"
+TERMUX_PKG_LICENSE="Public Domain"
+TERMUX_PKG_MAINTAINER="@termux"
+# Note: Updating this version requires bumping libsqlite package as well.
+_SQLITE_MAJOR=3
+_SQLITE_MINOR=34
+_SQLITE_PATCH=0
+TERMUX_PKG_VERSION=${_SQLITE_MAJOR}.${_SQLITE_MINOR}.${_SQLITE_PATCH}
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://www.sqlite.org/2020/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz
+TERMUX_PKG_SHA256=bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee
+TERMUX_PKG_DEPENDS="libsqlite, tcl"
+TERMUX_PKG_BREAKS="sqlcipher (<< 4.4.2-1), tcl (<< 8.6.10-4)"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--with-tcl=${TERMUX_PREFIX}/lib
+--with-system-sqlite
+"
+
+termux_step_post_get_source() {
+	TERMUX_PKG_SRCDIR+="/tea"
+}

packages/libsqlite/build.sh

@@ -2,20 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://www.sqlite.org
 TERMUX_PKG_DESCRIPTION="Library implementing a self-contained and transactional SQL database engine"
 TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_MAINTAINER="@termux"
-# Note: Updating this version requires bumping the tcl package as well.
+# Note: Updating this version requires bumping libsqlite-tcl package as well.
 _SQLITE_MAJOR=3
 _SQLITE_MINOR=34
 _SQLITE_PATCH=0
 TERMUX_PKG_VERSION=${_SQLITE_MAJOR}.${_SQLITE_MINOR}.${_SQLITE_PATCH}
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.sqlite.org/2020/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz
 TERMUX_PKG_SHA256=bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee
 TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_BREAKS="libsqlite-dev"
 TERMUX_PKG_REPLACES="libsqlite-dev"
-# ac_cv_func_strerror_r=no as strerror_r() with the
-# GNU signature is only # available in android-23:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-ac_cv_func_strerror_r=no
 --enable-readline
 "
 
@@ -23,8 +21,3 @@ termux_step_pre_configure() {
 	CPPFLAGS+=" -Werror -DSQLITE_ENABLE_DBSTAT_VTAB=1"
 	LDFLAGS+=" -lm"
 }
-
-termux_step_post_make_install() {
-	mkdir -p $TERMUX_PREFIX/src/libsqlite
-	cp $TERMUX_PKG_SRCDIR/tea/generic/tclsqlite3.c $TERMUX_PREFIX/src/libsqlite/tclsqlite3.c
-}

packages/sqlcipher/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="SQLCipher is an SQLite extension that provides 256 bit A
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.4.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/sqlcipher/sqlcipher/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=87458e0e16594b3ba6c7a1f046bc1ba783d002d35e0e7b61bb6b7bb862f362a7
 TERMUX_PKG_DEPENDS="libsqlite, openssl"

packages/tcl/build.sh

@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="license.terms"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=8.6.10
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tcl/Tcl/${TERMUX_PKG_VERSION}/tcl${TERMUX_PKG_VERSION}-src.tar.gz
 TERMUX_PKG_SHA256=5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed
 TERMUX_PKG_DEPENDS="libsqlite, zlib"
@@ -38,20 +38,6 @@ termux_step_post_make_install() {
 	cd $TERMUX_PREFIX/bin
 	ln -f -s tclsh$_MAJOR_VERSION tclsh
 
-	# Hack to use system libsqlite (https://www.sqlite.org/howtocompile.html#tcl)
-	# since --with-system-sqlite fails to build:
-	local NEW_LIBDIR=$TERMUX_PREFIX/lib/tcl$_MAJOR_VERSION/sqlite
-	mkdir -p $NEW_LIBDIR
-	$CC $CFLAGS $CPPFLAGS $LDFLAGS \
-		-DUSE_SYSTEM_SQLITE=1 \
-		-o $NEW_LIBDIR/libtclsqlite3.so \
-		-shared \
-		$TERMUX_PREFIX/src/libsqlite/tclsqlite3.c \
-		-ltcl$_MAJOR_VERSION -lsqlite3
-	local LIBSQLITE_VERSION=$($PKG_CONFIG --modversion sqlite3)
-	echo "package ifneeded sqlite3 $LIBSQLITE_VERSION [list load [file join \$dir libtclsqlite3.so] Sqlite3]" > \
-		$NEW_LIBDIR/pkgIndex.tcl
-
 	# Needed to install $TERMUX_PKG_LICENSE_FILE.
 	TERMUX_PKG_SRCDIR=$(dirname "$TERMUX_PKG_SRCDIR")