[PR PATCH] Revert "chroot-git: simplify and avoid gettext dependency."

[PR PATCH] Revert "chroot-git: simplify and avoid gettext dependency."

[sgn]

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

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-617867154

Comment:
Actually, I want to get rid of configure stuff in git and chroot-git.
Upstream recommends to craft `config.mak` by hand and ignore `configure` entirely.

https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/

https://lore.kernel.org/git/xmqqefxe33t5.fsf@gitster.mtv.corp.google.com/

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-617932903

Comment:
I thin we can remove the dependency on gettext altogether. In almost every case the person using git is a developer or experienced user and will be able to grok messages in English. If she cannot, she can still report the message in a problem report.

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-617932903

Comment:
I think we can remove the dependency on gettext altogether. In almost every case the person using git is a developer or experienced user and will be able to grok messages in English. If she cannot, she can still report the message in a problem report.

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-617994108

Comment:
Wtf? So you want to add back gettext dependency in the host again? No way

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-617994325

Comment:
Fix this by other means than reverting 

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-618011671

Comment:
https://github.com/void-linux/void-packages/commit/08e5cef0145fcf713802a19318b72c681b70a0c7

Re: [PR PATCH] [Closed]: Revert "chroot-git: simplify and avoid gettext dependency."

[pullmoll]

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

There's a closed pull request on the void-packages repository

Revert "chroot-git: simplify and avoid gettext dependency."
https://github.com/void-linux/void-packages/pull/21248

Description:
This reverts commit aa1e576abe9b001879da67da2728e13d71be025d.
Fix cross-compile chroot-git.

@xtraeme 

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-618089003

Comment:
No, it's only partial revert.
The problem is `--with-zlib=$XBPS_MASTER/usr`

`NO_GETTEXT=Yes` in config should be enough to ignore gettext.

Re: Revert "chroot-git: simplify and avoid gettext dependency."

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21248#issuecomment-618090910

Comment:
Well, the build is broken, https://build.voidlinux.org/builders/aarch64-musl_builder/builds/26213/steps/shell_3/logs/stdio

I fast tracked 77ea0f30d99756d5529d976962bd78881fc0d1eb to fix it.

Re: [PR PATCH] [Closed]: Revert "chroot-git: simplify and avoid gettext dependency."

[sgn]

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

There's a closed pull request on the void-packages repository

Revert "chroot-git: simplify and avoid gettext dependency."
https://github.com/void-linux/void-packages/pull/21248

Description:
This reverts commit aa1e576abe9b001879da67da2728e13d71be025d.
Fix cross-compile chroot-git.

@xtraeme