nodejs-current: Update from 9.6.1 to 9.7.1

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 0b524dd..f632b00 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -393,6 +393,12 @@ termux_step_start_build() {
                TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION"
        fi
 
+       if [ "$TERMUX_DEBUG" == "true" ]; then
+               DEBUG="-dbg"
+       else
+               DEBUG=""
+       fi
+
        if [ -z "$TERMUX_DEBUG" ] &&
           [ -z "${TERMUX_FORCE_BUILD+x}" ] &&
           [ -e "/data/data/.built-packages/$TERMUX_PKG_NAME" ]; then
@@ -775,33 +781,36 @@ termux_step_pre_configure() {
 termux_step_configure_autotools () {
        if [ ! -e "$TERMUX_PKG_SRCDIR/configure" ]; then return; fi
 
-       DISABLE_STATIC="--disable-static"
+       local DISABLE_STATIC="--disable-static"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--enable-static/}" ]; then
                # Do not --disable-static if package explicitly enables it (e.g. gdb needs enable-static to build)
                DISABLE_STATIC=""
        fi
 
-       DISABLE_NLS="--disable-nls"
+       local DISABLE_NLS="--disable-nls"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--enable-nls/}" ]; then
                # Do not --disable-nls if package explicitly enables it (for gettext itself)
                DISABLE_NLS=""
        fi
 
-       ENABLE_SHARED="--enable-shared"
+       local ENABLE_SHARED="--enable-shared"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--disable-shared/}" ]; then
                ENABLE_SHARED=""
        fi
-       HOST_FLAG="--host=$TERMUX_HOST_PLATFORM"
+
+       local HOST_FLAG="--host=$TERMUX_HOST_PLATFORM"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--host=/}" ]; then
                HOST_FLAG=""
        fi
-       LIBEXEC_FLAG="--libexecdir=$TERMUX_PREFIX/libexec"
-        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--libexecdir=/}" ]; then
-                LIBEXEC_FLAG=""
-        fi
-       QUIET_BUILD=
+
+       local LIBEXEC_FLAG="--libexecdir=$TERMUX_PREFIX/libexec"
+       if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--libexecdir=/}" ]; then
+               LIBEXEC_FLAG=""
+       fi
+
+       local QUIET_BUILD=
        if [ ! -z ${TERMUX_QUIET_BUILD+x} ]; then
-               QUIET_BUILD="--enable-silent-rules"
+               QUIET_BUILD="--enable-silent-rules --silent --quiet"
        fi
 
        # Some packages provides a $PKG-config script which some configure scripts pickup instead of pkg-config:
@@ -939,11 +948,16 @@ termux_step_post_configure () {
 }
 
 termux_step_make() {
+       local QUIET_BUILD=
+       if [ ! -z ${TERMUX_QUIET_BUILD+x} ]; then
+               QUIET_BUILD="-s"
+       fi
+
        if ls ./*akefile &> /dev/null; then
                if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
-                       make -j $TERMUX_MAKE_PROCESSES
+                       make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD
                else
-                       make -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_MAKE_ARGS}
+                       make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD ${TERMUX_PKG_EXTRA_MAKE_ARGS}
                fi
        fi
 }
@@ -1095,7 +1109,7 @@ termux_step_massage() {
                mkdir -p DEBIAN
                cd DEBIAN
                cat > control <<-HERE
-                       Package: $SUB_PKG_NAME
+                       Package: $SUB_PKG_NAME$DEBUG
                        Architecture: ${SUB_PKG_ARCH}
                        Installed-Size: ${SUB_PKG_INSTALLSIZE}
                        Maintainer: $TERMUX_PKG_MAINTAINER
@@ -1111,7 +1125,7 @@ termux_step_massage() {
                for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done
 
                # Create the actual .deb file:
-               TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb
+               TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb
                test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
                ar cr "$TERMUX_SUBPKG_DEBFILE" \
                                   "$TERMUX_COMMON_CACHEDIR/debian-binary" \
@@ -1163,7 +1177,7 @@ termux_step_create_debfile() {
 
        mkdir -p DEBIAN
        cat > DEBIAN/control <<-HERE
-               Package: $TERMUX_PKG_NAME
+               Package: $TERMUX_PKG_NAME$DEBUG
                Architecture: ${TERMUX_ARCH}
                Installed-Size: ${TERMUX_PKG_INSTALLSIZE}
                Maintainer: $TERMUX_PKG_MAINTAINER
@@ -1190,7 +1204,7 @@ termux_step_create_debfile() {
        tar -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" .
 
        test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
-       TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb
+       TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb
        # Create the actual .deb file:
        ar cr "$TERMUX_PKG_DEBFILE" \
               "$TERMUX_COMMON_CACHEDIR/debian-binary" \