Always call post-extract step in srcdir

diff --git a/build-package.sh b/build-package.sh
index 4c810616b72ca4ba3a894a703a07bebd03e24b7a..91fdd599fc54da709c983ddaeb88a6e2280f694e 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -374,6 +374,7 @@ termux_step_extract_package () {
 }
 
 # Hook for packages to act just after the package has been extracted.
+# Invoked in $TERMUX_PKG_SRCDIR.
 termux_step_post_extract_package () {
         return
 }
@@ -895,6 +896,7 @@ termux_step_setup_variables
 termux_step_handle_buildarch
 termux_step_start_build
 termux_step_extract_package
+cd "$TERMUX_PKG_SRCDIR"
 termux_step_post_extract_package
 termux_step_handle_hostbuild
 termux_step_setup_toolchain

diff --git a/packages/autoconf/build.sh b/packages/autoconf/build.sh
index 0be67a1c95aa21b5d85eaf8f30ac936fe4ae2908..a27a0893c019a194a230b47eb3701fd4bde8f2c7 100644 (file)
--- a/packages/autoconf/build.sh
+++ b/packages/autoconf/build.sh
@@ -6,7 +6,6 @@ TERMUX_PKG_DEPENDS="m4, make, perl"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_post_extract_package () {
-       cd $TERMUX_PKG_SRCDIR
        perl -p -i -e "s|/bin/sh|$TERMUX_PREFIX/bin/sh|" lib/*/*.m4
 }
 

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index 3405342a9821859bb2290245828880764da7563e..2ccf2016fe9dc3ceadd3d56123203d2fa8451187 100644 (file)
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -20,8 +20,6 @@ termux_step_post_extract_package () {
        # COMPILERRT_SRC_TAR=compiler-rt-${TERMUX_PKG_VERSION}.src.tar.xz
        # test ! -f $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR && curl http://llvm.org/releases/${TERMUX_PKG_VERSION}/${COMPILERRT_SRC_TAR} > $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR
 
-       cd $TERMUX_PKG_SRCDIR
-
        tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
        mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
 

diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh
index 0fd4649d9cd2a2aa0a31da13534f739b3c759a66..45999b98895638fab2e9558eebb5c1215cb463a3 100644 (file)
--- a/packages/ctags/build.sh
+++ b/packages/ctags/build.sh
@@ -10,6 +10,5 @@ TERMUX_PKG_BUILD_IN_SRC="yes"
 
 termux_step_post_extract_package () {
        export regcomp_works=yes
-       cd $TERMUX_PKG_SRCDIR
        ./autogen.sh
 }

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 4ca564157fd0bfa6068423e24e4d3919d4aedf65..3be99f5dcc7e8bfc3fba456028fe206d02800272 100755 (executable)
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -25,7 +25,7 @@ termux_step_pre_configure() {
 termux_step_post_extract_package () {
        if [ $TERMUX_ARCH = aarch64 ]; then
                # Fix problem with <stdlib.h> including <memory.h>:
-               mv $TERMUX_PKG_SRCDIR/sim/aarch64/{memory.h,memory_sim.h}
+               mv sim/aarch64/{memory.h,memory_sim.h}
                perl -p -i -e 's/memory.h/memory_sim.h/' $TERMUX_PKG_SRCDIR/sim/aarch64/*c
        fi
 }

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 55276f85283fb815856e2489b85d7161ffa52adb..a9f44078a96666888d72b6bf494d1ca3fa397244 100755 (executable)
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -6,7 +6,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
 termux_step_post_extract_package () {
-        cd $TERMUX_PKG_SRCDIR
        mkdir -p src/musl-locale/ src/musl-multibyte/ include/ src/musl-ctype/
        cp $NDK/sources/android/support/src/musl-multibyte/{mblen.c,mbsrtowcs.c,mbsnrtowcs.c,libc.h,internal.h,internal.c} src/musl-multibyte/
        cp $NDK/sources/android/support/src/musl-locale/{catclose.c,catgets.c,catopen.c} src/musl-locale/

diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh
index 65246b3ed81086ec2553a3421e8dd003452f375d..55e11855ca216330fe6f602e077565e5822c7234 100644 (file)
--- a/packages/libgc/build.sh
+++ b/packages/libgc/build.sh
@@ -8,7 +8,6 @@ termux_step_post_extract_package () {
        LIBATOMIC_VERSION=7.4.4
        LIBATOMIC_FILE=libatomic_ops-${LIBATOMIC_VERSION}.tar.gz
        test ! -f $TERMUX_PKG_CACHEDIR/$LIBATOMIC_FILE && curl -o $TERMUX_PKG_CACHEDIR/$LIBATOMIC_FILE http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${LIBATOMIC_VERSION}.tar.gz
-       cd $TERMUX_PKG_SRCDIR
        tar xf $TERMUX_PKG_CACHEDIR/$LIBATOMIC_FILE
        mv libatomic_ops-${LIBATOMIC_VERSION} libatomic_ops
        ./autogen.sh

diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index 4224eb07895b1ca9b13e15053ac5ca462d65f499..bc923007c3e973b8c5b923e33f652f494ae552eb 100644 (file)
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -16,7 +16,6 @@ termux_step_post_extract_package () {
        PERLCROSS_FILE=perl-${PERLCROSS_PERL_VERSION}-cross-${PERLCROSS_VERSION}.tar.gz
        PERLCROSS_TAR=$TERMUX_PKG_CACHEDIR/$PERLCROSS_FILE
        test ! -f $PERLCROSS_TAR && curl -o $PERLCROSS_TAR -L https://github.com/arsv/perl-cross/releases/download/$PERLCROSS_VERSION/$PERLCROSS_FILE
-       cd $TERMUX_PKG_SRCDIR
        tar xf $PERLCROSS_TAR
        cd perl-${PERLCROSS_PERL_VERSION}
        cp -Rf * ../