From 3034fb8b87a0765b7a9e41da7b61b13ffa64b06a Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Wed, 30 Oct 2024 13:45:59 +0200 Subject: [PATCH] chore(main/libmcrypt): using configure option instead of modifying config.h --- packages/libmcrypt/build.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/libmcrypt/build.sh b/packages/libmcrypt/build.sh index 73ff251b5ddcba..e18637dd5ee669 100644 --- a/packages/libmcrypt/build.sh +++ b/packages/libmcrypt/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A library which provides a uniform interface to several TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.5.8" -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/mcrypt/libmcrypt-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=bf2f1671f44af88e66477db0982d5ecb5116a5c767b0a0d68acb34499d41b793 TERMUX_PKG_BREAKS="libmcrypt-dev" @@ -11,11 +11,7 @@ TERMUX_PKG_REPLACES="libmcrypt-dev" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man" -termux_step_post_configure() { - # Fix for `error: call to undeclared library function 'memmove/calloc/malloc/memcpy/free/sprintf/etc.'` during running `build-all.sh` - # Probably it would be easier to add `-Wimplicit-function-declaration` to `CFLAGS`, but this solution feels more correct. - echo "#include " >> "$TERMUX_PKG_SRCDIR/config.h" - echo "#include " >> "$TERMUX_PKG_SRCDIR/config.h" - echo "#include " >> "$TERMUX_PKG_SRCDIR/config.h" - echo "#include " >> "$TERMUX_PKG_SRCDIR/config.h" +termux_step_pre_configure() { + # configure tries to compile and execute program which fails while cross-compiling in docker + export ac_cv_header_stdc=yes }