From 9cce4e5150a0e8e85f79bae18ab8496a99ab7e50 Mon Sep 17 00:00:00 2001 From: Laurence de Bruxelles Date: Fri, 31 Dec 2021 16:38:48 +0000 Subject: [PATCH] gettext: fix cross compile For gettext-0.21 cross-compile does not work, because the pre-configure step tries to run `autoreconf -fi`, which fails with the error configure.ac:25: error: AC_INIT should be called with package and version arguments : gl_AM_INIT_AUTOMAKE is expanded from... /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... configure.ac:25: the top level autom4te: /usr/bin/m4 failed with exit status: 1 aclocal: error: /usr/bin/autom4te failed with exit status: 1 autoreconf: aclocal failed with exit status: 1 This pre-configure step was added back in commit 17f6ad8b for gettext-0.18.3, but its not clear what the error seen back then was, and now cross-compiling without running autoreconf works fine. So this commit just removes the pre-configure step, reverting 17f6ad8b. --- srcpkgs/gettext/template | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index dfb11a1f886c..85fc90e8cb14 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -1,7 +1,7 @@ # Template file for 'gettext' pkgname=gettext version=0.21 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-java --disable-native-java --disable-csharp --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs @@ -36,13 +36,6 @@ else conflicts="gettext-libs>=0" fi -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" automake libtool" - pre_configure() { - autoreconf -fi - } -fi - post_install() { # don't overwrite musl's header if [ "$XBPS_TARGET_LIBC" = musl ]; then