Get rid of some linkage against liblog

After https://github.com/termux/termux-packages/pull/4639 has been merged linking against liblog for syslog-using code is no longer needed.
2019-12-30 00:16:07 +01:00 · 2019-12-30 00:16:07 +01:00 · 6d93e1a0c0
parent dbc33b2d57
commit 6d93e1a0c0
12 changed files with 14 additions and 55 deletions
--- a/packages/autossh/build.sh
+++ b/packages/autossh/build.sh
@ -2,14 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.harding.motd.ca/autossh/
 TERMUX_PKG_DESCRIPTION="Automatically restart SSH sessions and tunnels"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=1.4g
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=83766463763364a1be56d6bf1a75b40a59302586645bf0c4fa885188cf01ebfc
 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/autossh-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_DEPENDS="openssh | dropbear"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man ac_cv_path_ssh=$TERMUX_PREFIX/bin/ssh"
-
-termux_step_pre_configure() {
-	# For syslog logging:
-	export LIBS="-llog"
-}
--- a/packages/clamav/build.sh
+++ b/packages/clamav/build.sh
@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.102.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=0dbda8d0d990d068732966f13049d112a26dce62145d234383467c1d877dedd6
 TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libltdl, liblzma, libxml2, openssl, pcre2, zlib"
@ -29,11 +30,6 @@ TERMUX_PKG_CONFFILES="
 etc/clamav/clamd.conf
 etc/clamav/freshclam.conf"

-termux_step_pre_configure() {
-	export OBJC=$CC
-	LDFLAGS+=" -llog"
-}
-
 termux_step_post_make_install() {
 	for conf in clamd.conf freshclam.conf; do
 		sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \
--- a/packages/direvent/build.sh
+++ b/packages/direvent/build.sh
@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org.ua/software/direvent/
 TERMUX_PKG_DESCRIPTION="Monitor of events in file system directories"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=5.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/direvent/direvent-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=239822cdda9ecbbbc41a69181b34505b2d3badd4df5367e765a0ceb002883b55
 TERMUX_PKG_DEPENDS="libandroid-glob"

 termux_step_pre_configure() {
-	export LIBS="-landroid-glob -llog"
+       export LIBS="-landroid-glob"
 }
--- a/packages/libwebsockets/build.sh
+++ b/packages/libwebsockets/build.sh
@ -2,15 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libwebsockets.org
 TERMUX_PKG_DESCRIPTION="Lightweight C websockets library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=3.2.99.1
-TERMUX_PKG_SHA256=c0964b19cdd0311834352235216226298685b3bdf80b337c63db53fca686c284
-TERMUX_PKG_SRCURL=https://github.com/warmcat/libwebsockets/archive/216abea32c4f281632c2e45800acc26c1483c4a0.zip
+TERMUX_PKG_SHA256=67471f41804680ca5a33ffe1428e3758e815e5c2c6887c6a524b90611decdb75
+TERMUX_PKG_SRCURL=https://github.com/warmcat/libwebsockets/archive/0cd351d4c40687a4d40a42f04c1313498a918cd1.zip
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_BREAKS="libwebsockets-dev"
 TERMUX_PKG_REPLACES="libwebsockets-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITH_STATIC=OFF"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/pkgconfig/libwebsockets_static.pc"
-
-termux_step_pre_configure() {
-	# For syslog():
-	LDFLAGS+=" -llog"
-}
--- a/packages/mpdscribble/Makefile.am.patch
+++ b/packages/mpdscribble/Makefile.am.patch
@ -1,12 +0,0 @@
--- ../Makefile.am.orig	2019-07-26 23:06:17.899096875 +0200
-+++ ./Makefile.am	2019-07-26 23:18:44.680264101 +0200
-@@ -43,7 +43,8 @@
- 	$(LIBMPDCLIENT_LIBS) \
- 	$(libgthread_LIBS) \
- 	$(libgcrypt_LIBS) \
-	$(libglib_LIBS)
-+	$(libglib_LIBS) \
-+	-llog
- 
- AM_CPPFLAGS += -DFILE_CONF='"$(sysconfdir)/mpdscribble.conf"'
- 
--- a/packages/mpdscribble/build.sh
+++ b/packages/mpdscribble/build.sh
@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A Music Player Daemon (MPD) client which submits informa
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=0.22
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/mpdscribble/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9f6d73e1d0d44bf782c199732acc91bb07efc1c02ae04d037d711860dd8e4012
 TERMUX_PKG_DEPENDS="libcurl, mpd, libmpdclient, glib"
--- a/packages/redir/build.sh
+++ b/packages/redir/build.sh
@ -2,11 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/troglobit/redir
 TERMUX_PKG_DESCRIPTION="TCP port redirector for UNIX"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=7ce53ac52a24c1b3279b994bfffbd429c44df2db10a4b1a0f54e108604fdae6e
 TERMUX_PKG_SRCURL=https://github.com/troglobit/redir/releases/download/v$TERMUX_PKG_VERSION/redir-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps"
-
-termux_step_pre_configure() {
-	export LIBS="-llog"
-}
--- a/packages/rsync/build.sh
+++ b/packages/rsync/build.sh
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://rsync.samba.org/
 TERMUX_PKG_DESCRIPTION="Utility that provides fast incremental file transfer"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=3.1.3
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://rsync.samba.org/ftp/rsync/src/rsync-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
 TERMUX_PKG_DEPENDS="libiconv, libpopt, openssh | dropbear, zlib"
@ -12,7 +12,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-xattr-support
 --disable-debug
 "
-
-termux_step_pre_configure() {
-	CFLAGS="$CFLAGS -llog" # for syslog
-}
--- a/packages/screen/build.sh
+++ b/packages/screen/build.sh
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/screen/
 TERMUX_PKG_DESCRIPTION="Terminal multiplexer with VT100/ANSI terminal emulation"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=4.7.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/screen/screen-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1
 TERMUX_PKG_DEPENDS="ncurses, libcrypt"
@ -16,7 +16,7 @@ termux_step_pre_configure() {
 	# Run autoreconf since we have patched configure.ac
 	autoconf
 	CFLAGS+=" -DGETUTENT"
-	export LIBS="-lcrypt -llog"
+	export LIBS="-lcrypt"
 }

 termux_step_post_configure() {
--- a/packages/socat/build.sh
+++ b/packages/socat/build.sh
@ -3,11 +3,8 @@ TERMUX_PKG_DESCRIPTION="Relay for bidirectional data transfer between two indepe
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_DEPENDS="openssl, readline"
 TERMUX_PKG_VERSION=1.7.3.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=8cc0eaee73e646001c64adaab3e496ed20d4d729aaaf939df2a761e99c674372
 TERMUX_PKG_SRCURL=http://www.dest-unreach.org/socat/download/socat-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes ac_compiler_gnu=yes" # sc_cv_sys_crdly_shift=9 sc_cv_sys_csize_shift=4 sc_cv_sys_tabdly_shift=11"
 TERMUX_PKG_BUILD_IN_SRC=true
-
-termux_step_pre_configure() {
-	export LIBS="-llog"
-}
--- a/packages/tinyproxy/build.sh
+++ b/packages/tinyproxy/build.sh
@ -2,14 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://tinyproxy.github.io/
 TERMUX_PKG_DESCRIPTION="Light-weight HTTP proxy daemon for POSIX operating systems"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.10.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682
 TERMUX_PKG_SRCURL=https://github.com/tinyproxy/tinyproxy/releases/download/${TERMUX_PKG_VERSION}/tinyproxy-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-regexcheck"

-termux_step_pre_configure() {
-	export LIBS="-llog"
-}
-
 termux_step_post_massage() {
 	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var/log/$TERMUX_PKG_NAME
 	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var/run/$TERMUX_PKG_NAME
--- a/packages/tor/build.sh
+++ b/packages/tor/build.sh
@ -2,16 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://www.torproject.org
 TERMUX_PKG_DESCRIPTION="The Onion Router anonymizing overlay network"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=0.4.2.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.torproject.org/dist/tor-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=4d5975862e7808faebe9960def6235669fafeeac844cb76965501fa7af79d8c2
 TERMUX_PKG_DEPENDS="libevent, openssl, liblzma, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-zstd --disable-unittests"
 TERMUX_PKG_CONFFILES="etc/tor/torrc var/service/tor/run var/service/tor/log/run"

-termux_step_pre_configure() {
-	export LIBS="-llog"
-}
-
 termux_step_post_make_install() {
 	# use default config
 	mv "$TERMUX_PREFIX/etc/tor/torrc.sample" "$TERMUX_PREFIX/etc/tor/torrc"