X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5822f92030cc9176ddf3eb91749da07da11f9b88..543007aa11781fc250badf4f300b70651922b2e7:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 3118d8ab..ae128e8c 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -351,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 \
@@ -458,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
@@ -469,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
@@ -503,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: