Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gettext: fix non-cross builds
Date: Sun, 24 Apr 2022 23:21:10 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36843@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2548 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gettext-fix-noncross
https://github.com/void-linux/void-packages/pull/36843

gettext: fix non-cross builds
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

fixes this error when building:
```
make[2]: Entering directory '/builddir/gettext-0.21/libtextstyle'
CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/sh /builddir/gettext-0.21/libtextstyle/build-aux/missing aclocal-1.16 -I m4 -I gnulib-m4
/builddir/gettext-0.21/libtextstyle/build-aux/missing: line 81: aclocal-1.16: command not found
WARNING: 'aclocal-1.16' is missing on your system.
         You should only need it if you modified 'acinclude.m4' or
         'configure.ac' or m4 files included by 'configure.ac'.
         The 'aclocal' program is part of the GNU Automake package:
         <https://www.gnu.org/software/automake>
         It also requires GNU Autoconf, GNU m4 and Perl in order to run:
         <https://www.gnu.org/software/autoconf>
         <https://www.gnu.org/software/m4/>
         <https://www.perl.org/>
make[2]: *** [Makefile:1748: aclocal.m4] Error 127
make[2]: Leaving directory '/builddir/gettext-0.21/libtextstyle'
make[1]: *** [Makefile:403: all-recursive] Error 1
make[1]: Leaving directory '/builddir/gettext-0.21'
make: *** [Makefile:359: all] Error 2
=> ERROR: gettext-0.21_4: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 2
=> ERROR:   in do_build() at common/build-style/gnu-configure.sh:15

```

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36843.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-fix-noncross-36843.patch --]
[-- Type: text/x-diff, Size: 1109 bytes --]

From adf7c811d0023a090879728a5241e494e1ebdc4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 21:52:50 +0200
Subject: [PATCH] gettext: fix non-cross builds

---
 srcpkgs/gettext/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index dfb11a1f886c..2ab568366d26 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -14,7 +14,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp
 # Either:
 # - Have xz in hostmakedepends; or
 # - Let gettext-devel depends on bzip2
-hostmakedepends="xz"
+hostmakedepends="xz automake libtool"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -36,12 +36,9 @@ else
 	conflicts="gettext-libs>=0"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" automake libtool"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	# don't overwrite musl's header

             reply	other threads:[~2022-04-24 21:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-24 21:21 paper42 [this message]
2022-05-01 14:18 ` [PR PATCH] [Merged]: " 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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36843@inbox.vuxu.org \
    --to=paper42@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).