From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Revert "chroot-git: simplify and avoid gettext dependency."
Date: Wed, 22 Apr 2020 17:36:26 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21248@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages chroot-git-fix
https://github.com/void-linux/void-packages/pull/21248
Revert "chroot-git: simplify and avoid gettext dependency."
This reverts commit aa1e576abe9b001879da67da2728e13d71be025d.
Fix cross-compile chroot-git.
@xtraeme
A patch file from https://github.com/void-linux/void-packages/pull/21248.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-git-fix-21248.patch --]
[-- Type: text/x-diff, Size: 1385 bytes --]
From d903b6419293db4e98be5f6712bdfe89ca4a4b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 22 Apr 2020 22:33:52 +0700
Subject: [PATCH] Revert "chroot-git: simplify and avoid gettext dependency."
This reverts commit aa1e576abe9b001879da67da2728e13d71be025d.
Fix cross-compile chroot-git.
---
srcpkgs/chroot-git/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index e685ed7dfa1..ebc1e5023a2 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -5,8 +5,8 @@ revision=1
bootstrap=yes
wrksrc="git-${version}"
build_style=gnu-configure
-configure_args="--with-zlib=$XBPS_MASTERDIR/usr --without-curl
- --without-openssl --without-python --without-expat --without-tcltk
+configure_args="--without-curl --without-openssl
+ --without-python --without-expat --without-tcltk
ac_cv_lib_curl_curl_global_init=no ac_cv_lib_expat_XML_ParserCreate=no"
makedepends="zlib-devel"
short_desc="GIT Tree History Storage Tool -- for xbps-src use"
@@ -18,6 +18,8 @@ checksum=9ece0dcb07a5e0d7366a92b613b201cca11ae368ab7687041364b3e756e495d6
if [ "$CHROOT_READY" ]; then
hostmakedepends="perl gettext tar"
+else
+ configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
fi
post_configure() {
next reply other threads:[~2020-04-22 15:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 15:36 sgn [this message]
2020-04-22 15:56 ` sgn
2020-04-22 17:51 ` pullmoll
2020-04-22 17:51 ` pullmoll
2020-04-22 19:41 ` xtraeme
2020-04-22 19:41 ` xtraeme
2020-04-22 20:07 ` [PR PATCH] [Closed]: " pullmoll
2020-04-22 20:07 ` pullmoll
2020-04-22 23:21 ` sgn
2020-04-22 23:28 ` sgn
2020-04-22 23:28 ` [PR PATCH] [Closed]: " sgn
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-21248@inbox.vuxu.org \
--to=sgn@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).