Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Revert "chroot-git: simplify and avoid gettext dependency."
@ 2020-04-22 15:36 sgn
  2020-04-22 15:56 ` sgn
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: sgn @ 2020-04-22 15:36 UTC (permalink / raw)
  To: ml

[-- 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() {

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-04-22 23:28 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-22 15:36 [PR PATCH] Revert "chroot-git: simplify and avoid gettext dependency." sgn
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 ` pullmoll
2020-04-22 20:07 ` [PR PATCH] [Closed]: " pullmoll
2020-04-22 23:21 ` sgn
2020-04-22 23:28 ` sgn
2020-04-22 23:28 ` [PR PATCH] [Closed]: " sgn

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).