From: lfdebrux <lfdebrux@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gettext: fix cross compile
Date: Wed, 05 Jan 2022 16:14:18 +0100 [thread overview]
Message-ID: <20220105151418.RQrFRjZDfmp7uzKEggcyYSY0IpwL6hMbr0oHsS8Kdg0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34866@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
There is an updated pull request by lfdebrux against master on the void-packages repository
https://github.com/lfdebrux/void-packages fix-gettext-cross
https://github.com/void-linux/void-packages/pull/34866
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 PR just removes the pre-configure step, reverting 17f6ad8b. This fixes #34810.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv5tel-musl
- i686-musl
A patch file from https://github.com/void-linux/void-packages/pull/34866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-gettext-cross-34866.patch --]
[-- Type: text/x-diff, Size: 1839 bytes --]
From 9cce4e5150a0e8e85f79bae18ab8496a99ab7e50 Mon Sep 17 00:00:00 2001
From: Laurence de Bruxelles <lfdebrux@gmail.com>
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
next prev parent reply other threads:[~2022-01-05 15:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 13:54 [PR PATCH] " lfdebrux
2022-01-05 15:14 ` lfdebrux [this message]
2022-01-05 20:41 ` Chocimier
2022-01-06 9:15 ` lfdebrux
2022-04-12 2:05 ` github-actions
2022-04-17 17:34 ` [PR PATCH] [Closed]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220105151418.RQrFRjZDfmp7uzKEggcyYSY0IpwL6hMbr0oHsS8Kdg0@z \
--to=lfdebrux@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).