From 8409508b423a7a14dcdf68e507a597052b2ea26f Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sat, 3 Jan 2026 08:43:25 +0000 Subject: [PATCH] bump(main/sqlcipher): 4.12.0 - Fixes https://github.com/termux/termux-packages/issues/23970 - Implement custom `termux_step_configure()` to avoid `Error: Unknown option --rpath-hack` - Adjust `CPPFLAGS` and `LDFLAGS` to resolve build errors (as directed by the upstream `README.md`) - Add `--enable-editline --disable-readline` to prevent `error: 'regparm' is not valid on this platform` --- packages/sqlcipher/build.sh | 38 +++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/packages/sqlcipher/build.sh b/packages/sqlcipher/build.sh index 342d408d90..4c01661522 100644 --- a/packages/sqlcipher/build.sh +++ b/packages/sqlcipher/build.sh @@ -2,20 +2,42 @@ TERMUX_PKG_HOMEPAGE=https://github.com/sqlcipher/sqlcipher TERMUX_PKG_DESCRIPTION="SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.6.1" -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://github.com/sqlcipher/sqlcipher/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=d8f9afcbc2f4b55e316ca4ada4425daf3d0b4aab25f45e11a802ae422b9f53a3 +TERMUX_PKG_VERSION="4.12.0" +TERMUX_PKG_SRCURL="https://github.com/sqlcipher/sqlcipher/archive/v$TERMUX_PKG_VERSION.tar.gz" +TERMUX_PKG_SHA256=151a1c618c7ae175dfd0f862a8d52e8abd4c5808d548072290e8656032bb0f12 TERMUX_PKG_DEPENDS="libedit, openssl" TERMUX_PKG_BUILD_DEPENDS="tcl" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" +# --enable-editline --disable-readline +# prevents +# error: 'regparm' is not valid on this platform TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ---enable-tempstore=yes ---with-tcl=${TERMUX_PREFIX}/lib -TCLLIBDIR=${TERMUX_PREFIX}/lib/tcl8.6/sqlite +--with-tempstore=yes +--enable-editline +--disable-readline +--with-tcl=${TERMUX__PREFIX__LIB_DIR} +TCLLIBDIR=${TERMUX__PREFIX__LIB_DIR}/tcl8.6/sqlite " termux_step_pre_configure() { - CPPFLAGS+=" -DSQLCIPHER_OMIT_LOG_DEVICE -DSQLITE_HAS_CODEC" + # CPPFLAGS and LDFLAGS as directed by README.md + CPPFLAGS+=" -DSQLCIPHER_OMIT_LOG_DEVICE" + CPPFLAGS+=" -DSQLITE_HAS_CODEC" + CPPFLAGS+=" -DSQLITE_EXTRA_INIT=sqlcipher_extra_init" + CPPFLAGS+=" -DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown" + LDFLAGS+=" -lcrypto" +} + +# See: https://github.com/termux/termux-packages/issues/23268#issuecomment-2685308408 +# (some packages do not accept '--rpath' or '--rpath-hack' configure arguments) +# Error: Unknown option --rpath-hack +termux_step_configure() { + "$TERMUX_PKG_SRCDIR"/configure \ + --prefix="$TERMUX_PREFIX" \ + --libexecdir="$TERMUX_PREFIX/libexec" \ + --libdir="$TERMUX__PREFIX__LIB_DIR" \ + --includedir="$TERMUX__PREFIX__INCLUDE_DIR" \ + --sbindir="$TERMUX_PREFIX/bin" \ + $TERMUX_PKG_EXTRA_CONFIGURE_ARGS }