Stand in srcdir for termux_step_pre_configure

2017-05-11 01:01:20 +02:00 · 2017-05-11 01:01:20 +02:00 · ce92cc4c5d
parent 49b3a2a231
commit ce92cc4c5d
21 changed files with 2 additions and 25 deletions
--- a/build-package.sh
+++ b/build-package.sh
@ -1061,7 +1061,7 @@ termux_step_handle_hostbuild
 termux_step_setup_toolchain
 termux_step_patch_package
 termux_step_replace_guess_scripts
-cd "$TERMUX_PKG_BUILDDIR"
+cd "$TERMUX_PKG_SRCDIR"
 termux_step_pre_configure
 cd "$TERMUX_PKG_BUILDDIR"
 termux_step_configure
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@ -24,8 +24,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_getcwd_malloc=yes"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug"

 termux_step_pre_configure () {
-	cd $TERMUX_PKG_SRCDIR
-
 	declare -A PATCH_CHECKSUMS
 	PATCH_CHECKSUMS[001]=3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f
 	PATCH_CHECKSUMS[002]=7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53
--- a/packages/bmon/build.sh
+++ b/packages/bmon/build.sh
@ -8,6 +8,5 @@ TERMUX_PKG_DEPENDS="libconfuse, libnl, ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
-    cd $TERMUX_PKG_SRCDIR
-    ./autogen.sh
+	./autogen.sh
 }
--- a/packages/ctags/build.sh
+++ b/packages/ctags/build.sh
@ -9,7 +9,6 @@ TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC="yes"

 termux_step_pre_configure() {
-	cd $TERMUX_PKG_SRCDIR
 	export regcomp_works=yes
 	./autogen.sh
 }
--- a/packages/expect/build.sh
+++ b/packages/expect/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_SHA256=b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc0
 TERMUX_PKG_DEPENDS="libutil, tcl"

 termux_step_pre_configure () {
-	cd $TERMUX_PKG_SRCDIR
 	autoconf
 }

--- a/packages/gawk/build.sh
+++ b/packages/gawk/build.sh
@ -12,7 +12,6 @@ termux_step_pre_configure () {
 	rm -f $TERMUX_PREFIX/bin/awk

 	# http://cross-lfs.org/view/CLFS-2.1.0/ppc64-64/temp-system/gawk.html
-        cd $TERMUX_PKG_SRCDIR
 	cp -v extension/Makefile.in{,.orig}
 	sed -e 's/check-recursive all-recursive: check-for-shared-lib-support/check-recursive all-recursive:/' extension/Makefile.in.orig > extension/Makefile.in
 }
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@ -9,6 +9,5 @@ TERMUX_PKG_FOLDERNAME=hunspell-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
-	cd $TERMUX_PKG_SRCDIR
 	autoreconf -vfi
 }
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@ -13,7 +13,6 @@ termux_step_pre_configure () {
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-zlib=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr"

 	# We have patched an m4 file.
-	cd $TERMUX_PKG_SRCDIR
 	aclocal
 	autoconf
 }
--- a/packages/libcln/build.sh
+++ b/packages/libcln/build.sh
@ -16,7 +16,6 @@ termux_step_pre_configure() {
 		CPPFLAGS+=" -DNO_ASM"
 	fi

-	cd $TERMUX_PKG_SRCDIR
 	sed -i -e 's%tests/Makefile %%' configure.ac
 	sed -i -e 's%examples/Makefile %%' configure.ac
 	sed -i -e 's%benchmarks/Makefile %%' configure.ac
--- a/packages/libuv/build.sh
+++ b/packages/libuv/build.sh
@ -8,6 +8,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-dtrace" # needed for building on mac
 termux_step_pre_configure () {
 	export LINK=$CXX
 	export PLATFORM=android
-	cd $TERMUX_PKG_SRCDIR
 	sh autogen.sh
 }
--- a/packages/macchanger/build.sh
+++ b/packages/macchanger/build.sh
@ -6,6 +6,5 @@ TERMUX_PKG_SHA256=1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e
 TERMUX_PKG_FOLDERNAME=macchanger-${TERMUX_PKG_VERSION}

 termux_step_pre_configure() {
-	cd $TERMUX_PKG_SRCDIR
 	./autogen.sh
 }
--- a/packages/man/build.sh
+++ b/packages/man/build.sh
@ -9,7 +9,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="share/examples"

 termux_step_pre_configure () {
-	cd $TERMUX_PKG_SRCDIR
 	LDFLAGS+=" -landroid-glob"
 	echo "PREFIX=\"$TERMUX_PREFIX\"" > configure.local
 	echo "CC=\"$CC\"" >> configure.local
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@ -37,8 +37,6 @@ TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1"

 termux_step_pre_configure() {
-	# We patch configure.ac:
-	cd $TERMUX_PKG_SRCDIR
 	autoreconf

 	LD=$CC # Needed to link the binaries
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@ -47,7 +47,6 @@ termux_step_pre_configure () {
 	export NATIVE_PHP_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/php

 	# Run autoconf since we have patched config.m4 files.
-	cd $TERMUX_PKG_SRCDIR
 	autoconf

 	export EXTENSION_DIR=$TERMUX_PREFIX/lib/php
--- a/packages/readline/build.sh
+++ b/packages/readline/build.sh
@ -10,7 +10,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-curses --enable-multibyte bash_cv_wcwidt
 TERMUX_PKG_EXTRA_MAKE_ARGS="SHLIB_LIBS=-lncursesw"

 termux_step_pre_configure () {
-        cd $TERMUX_PKG_SRCDIR
 	local PATCH_CHECKSUMS
 	PATCH_CHECKSUMS[1]=9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376
 	PATCH_CHECKSUMS[2]=8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58
--- a/packages/screen/build.sh
+++ b/packages/screen/build.sh
@ -12,7 +12,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

 termux_step_pre_configure () {
 	# Run autoreconf since we have patched configure.ac
-	cd $TERMUX_PKG_SRCDIR
 	autoconf
 	CFLAGS+=" -DGETUTENT"
 	LDFLAGS+=" -llog -lcrypt"
--- a/packages/tesseract/build.sh
+++ b/packages/tesseract/build.sh
@ -10,7 +10,6 @@ termux_step_pre_configure() {
 	# http://blog.matt-swain.com/post/26419042500/installing-tesseract-ocr-on-mac-os-x-lion
 	export LIBLEPT_HEADERSDIR=${TERMUX_PREFIX}/include/leptonica

-	cd $TERMUX_PKG_SRCDIR
 	perl -p -i -e 's|ADD_RT], true|ADD_RT], false|g' configure.ac
 	./autogen.sh
 }
--- a/packages/tmate/build.sh
+++ b/packages/tmate/build.sh
@ -10,6 +10,5 @@ TERMUX_PKG_DEPENDS="libandroid-support, libevent, libmsgpack, libssh, libutil, n
 termux_step_pre_configure () {
 	CFLAGS+=" -DIOV_MAX=1024"

-	cd $TERMUX_PKG_SRCDIR
 	./autogen.sh
 }
--- a/packages/torsocks/build.sh
+++ b/packages/torsocks/build.sh
@ -8,7 +8,6 @@ TERMUX_PKG_DEPENDS="tor"
 TERMUX_PKG_FOLDERNAME=torsocks-${__TORSOCKS_REF}

 termux_step_pre_configure () {
-	cd $TERMUX_PKG_SRCDIR
 	./autogen.sh
 }

--- a/packages/transmission/build.sh
+++ b/packages/transmission/build.sh
@ -11,7 +11,6 @@ termux_step_pre_configure() {
 	# liblog for android logging in syslog hack:
 	LDFLAGS+=" -llog"

-	cd $TERMUX_PKG_SRCDIR
 	echo "ac_cv_func_getmntent=no" >> termux_configure.cache
 	echo "ac_cv_search_getmntent=false" >> termux_configure.cache
 	chmod a-w termux_configure.cache
--- a/packages/zbar/build.sh
+++ b/packages/zbar/build.sh
@ -11,7 +11,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread
 --without-python --mandir=$TERMUX_PREFIX/share/man"

 termux_step_pre_configure () {
-	# Run autoreconf since we have patched configure.ac
-	cd $TERMUX_PKG_SRCDIR
 	autoconf
 }