From fb619bc073bde464c9c0e69e4dd3f327fa954a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 20 May 2021 00:44:05 +0700
Subject: [PATCH] chroot-git: build manually with make
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As recommended by Git project itself. Also reduce the time for running
configure script.
---
 srcpkgs/chroot-git/template | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index d4cd9d8e6a5..7da8a60d903 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -4,10 +4,6 @@ version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-build_style=gnu-configure
-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"
 make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
@@ -23,17 +19,39 @@ else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = $(command -v bsdtar || command -v tar)
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
 	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
+	NO_OPENSSL = Yes
+	USE_LIBPCRE :=
+	USE_LIBPCRE2 :=
+	NO_CURL = Yes
+	NO_EXPAT = Yes
+	NO_PERL = Yes
+	NO_PYTHON = Yes
+	NO_TCLTK = Yes
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
+}
+
+do_build() {
+	make ${makejobs} git
 }
 
 do_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
-
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+	vbin git chroot-git
 }