From ca7699c16955e3dd8cff7a5e75b20e7b0360d036 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 11 May 2017 01:01:20 +0200 Subject: [PATCH] Stand in srcdir for termux_step_pre_configure --- build-package.sh | 2 +- packages/bash/build.sh | 2 -- packages/bmon/build.sh | 3 +-- packages/ctags/build.sh | 1 - packages/expect/build.sh | 1 - packages/gawk/build.sh | 1 - packages/hunspell/build.sh | 1 - packages/lftp/build.sh | 1 - packages/libcln/build.sh | 1 - packages/libuv/build.sh | 1 - packages/macchanger/build.sh | 1 - packages/man/build.sh | 1 - packages/openssh/build.sh | 2 -- packages/php/build.sh | 1 - packages/readline/build.sh | 1 - packages/screen/build.sh | 1 - packages/tesseract/build.sh | 1 - packages/tmate/build.sh | 1 - packages/torsocks/build.sh | 1 - packages/transmission/build.sh | 1 - packages/zbar/build.sh | 2 -- 21 files changed, 2 insertions(+), 25 deletions(-) diff --git a/build-package.sh b/build-package.sh index f5d5da879..e989f0eac 100755 --- 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 diff --git a/packages/bash/build.sh b/packages/bash/build.sh index a2426487d..6a3660812 100755 --- 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 diff --git a/packages/bmon/build.sh b/packages/bmon/build.sh index ba1116c47..564a190b3 100644 --- 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 } diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh index 0f195e908..0374e671f 100644 --- 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 } diff --git a/packages/expect/build.sh b/packages/expect/build.sh index 0781cebfc..ed4add9fa 100644 --- 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 } diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh index 18dbd1733..adfb8a61b 100644 --- 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 } diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh index 87cc19e8f..4124987a8 100644 --- 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 } diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index ff825b51c..a047b4289 100644 --- 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 } diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh index e4382f2a8..6ad13b671 100644 --- 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 diff --git a/packages/libuv/build.sh b/packages/libuv/build.sh index d20d7c29d..ffe7c974b 100644 --- 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 } diff --git a/packages/macchanger/build.sh b/packages/macchanger/build.sh index a18700660..2aa53d3ae 100644 --- 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 } diff --git a/packages/man/build.sh b/packages/man/build.sh index a9f3bb4a3..98ffeeda0 100644 --- 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 diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 8bbfc9351..e4183736d 100755 --- 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 diff --git a/packages/php/build.sh b/packages/php/build.sh index ae3bece2b..285c63cec 100644 --- 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 diff --git a/packages/readline/build.sh b/packages/readline/build.sh index ec662df28..909a60604 100755 --- 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 diff --git a/packages/screen/build.sh b/packages/screen/build.sh index 953ad77b9..fcc97842d 100644 --- 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" diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index aee786524..a0b0584dd 100644 --- 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 } diff --git a/packages/tmate/build.sh b/packages/tmate/build.sh index d366efc3a..3fcd96802 100644 --- 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 } diff --git a/packages/torsocks/build.sh b/packages/torsocks/build.sh index cc1fa200d..42afc5369 100644 --- 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 } diff --git a/packages/transmission/build.sh b/packages/transmission/build.sh index 547c85b38..985382e3e 100755 --- 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 diff --git a/packages/zbar/build.sh b/packages/zbar/build.sh index f908ab434..182fa65f2 100644 --- 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 }