From 2c2a04dad0fcc6a3f942f6833f7dd5535d04d341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 14 Jan 2020 07:47:21 +0700 Subject: [PATCH] chroot-git: update to 2.25.0. --- srcpkgs/chroot-git/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 60d484fdcba..255f742a453 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,7 +1,7 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.24.1 -revision=2 +version=2.25.0 +revision=1 bootstrap=yes wrksrc="git-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562 +checksum=c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0 if [ "$CHROOT_READY" ]; then hostmakedepends="perl gettext tar" @@ -23,14 +23,16 @@ else configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr" fi +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" ac_cv_iconv_omits_bom=yes" ;; + *) configure_args+=" ac_cv_iconv_omits_bom=no" ;; +esac + post_configure() { cat <<-EOF >config.mak CC_LD_DYNPATH=-L NO_INSTALL_HARDLINKS=Yes EOF - case "$XBPS_TARGET_MACHINE" in - *-musl) echo "ICONV_OMITS_BOM=Yes" >>config.mak ;; - esac } do_install() {