Get rid of more liblog linkage

packages/alpine/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://repo.or.cz/alpine.git
 TERMUX_PKG_DESCRIPTION="Fast, easy to use email client"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=2.21.99999
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/alpine-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=229de9f673430190055207f8980205186ed6f73873f1ae6e1467d9d78e0f9dec
 TERMUX_PKG_DEPENDS="libcrypt, ncurses, openssl-tool"
@@ -24,7 +25,7 @@ termux_step_pre_configure() {
 	export alpine_SSLVERSION=old
 	export TPATH=$PATH
 
-	export LIBS="-lcrypt -llog"
+	export LIBS="-lcrypt"
 
 	# To get S_IREAD and friends:
 	CPPFLAGS+=" -D__USE_BSD"

packages/alpine/mlockmake.patch

@@ -1,11 +0,0 @@
---- ../cache/alpine-2.21/imap/src/mlock/Makefile	2017-02-06 00:06:22.515218494 +0000
-+++ ./imap/src/mlock/Makefile	2017-07-08 09:25:17.637293516 +0000
-@@ -36,7 +36,7 @@
- all:	mlock
- 
- mlock:	mlock.o
--	$(CC) $(CFLAGS) -o mlock mlock.o
-+	$(CC) $(CFLAGS) -o mlock mlock.o -llog
- 
- install: mlock
- 	chgrp mail mlock

packages/apache2/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
 TERMUX_PKG_DESCRIPTION="Apache Web Server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=2.4.41
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib"
@@ -88,7 +89,7 @@ termux_step_pre_configure() {
 		export ap_cv_void_ptr_lt_long=8
 	fi
 
-	LDFLAGS="$LDFLAGS -llog -lapr-1 -laprutil-1"
+	LDFLAGS="$LDFLAGS -lapr-1 -laprutil-1"
 
 	# use custom layout
 	cat $TERMUX_PKG_BUILDER_DIR/Termux.layout > $TERMUX_PKG_SRCDIR/config.layout

packages/heyu/build.sh

@@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.heyu.org/
 TERMUX_PKG_DESCRIPTION="Program for remotely controlling lights and appliances"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=2.11-rc3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=6285f134e03688b5ec03986ef53cce463abc007281996156cac52b61cbeb58b2
 TERMUX_PKG_SRCURL=https://github.com/HeyuX10Automation/heyu/archive/v$TERMUX_PKG_VERSION.tar.gz
 
 termux_step_pre_configure() {
 	# rindex is an obsolete version of strrchr which is not available in Android:
 	CFLAGS+=" -Drindex=strrchr"
-	export LIBS="-llog"
 }

packages/inetutils/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/inetutils/
 TERMUX_PKG_DESCRIPTION="Collection of common network programs"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.9.4
-TERMUX_PKG_REVISION=7
+TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37
 TERMUX_PKG_DEPENDS="readline"
@@ -25,8 +25,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_crypt_crypt=no
 "
 
-TERMUX_PKG_EXTRA_MAKE_ARGS="LIBS=-llog"
-
 termux_step_pre_configure() {
 	CPPFLAGS+=" -DLOGIN_PROCESS=6 -DDEAD_PROCESS=8 -DLOG_NFACILITIES=24"
 }

packages/inotify-tools/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki
 TERMUX_PKG_DESCRIPTION="Programs providing a simple interface to inotify"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.20.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac
 TERMUX_PKG_BREAKS="inotify-tools-dev"
 TERMUX_PKG_REPLACES="inotify-tools-dev"
@@ -11,8 +11,6 @@ TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
 	./autogen.sh
-
-	LDFLAGS+=" -llog"
 }
 
 termux_step_make() {

packages/ipmitool/build.sh

@@ -3,11 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command-line interface to IPMI-enabled devices"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.8.18
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/ipmitool/ipmitool/$TERMUX_PKG_VERSION/ipmitool-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_SHA256=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01
 TERMUX_PKG_DEPENDS="ncurses, openssl, readline"
-
-termux_step_pre_configure() {
-	export LIBS="-llog"
-}

packages/json-c/build.sh

@@ -3,13 +3,8 @@ TERMUX_PKG_DESCRIPTION="A JSON implementation in C"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Balazs Kutil @balazs_kutil"
 TERMUX_PKG_VERSION=0.13.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873
 TERMUX_PKG_BREAKS="json-c-dev"
 TERMUX_PKG_REPLACES="json-c-dev"
 TERMUX_PKG_SRCURL=https://s3.amazonaws.com/json-c_releases/releases/json-c-${TERMUX_PKG_VERSION}.tar.gz
-
-termux_step_make() {
-	make \
-		LDFLAGS="$LDFLAGS -llog"
-}

packages/krb5/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://web.mit.edu/kerberos
 TERMUX_PKG_DESCRIPTION="The Kerberos network authentication system"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.17.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/krb5-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=3706d7ec2eaa773e0e32d3a87bf742ebaecae7d064e190443a3acddfd8afb181
 TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libdb"
@@ -37,7 +38,7 @@ termux_step_pre_configure() {
 	cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/clients/kpasswd/"
 
 	CFLAGS="$CFLAGS -D_PASSWORD_LEN=PASS_MAX"
-	export LIBS="-landroid-glob -llog"
+	export LIBS="-landroid-glob"
 }
 
 termux_step_post_make_install() {

packages/libgcrypt/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libgcrypt/
 TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.8.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libgpg-error"
@@ -14,9 +15,6 @@ ac_cv_lib_pthread_pthread_create=yes
 "
 
 termux_step_pre_configure() {
-	# libgcrypt uses syslog, which we redirect to android logging:
-	LDFLAGS="$LDFLAGS -llog"
-
 	CFLAGS+=" -no-integrated-as"
 	if [ $TERMUX_ARCH = "arm" ]; then
 		# See http://marc.info/?l=gnupg-devel&m=139136972631909&w=3

packages/libmaa/build.sh

@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://sourceforge.net/projects/dict/
 TERMUX_PKG_DESCRIPTION="Provides many low-level data structures which are helpful for writing compilers"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.3.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/dict/libmaa/libmaa-${TERMUX_PKG_VERSION}/libmaa-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=59a5a01e3a9036bd32160ec535d25b72e579824e391fea7079e9c40b0623b1c5
 
 termux_step_pre_configure() {
     autoreconf -ivf
-    LDFLAGS+=" -llog"
 }

packages/lighttpd/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.lighttpd.net
 TERMUX_PKG_DESCRIPTION="Fast webserver with minimal memory footprint"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.4.54
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=cf14cce2254a96d8fcb6d3181e1a3c29a8f832531c3e86ff6f2524ecda9a8721
 TERMUX_PKG_SRCURL=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-bzip2 --with-openssl --with-pcre --with-zlib"
@@ -9,6 +10,6 @@ TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt, libandroid-glob, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/lighttpd-angel"
 
 termux_step_pre_configure() {
-	# liblog for syslog:
+	LDFLAGS="$LDFLAGS -landroid-glob"
-	LDFLAGS="$LDFLAGS -llog -landroid-glob"
 }
+

packages/mpd/build.sh

@@ -27,7 +27,7 @@ termux_step_pre_configure() {
 	fi
 
 	CXXFLAGS+=" -DTERMUX -UANDROID"
-	LDFLAGS+=" -llog -lOpenSLES"
+	LDFLAGS+=" -lOpenSLES"
 	rm -f $TERMUX_PREFIX/etc/mpd.conf
 }
 

packages/net-tools/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://net-tools.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Configuration tools for Linux networking"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.60.2017.02.21
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 local commit=479bb4a7e11a4084e2935c0a576388f92469225b
 TERMUX_PKG_SHA256=7e9f8e8dcbabed0c8eeb976100496567abae7ac9d92c72cebd1a9d965473e943
 # We use a mirror to avoid using
@@ -14,7 +14,6 @@ TERMUX_PKG_EXTRA_MAKE_ARGS="BINDIR=$TERMUX_PREFIX/bin SBINDIR=$TERMUX_PREFIX/bin
 
 termux_step_configure() {
 	CFLAGS="$CFLAGS -D_LINUX_IN6_H -Dindex=strchr -Drindex=strrchr"
-	export LDLIBS="-llog"
 	sed -i "s#/usr#$TERMUX_PREFIX#" $TERMUX_PKG_SRCDIR/man/Makefile
 	yes "" | make config || true
 }

packages/openssh/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=8.1p1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib"
@@ -58,7 +58,6 @@ termux_step_pre_configure() {
 
 	CPPFLAGS+=" -DHAVE_ATTRIBUTE__SENTINEL__=1 -DBROKEN_SETRESGID"
 	LD=$CC # Needed to link the binaries
-	LDFLAGS+=" -llog" # liblog for android logging in syslog hack
 }
 
 termux_step_post_configure() {

packages/pulseaudio/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio
 TERMUX_PKG_DESCRIPTION="A featureful, general-purpose sound server"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=13.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libltdl, libsndfile, libandroid-glob, libsoxr, speexdsp"
@@ -41,7 +42,7 @@ termux_step_pre_configure() {
 	mkdir $TERMUX_PKG_SRCDIR/src/modules/aaudio
 	cp $TERMUX_PKG_BUILDER_DIR/module-aaudio-sink.c $TERMUX_PKG_SRCDIR/src/modules/aaudio
 
-	export LIBS="-llog -landroid-glob"
+	export LIBS="-landroid-glob"
 }
 
 termux_step_post_make_install() {

packages/redis/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://redis.io/
 TERMUX_PKG_DESCRIPTION="In-memory data structure store used as a database, cache and message broker"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=5.0.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://download.redis.io/releases/redis-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -12,9 +13,7 @@ termux_step_pre_configure() {
 	export USE_JEMALLOC=no
 
 	if [ $TERMUX_ARCH = "i686" ]; then
-		sed -i 's/FINAL_LIBS=-lm/FINAL_LIBS=-llog -lm -latomic/' $TERMUX_PKG_SRCDIR/src/Makefile
+		sed -i 's/FINAL_LIBS=-lm/FINAL_LIBS=-lm -latomic/' $TERMUX_PKG_SRCDIR/src/Makefile
-	else
-		sed -i 's/FINAL_LIBS=-lm/FINAL_LIBS=-llog -lm/' $TERMUX_PKG_SRCDIR/src/Makefile
 	fi
 }
 

packages/squid/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=4.9
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://squid.mirror.globo.tech/archive/4/squid-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=1cb1838c6683b0568a3a4050f4ea2fc1eaa5cbba6bdf7d57f7258c7cd7b41fa1
 TERMUX_PKG_DEPENDS="libc++, libcrypt, libxml2, libltdl, openssl, resolv-conf"
@@ -43,8 +44,6 @@ squid_cv_gnu_atomics=yes
 "
 
 termux_step_pre_configure() {
-	LDFLAGS="$LDFLAGS -llog"
-
 	# needed for building cf_gen
 	export BUILDCXX=g++
 	# else it picks up our cross CXXFLAGS

packages/stunnel/build.sh

@@ -2,12 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.stunnel.org/
 TERMUX_PKG_DESCRIPTION="Socket wrapper which can provide TLS support to ordinary applications"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=5.56
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.stunnel.org/downloads/stunnel-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-shared --with-ssl=$TERMUX_PREFIX --disable-fips"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/stunnel3 share/man/man8/stunnel.*.8"
-
-termux_step_pre_configure() {
-	LDFLAGS+=" -llog"
-}

packages/transmission/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://transmissionbt.com/
 TERMUX_PKG_DESCRIPTION="Easy, lean and powerful BitTorrent client"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=2.94
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://github.com/transmission/transmission/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=440c2fd0f89b1ab59d8a4b79ecd7bffd61bc000e36fb5b6c8e88142a4fadbb1f
 TERMUX_PKG_DEPENDS="libcurl, libevent, miniupnpc, openssl"
@@ -11,8 +11,6 @@ TERMUX_PKG_CONFFILES="var/service/transmission/run var/service/transmission/log/
 
 termux_step_pre_configure() {
 	./autogen.sh
-	# liblog for android logging in syslog hack:
-	LDFLAGS+=" -llog"
 
 	echo "ac_cv_func_getmntent=no" >> termux_configure.cache
 	echo "ac_cv_search_getmntent=false" >> termux_configure.cache