Stand in srcdir for termux_step_pre_configure

diff --git a/build-package.sh b/build-package.sh
index f5d5da8798635de7ee86672af012eda16fda0966..e989f0eac4dea257e2b6ef8ef4a7f5f453299e89 100755 (executable)
--- 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
 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
 termux_step_pre_configure
 cd "$TERMUX_PKG_BUILDDIR"
 termux_step_configure

diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index a2426487d86e890f871acdb02aec41ae481d7d46..6a366081261648b340a14b04b9f2e07cce94b896 100755 (executable)
--- 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 () {
 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
        declare -A PATCH_CHECKSUMS
        PATCH_CHECKSUMS[001]=3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f
        PATCH_CHECKSUMS[002]=7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53

diff --git a/packages/bmon/build.sh b/packages/bmon/build.sh
index ba1116c4703af5f90a592351875061f775f79bd3..564a190b344c45bea2039b21ce25d72fe3ccc098 100644 (file)
--- 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() {
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {

-    cd $TERMUX_PKG_SRCDIR
-    ./autogen.sh
+       ./autogen.sh

 }
 }

diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh
index 0f195e908e1f5496143e39e6bed88eda20d8d4a5..0374e671f0c7e689df5b8c49d997a6e52b21b9ab 100644 (file)
--- 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() {
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
 termux_step_pre_configure() {

-       cd $TERMUX_PKG_SRCDIR

        export regcomp_works=yes
        ./autogen.sh
 }
        export regcomp_works=yes
        ./autogen.sh
 }

diff --git a/packages/expect/build.sh b/packages/expect/build.sh
index 0781cebfc57b57314998042d8a4006ce0380d5ed..ed4add9fa822b73c2a1e99580b4335844c36d01c 100644 (file)
--- 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 () {
 TERMUX_PKG_DEPENDS="libutil, tcl"
 
 termux_step_pre_configure () {

-       cd $TERMUX_PKG_SRCDIR

        autoconf
 }
 
        autoconf
 }
 

diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh
index 18dbd17339c59aed93826dfdee3a837d7394d4e6..adfb8a61b47a4123c6b53f1e574311d0949ca2d2 100644 (file)
--- 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
        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
 }
        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
 }

diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh
index 87cc19e8f05925b54421a60e5f74a04e7c0a6644..4124987a839ded841646fb49f089774b437d9247 100644 (file)
--- 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() {
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {

-       cd $TERMUX_PKG_SRCDIR

        autoreconf -vfi
 }
        autoreconf -vfi
 }

diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh
index ff825b51c7bce510e9068dd92c802ad849df639e..a047b4289adbd39e9e9b90c49fe842ac1aa92219 100644 (file)
--- 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.
        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-zlib=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr"
 
        # We have patched an m4 file.

-       cd $TERMUX_PKG_SRCDIR

        aclocal
        autoconf
 }
        aclocal
        autoconf
 }

diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh
index e4382f2a82394e62468be770b4e96a3b43c96daf..6ad13b6711faab52c52a7ca5442990b5c931f6d5 100644 (file)
--- a/packages/libcln/build.sh
+++ b/packages/libcln/build.sh
@@ -16,7 +16,6 @@ termux_step_pre_configure() {
                CPPFLAGS+=" -DNO_ASM"
        fi
 
                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
        sed -i -e 's%tests/Makefile %%' configure.ac
        sed -i -e 's%examples/Makefile %%' configure.ac
        sed -i -e 's%benchmarks/Makefile %%' configure.ac

diff --git a/packages/libuv/build.sh b/packages/libuv/build.sh
index d20d7c29d59e7cff96bcb7a5d72ba9054cd641f9..ffe7c974ba2df9ab2ef5e3fee2e79ad22c144dfd 100644 (file)
--- 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
 termux_step_pre_configure () {
        export LINK=$CXX
        export PLATFORM=android

-       cd $TERMUX_PKG_SRCDIR

        sh autogen.sh
 }
        sh autogen.sh
 }

diff --git a/packages/macchanger/build.sh b/packages/macchanger/build.sh
index a18700660227244ccac03a78798a85edc5703078..2aa53d3ae0f2d62fba448b73bb8cfc2e3378f054 100644 (file)
--- 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() {
 TERMUX_PKG_FOLDERNAME=macchanger-${TERMUX_PKG_VERSION}
 
 termux_step_pre_configure() {

-       cd $TERMUX_PKG_SRCDIR

        ./autogen.sh
 }
        ./autogen.sh
 }

diff --git a/packages/man/build.sh b/packages/man/build.sh
index a9f3bb4a3761d40bb5366985383952af395962c4..98ffeeda0593f0595b6529b68a0d19337510f178 100644 (file)
--- 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 () {
 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
        LDFLAGS+=" -landroid-glob"
        echo "PREFIX=\"$TERMUX_PREFIX\"" > configure.local
        echo "CC=\"$CC\"" >> configure.local

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 8bbfc9351ba7e976f0b807d35b3878490a4beac7..e4183736ddb471202b8684df070566404ef877d4 100755 (executable)
--- 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() {
 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
        autoreconf
 
        LD=$CC # Needed to link the binaries

diff --git a/packages/php/build.sh b/packages/php/build.sh
index ae3bece2b1176e9acc07f73280849f49fde8a5e2..285c63cece4a02a01f78b1fd04173b4fb9ed6382 100644 (file)
--- 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.
        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
        autoconf
 
        export EXTENSION_DIR=$TERMUX_PREFIX/lib/php

diff --git a/packages/readline/build.sh b/packages/readline/build.sh
index ec662df284df4abbff55a1f40bec666b57584f09..909a60604101eb06b96eedb265b3f5d46c03a46d 100755 (executable)
--- 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 () {
 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
        local PATCH_CHECKSUMS
        PATCH_CHECKSUMS[1]=9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376
        PATCH_CHECKSUMS[2]=8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58

diff --git a/packages/screen/build.sh b/packages/screen/build.sh
index 953ad77b9ebdca4ced3fa0f42b6ffc58e68e7b9e..fcc97842dfa1aea0f365f434483dccf889546c0f 100644 (file)
--- 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
 
 termux_step_pre_configure () {
        # Run autoreconf since we have patched configure.ac

-       cd $TERMUX_PKG_SRCDIR

        autoconf
        CFLAGS+=" -DGETUTENT"
        LDFLAGS+=" -llog -lcrypt"
        autoconf
        CFLAGS+=" -DGETUTENT"
        LDFLAGS+=" -llog -lcrypt"

diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh
index aee7865242f4330430673e4cffb621438148a4ad..a0b0584dda54ba3a03f985de403199ea71bdc035 100644 (file)
--- 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
 
        # 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
 }
        perl -p -i -e 's|ADD_RT], true|ADD_RT], false|g' configure.ac
        ./autogen.sh
 }

diff --git a/packages/tmate/build.sh b/packages/tmate/build.sh
index d366efc3a7d20f4480b72c4d996e31616c2eeb22..3fcd96802a9b7d4190a329560486321a074eeade 100644 (file)
--- 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"
 
 termux_step_pre_configure () {
        CFLAGS+=" -DIOV_MAX=1024"
 

-       cd $TERMUX_PKG_SRCDIR

        ./autogen.sh
 }
        ./autogen.sh
 }

diff --git a/packages/torsocks/build.sh b/packages/torsocks/build.sh
index cc1fa200d58c584e75399cca272f1f1de91b6f45..42afc536947754c07a10cd5351f03f84e9b80786 100644 (file)
--- 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 () {
 TERMUX_PKG_FOLDERNAME=torsocks-${__TORSOCKS_REF}
 
 termux_step_pre_configure () {

-       cd $TERMUX_PKG_SRCDIR

        ./autogen.sh
 }
 
        ./autogen.sh
 }
 

diff --git a/packages/transmission/build.sh b/packages/transmission/build.sh
index 547c85b3853d2b51c16dc114e5e0dbaf85b661bc..985382e3e7297e3722f094d214d476af32131cc3 100755 (executable)
--- 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"
 
        # 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
        echo "ac_cv_func_getmntent=no" >> termux_configure.cache
        echo "ac_cv_search_getmntent=false" >> termux_configure.cache
        chmod a-w termux_configure.cache

diff --git a/packages/zbar/build.sh b/packages/zbar/build.sh
index f908ab434ccbd39ef8ce911617986471d0e0f644..182fa65f259a226a3c3d9f3e9ec8255b80501dfc 100644 (file)
--- 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 () {
 --without-python --mandir=$TERMUX_PREFIX/share/man"
 
 termux_step_pre_configure () {

-       # Run autoreconf since we have patched configure.ac
-       cd $TERMUX_PKG_SRCDIR

        autoconf
 }
        autoconf
 }