ruby: Update from 2.2.3 to 2.2.4

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index eb65dc5..ae128e8 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -190,6 +190,10 @@ rm -Rf   $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_
 # Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build)
 mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp}
 
+# Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build script can assume that it works
+# on both builder and host later on:
+ln -f -s /bin/sh $TERMUX_PREFIX/bin/sh
+
 # If $TERMUX_PREFIX already exists, it may have been built for a different arch
 TERMUX_ARCH_FILE=/data/TERMUX_ARCH
 if [ -f "${TERMUX_ARCH_FILE}" ]; then
@@ -240,7 +244,6 @@ Requires:
 Libs: -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib -lz
 Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
 HERE
-        sleep 1 # Sleep so that zlib.c get older timestamp then TERMUX_BUILD_TS_FILE.
 fi
 
 TERMUX_ELF_CLEANER=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner
@@ -251,6 +254,8 @@ fi
 
 # Keep track of when build started so we can see what files have been created
 export TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME
+sleep 1 # Sleep so that any generated files above (such as zlib.c and $PREFIX/bin/sh)
+       #get older timestamp then TERMUX_BUILD_TS_FILE
 rm -f $TERMUX_BUILD_TS_FILE && touch $TERMUX_BUILD_TS_FILE
 
 # Run just after sourcing $TERMUX_PKG_BUILDER_SCRIPT
@@ -346,6 +351,9 @@ termux_step_configure () {
        # about this problem which may cause linker errors in test scripts not undef:ing malloc and
        # also cause problems with e.g. malloc interceptors such as libgc:
        local AVOID_AUTOCONF_WRAPPERS="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+       # Similarly, disable gnulib's rpl_getcwd(). It returns the wrong value, affecting zile. See
+       # <https://github.com/termux/termux-packages/issues/76>.
+       local AVOID_AUTOCONF_WRAPPERS="gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_posix_signature=yes gl_cv_func_getcwd_path_max=yes gl_cv_func_getcwd_abort_bug=no $AVOID_AUTOCONF_WRAPPERS"
 
        env $AVOID_AUTOCONF_WRAPPERS $TERMUX_PKG_SRCDIR/configure \
                --disable-dependency-tracking \
@@ -453,6 +461,10 @@ termux_step_massage () {
                 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_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE
+               if [ x$TERMUX_PKG_CONFLICTS != x ]; then
+                       # Assume that dev packages conflicts as well.
+                       echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> $_DEVEL_SUBPACKAGE_FILE
+               fi
         fi
         # Now build all sub packages
         rm -Rf $TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages
@@ -464,6 +476,7 @@ termux_step_massage () {
                echo "$SUB_PKG_NAME => $subpackage"
                 SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME
                 TERMUX_SUBPKG_DEPENDS=""
+               TERMUX_SUBPKG_CONFLICTS=""
                 SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX
                SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package
                 mkdir -p $SUB_PKG_MASSAGE_DIR $SUB_PKG_PACKAGE_DIR
@@ -498,6 +511,7 @@ Description: $TERMUX_SUBPKG_DESCRIPTION
 Homepage: $TERMUX_PKG_HOMEPAGE
 HERE
                 test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control
+                test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control
                $TERMUX_TAR -czf $SUB_PKG_PACKAGE_DIR/control.tar.gz .
 
                 # Create the actual .deb file: