Always call post-extract step in srcdir

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 93c8bdc..91fdd59 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -66,7 +66,7 @@ termux_setup_golang () {
        local TERMUX_GO_PLATFORM=linux-amd64
        test "$(uname)" = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
-       export TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}
+       local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}
        export GOROOT=$TERMUX_BUILDGO_FOLDER
        export PATH=$GOROOT/bin:$PATH
 
@@ -271,7 +271,9 @@ termux_step_start_build() {
        fi
 
        if [ -z "${TERMUX_SKIP_DEPCHECK:=""}" ]; then
-               for p in $(./scripts/buildorder.py "$TERMUX_PKG_NAME"); do
+               local p TERMUX_ALL_DEPS
+               TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_NAME")
+               for p in $TERMUX_ALL_DEPS; do
                        if [ "$p" != "$TERMUX_PKG_NAME" ]; then
                                echo "Building dependency $p if necessary..."
                                ./build-package.sh -a $TERMUX_ARCH -s "$p"
@@ -358,7 +360,7 @@ termux_step_extract_package () {
 
        if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
                folder=`basename $filename .tar.bz2` && folder=`basename $folder .tar.gz` && folder=`basename $folder .tar.xz` && folder=`basename $folder .tar.lz` && folder=`basename $folder .tgz` && folder=`basename $folder .zip`
-               folder=`echo $folder | sed 's/_/-/'` # dpkg uses _ in tar filename, but - in folder
+               folder="${folder/_/-}" # dpkg uses _ in tar filename, but - in folder
        else
                folder=$TERMUX_PKG_FOLDERNAME
        fi
@@ -372,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
 }
@@ -379,17 +382,19 @@ termux_step_post_extract_package () {
 # Optional host build. Not to be overridden by packages.
 termux_step_handle_hostbuild() {
        if [ "x$TERMUX_PKG_HOSTBUILD" = "x" ]; then return; fi
+
        cd "$TERMUX_PKG_SRCDIR"
        for patch in $TERMUX_PKG_BUILDER_DIR/*.patch.beforehostbuild; do
                test -f "$patch" && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$patch" | patch --silent -p1
        done
-       mkdir -p "$TERMUX_PKG_HOSTBUILD_DIR"
-       if [ -f "$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION" ]; then
-               echo "Using already built host build"
-       else
+
+       local TERMUX_HOSTBUILD_MARKER="$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION"
+       if [ ! -f "$TERMUX_HOSTBUILD_MARKER" ]; then
+               rm -Rf "$TERMUX_PKG_HOSTBUILD_DIR"
+               mkdir -p "$TERMUX_PKG_HOSTBUILD_DIR"
                cd "$TERMUX_PKG_HOSTBUILD_DIR"
                termux_step_host_build
-               touch $TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION
+               touch "$TERMUX_HOSTBUILD_MARKER"
        fi
 }
 
@@ -633,7 +638,7 @@ termux_step_post_configure () {
 }
 
 termux_step_make () {
-       if ls *akefile &> /dev/null; then
+       if ls ./*akefile &> /dev/null; then
                if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
                        make -j $TERMUX_MAKE_PROCESSES
                else
@@ -643,8 +648,8 @@ termux_step_make () {
 }
 
 termux_step_make_install () {
-       if ls *akefile &> /dev/null; then
-               : ${TERMUX_PKG_MAKE_INSTALL_TARGET:="install"}:
+       if ls ./*akefile &> /dev/null; then
+               : "${TERMUX_PKG_MAKE_INSTALL_TARGET:="install"}"
                # Some packages have problem with parallell install, and it does not buy much, so use -j 1.
                if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
                        make -j 1 ${TERMUX_PKG_MAKE_INSTALL_TARGET}
@@ -733,8 +738,8 @@ termux_step_massage () {
        if [ -d include ] && [ -z "${TERMUX_PKG_NO_DEVELSPLIT}" ]; then
                # Add virtual -dev sub package if there are include files:
                local _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh
-               echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE
-               echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE
+               echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > "$_DEVEL_SUBPACKAGE_FILE"
+               echo "TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\"" >> "$_DEVEL_SUBPACKAGE_FILE"
                if [ -n "$TERMUX_PKG_DEVPACKAGE_DEPENDS" ]; then
                        echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME,$TERMUX_PKG_DEVPACKAGE_DEPENDS\" >> $_DEVEL_SUBPACKAGE_FILE
                else
@@ -891,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