strace: Fix aarch64 build if gawk is installed
authorFredrik Fornwall <fredrik@fornwall.net>
Sun, 5 Mar 2017 01:15:28 +0000 (02:15 +0100)
committerFredrik Fornwall <fredrik@fornwall.net>
Sun, 5 Mar 2017 01:15:28 +0000 (02:15 +0100)
packages/strace/build.sh

index 46d06f6..06ffbe2 100755 (executable)
@@ -4,12 +4,14 @@ TERMUX_PKG_VERSION=4.16
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/strace/strace/${TERMUX_PKG_VERSION}/strace-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef
 TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script
+# Without st_cv_m32_mpers=no the build fails if gawk is installed.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="st_cv_m32_mpers=no"
 
 termux_step_pre_configure () {
        if [ $TERMUX_ARCH_BITS = "64" ]; then
                # The strace configure script only looks for struct flock64 in <linux/fcntl.h>,
                # but we actually have it in <fcntl.h> here:
-               TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_type_struct_flock64=yes"
+               TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_type_struct_flock64=yes"
        fi
 
        CFLAGS+=" -DIOV_MAX=1024"