fossil: Use system SQLite

properly.
This commit is contained in:
Tee KOBAYASHI 2022-11-25 02:08:22 +09:00 committed by xtkoba
parent 1cce24891f
commit bd27b5c3f8
2 changed files with 11 additions and 0 deletions

View File

@ -49,6 +49,15 @@ diff -uNr fossil-2.11/auto.def fossil-2.11.mod/auto.def
set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs]
} else {
if {$ssldirs in {auto ""}} {
@@ -501,7 +499,7 @@
# e.g. --with-sqlite=/usr/local. Try $sq3path/lib/libsqlite3*
# and $sq3path/include/sqlite3.h
define-append CFLAGS_INCLUDE -I$sq3path/include
- define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3 -lpthread
+ define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3
# ^^^ additional -lXXX flags are conservative estimates
msg-result "Using -lsqlite3 from $sq3path"
} else {
@@ -479,23 +445,6 @@
cc-with [list -cflags $cflags -libs $libs] {
if {$tclstubs} {

View File

@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_LICENSE_FILE="COPYRIGHT-BSD2.txt"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.20
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://www.fossil-scm.org/home/tarball/version-$TERMUX_PKG_VERSION/fossil-src-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=0892ea4faa573701ca285a3d4a2d203e8abbb022affe3b1be35658845e8de721
TERMUX_PKG_DEPENDS="libsqlite, openssl, zlib"
@ -21,6 +22,7 @@ termux_step_configure() {
--host=$TERMUX_HOST_PLATFORM \
--json \
--disable-internal-sqlite \
--with-sqlite=$TERMUX_PREFIX \
--with-openssl=$TERMUX_PREFIX \
--with-zlib=$TERMUX_PREFIX
}