Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] git: not use autotools (prepare for 2.32)
@ 2021-05-19 17:47 sgn
  2021-05-20 12:28 ` [PR PATCH] [Updated] " sgn
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: sgn @ 2021-05-19 17:47 UTC (permalink / raw)
  To: ml

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 4022 bytes --]

From dbb3ad72b8f6402d17932992fc7c875644af2793 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:26:04 +0700
Subject: [PATCH 1/2] git: build as gnu-makefile

Git project officially recommended to use "make" directly, they
expressed that autotools was a bad idea and people shouldn't use
configure [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..78ddb4c382c8 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,8 +2,6 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -21,16 +19,28 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=YesPlease
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = YesPlease
+		NO_REGEX = YesPlease
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -46,8 +56,8 @@ do_check() {
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From ec23e6a77a9cb9fc91f29fb15cd3aef2fc091fed 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 2/2] chroot-git: build manually
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 | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index d4cd9d8e6a5e..d694e66a7ef0 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -4,10 +4,7 @@ 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"
+build_style=gnu-makefile
 make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
@@ -25,15 +22,34 @@ fi
 
 post_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
 	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
+	NO_OPENSSL = YesPlease
+	USE_LIBPCRE :=
+	USE_LIBPCRE2 :=
+	NO_CURL = YesPlease
+	NO_EXPAT = YesPlease
+	NO_PERL = YesPlease
+	NO_PYTHON = YesPlease
+	NO_TCLTK = YesPlease
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = YesPlease
+		NO_REGEX = YesPlease
+		EOF
+	fi
 }
 
-do_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
@ 2021-05-20 12:28 ` sgn
  2021-05-22  3:08 ` sgn
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-20 12:28 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 4058 bytes --]

From f45290fe0302b89bb4bc03ac557720bd7b377e60 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:26:04 +0700
Subject: [PATCH 1/2] git: build as gnu-makefile

Git project officially recommended to use "make" directly, they
expressed that autotools was a bad idea and people shouldn't use
configure [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..6238661fa6b8 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,8 +2,6 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -21,16 +19,30 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -46,8 +58,8 @@ do_check() {
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 514f39d005ab78c2273ffa922c60268a5d3e301a 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 2/2] chroot-git: build manually
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 | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index d4cd9d8e6a5e..b39c986b0503 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,38 @@ else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
  2021-05-20 12:28 ` [PR PATCH] [Updated] " sgn
@ 2021-05-22  3:08 ` sgn
  2021-05-22  3:11 ` sgn
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-22  3:08 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 4476 bytes --]

From 91ea07a2c4655d55ddba2f3ca72ad25b8467f0b1 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:26:04 +0700
Subject: [PATCH 1/2] git: build manually with make

Git project officially recommended to use "make" directly, they
expressed that autotools was a bad idea and people shouldn't use
configure [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..9817570e1d58 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,9 +2,7 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
@@ -21,16 +19,31 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -46,8 +59,8 @@ do_check() {
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From b2ad7c431bd4b2400cce01b935d99efcb84864a4 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 2/2] chroot-git: build manually
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 | 38 +++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index d4cd9d8e6a5e..81e407070b71 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"
@@ -18,22 +14,44 @@ distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	hostmakedepends="perl"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
  2021-05-20 12:28 ` [PR PATCH] [Updated] " sgn
  2021-05-22  3:08 ` sgn
@ 2021-05-22  3:11 ` sgn
  2021-05-22  5:42 ` sgn
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-22  3:11 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 4405 bytes --]

From f2692871abdcc527fcc23a247c380d410cb4c022 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:26:04 +0700
Subject: [PATCH 1/2] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..9817570e1d58 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,9 +2,7 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
@@ -21,16 +19,31 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -46,8 +59,8 @@ do_check() {
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 16bf094fec717857c9f5097c4c26a4d157a9bd77 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 2/2] 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 | 38 +++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index d4cd9d8e6a5e..81e407070b71 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"
@@ -18,22 +14,44 @@ distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	hostmakedepends="perl"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (2 preceding siblings ...)
  2021-05-22  3:11 ` sgn
@ 2021-05-22  5:42 ` sgn
  2021-05-23  3:38 ` sgn
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-22  5:42 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 4348 bytes --]

From 101406b3a3ca7e583386f6cc3c8ec30a922ed508 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:26:04 +0700
Subject: [PATCH 1/2] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..70e0c47092cd 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,11 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +20,31 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -46,8 +60,8 @@ do_check() {
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 6d2f66dcf13154d36a0b53ba77b53e24aa1caec5 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 2/2] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (3 preceding siblings ...)
  2021-05-22  5:42 ` sgn
@ 2021-05-23  3:38 ` sgn
  2021-05-26  1:22 ` sgn
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-23  3:38 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 5710 bytes --]

From 101406b3a3ca7e583386f6cc3c8ec30a922ed508 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:26:04 +0700
Subject: [PATCH 1/3] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..70e0c47092cd 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,11 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +20,31 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -46,8 +60,8 @@ do_check() {
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 6d2f66dcf13154d36a0b53ba77b53e24aa1caec5 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 2/3] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

From 01cef11eafda72efcdfe5c59d94eccc1c25df66e 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: Sun, 23 May 2021 10:38:06 +0700
Subject: [PATCH 3/3] git: update to 2.32.0.rc1.

---
 srcpkgs/git/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 70e0c47092cd..0a9b0a2520f4 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.1
+version=2.32.0.rc1
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -12,8 +12,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
-distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+distfiles="https://www.kernel.org/pub/software/scm/git/testing/git-${version}.tar.xz"
+checksum=faf9b38f67eaaa27c30f38fb3648882935db934e5081d105f7dff176273c4138
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (4 preceding siblings ...)
  2021-05-23  3:38 ` sgn
@ 2021-05-26  1:22 ` sgn
  2021-05-28 14:22 ` sgn
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-26  1:22 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 5901 bytes --]

From d894fe521ddc8be9a25dcd7b4087e193d7c7064c 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:26:04 +0700
Subject: [PATCH 1/3] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..628d718725b6 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,11 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +20,33 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -40,14 +56,14 @@ post_build() {
 }
 
 do_check() {
-	make ${makejobs} test
+	make test
 	make -C contrib/diff-highlight test
 	make -C contrib/subtree test
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 58b3754c450f6f6082a498d859c45b39865f3d92 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 2/3] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

From c93c7d6fbd18d81ac2cec6196237731b5af73d9b 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: Sun, 23 May 2021 10:38:06 +0700
Subject: [PATCH 3/3] git: update to 2.32.0.rc1.

---
 srcpkgs/git/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 628d718725b6..04ed6705589a 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.1
+version=2.32.0.rc1
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -12,8 +12,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
-distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+distfiles="https://www.kernel.org/pub/software/scm/git/testing/git-${version}.tar.xz"
+checksum=faf9b38f67eaaa27c30f38fb3648882935db934e5081d105f7dff176273c4138
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (5 preceding siblings ...)
  2021-05-26  1:22 ` sgn
@ 2021-05-28 14:22 ` sgn
  2021-05-28 14:25 ` sgn
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-28 14:22 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 5901 bytes --]

From b61663ac98bd900272dc4fcfbce0b13bf754f5b8 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:26:04 +0700
Subject: [PATCH 1/3] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..628d718725b6 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,11 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +20,33 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -40,14 +56,14 @@ post_build() {
 }
 
 do_check() {
-	make ${makejobs} test
+	make test
 	make -C contrib/diff-highlight test
 	make -C contrib/subtree test
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 268599a05104cb49890fdd5519e1fc463b90f336 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 2/3] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

From b88a86912f79dbce01f65e14f014377f87569136 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: Sun, 23 May 2021 10:38:06 +0700
Subject: [PATCH 3/3] git: update to 2.32.0.rc2.

---
 srcpkgs/git/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 628d718725b6..878a8a57da71 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.1
+version=2.32.0.rc2
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -12,8 +12,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
-distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+distfiles="https://www.kernel.org/pub/software/scm/git/testing/git-${version}.tar.xz"
+checksum=2a34af9882e8a48f94cb95a2237887f11ec3ab17ffdbc4ed1c85ea2b43538284
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (6 preceding siblings ...)
  2021-05-28 14:22 ` sgn
@ 2021-05-28 14:25 ` sgn
  2021-06-06 14:55 ` sgn
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-05-28 14:25 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 6149 bytes --]

From b61663ac98bd900272dc4fcfbce0b13bf754f5b8 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:26:04 +0700
Subject: [PATCH 1/3] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..628d718725b6 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,11 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +20,33 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -40,14 +56,14 @@ post_build() {
 }
 
 do_check() {
-	make ${makejobs} test
+	make test
 	make -C contrib/diff-highlight test
 	make -C contrib/subtree test
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 268599a05104cb49890fdd5519e1fc463b90f336 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 2/3] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

From 80e8ac5b0e6fb3d508f6412a8de4ad301cde7149 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: Sun, 23 May 2021 10:38:06 +0700
Subject: [PATCH 3/3] git: update to 2.32.0.rc2.

---
 srcpkgs/git/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 628d718725b6..1c4c0c97bc0f 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,19 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.1
+version=2.32.0.rc2
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
-distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+distfiles="https://www.kernel.org/pub/software/scm/git/testing/git-${version}.tar.xz"
+checksum=2a34af9882e8a48f94cb95a2237887f11ec3ab17ffdbc4ed1c85ea2b43538284
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (7 preceding siblings ...)
  2021-05-28 14:25 ` sgn
@ 2021-06-06 14:55 ` sgn
  2021-06-06 16:31 ` sgn
  2021-06-07  0:29 ` [PR PATCH] [Merged]: " sgn
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-06 14:55 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 5921 bytes --]

From 9761666aae4805a38517053faa837f8934d896b6 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:26:04 +0700
Subject: [PATCH 1/3] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..80ae9ef4538d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,12 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +21,35 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		# TZ=CST6CDT date --iso-8601=seconds -d"2005-01-31 18:00:00 -0600"
+		export GIT_SKIP_TESTS=t9604.2
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -40,14 +59,14 @@ post_build() {
 }
 
 do_check() {
-	make ${makejobs} test
+	make test
 	make -C contrib/diff-highlight test
 	make -C contrib/subtree test
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 21a8ed57315d69c86d28bf3ab9d25ff38e8c85d2 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 2/3] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

From d684ce01d8017ddc65319eeaef4e9a04011d5720 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: Sun, 6 Jun 2021 21:47:30 +0700
Subject: [PATCH 3/3] git: update to 2.32.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 80ae9ef4538d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.1
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (8 preceding siblings ...)
  2021-06-06 14:55 ` sgn
@ 2021-06-06 16:31 ` sgn
  2021-06-07  0:29 ` [PR PATCH] [Merged]: " sgn
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-06 16:31 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages git-not-use-autotools
https://github.com/void-linux/void-packages/pull/30998

git: not use autotools (prepare for 2.32)
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-not-use-autotools-30998.patch --]
[-- Type: text/x-diff, Size: 5928 bytes --]

From f7bce6c22b32e72cd820fbb3620806eca6bc3259 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:26:04 +0700
Subject: [PATCH 1/3] git: build manually with make

Git project officially recommended to use "make" directly [1].

1: https://lore.kernel.org/git/xmqq4kxiiuba.fsf@gitster-ct.c.googlers.com/
---
 srcpkgs/git/template | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9aa14d60ce1d..66e54bfc9e7d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,12 +2,12 @@
 pkgname=git
 version=2.31.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
-hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
+hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey tzdata"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
@@ -21,16 +21,35 @@ python_version=3
 
 subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
 
-post_configure() {
+do_configure() {
 	cat <<-EOF >config.mak
+	prefix = /usr
+	CC = $CC
+	AR = $AR
+	TAR = bsdtar
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	USE_LIBPCRE2=Yes
 	NO_INSTALL_HARDLINKS=Yes
 	INSTALLDIRS=vendor
 	perllibdir=/usr/share/perl5/vendor_perl
 	PYTHON_PATH=/usr/bin/python3
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cat <<-EOF >>config.mak
+		ICONV_OMITS_BOM = Yes
+		NO_REGEX = Yes
+		# TZ=CST6CDT date --iso-8601=seconds -d"2005-01-31 18:00:00 -0600"
+		export GIT_SKIP_TESTS=t9604.2
+		EOF
+	fi
 }
 
-post_build() {
+do_build() {
+	make ${makejobs}
 	make ${makejobs} -C Documentation man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
@@ -40,14 +59,14 @@ post_build() {
 }
 
 do_check() {
-	make ${makejobs} test
+	make test
 	make -C contrib/diff-highlight test
 	make -C contrib/subtree test
 	make -C contrib/credential/netrc test
 }
 
-post_install() {
-	make DESTDIR=${DESTDIR} install-doc
+do_install() {
+	make DESTDIR=${DESTDIR} install install-doc
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git

From 98cd3361fbe337323d1f50427f89b5e0a012a0d0 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 2/3] 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 d4cd9d8e6a5e..7da8a60d903d 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_install() {
-	# remove unneeded stuff.
-	make DESTDIR=${wrksrc}/build-tmp install
+do_build() {
+	make ${makejobs} git
+}
 
-	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
+do_install() {
+	vbin git chroot-git
 }

From f08834198c5f5ac16ae8f2f7e25fa0de36f6bbb4 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: Sun, 6 Jun 2021 21:47:30 +0700
Subject: [PATCH 3/3] git: update to 2.32.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 66e54bfc9e7d..571fc6dc6df8 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.31.1
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Merged]: git: not use autotools (prepare for 2.32)
  2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
                   ` (9 preceding siblings ...)
  2021-06-06 16:31 ` sgn
@ 2021-06-07  0:29 ` sgn
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-07  0:29 UTC (permalink / raw)
  To: ml

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

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

git: not use autotools (prepare for 2.32)
https://github.com/void-linux/void-packages/pull/30998

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2021-06-07  0:29 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 17:47 [PR PATCH] git: not use autotools (prepare for 2.32) sgn
2021-05-20 12:28 ` [PR PATCH] [Updated] " sgn
2021-05-22  3:08 ` sgn
2021-05-22  3:11 ` sgn
2021-05-22  5:42 ` sgn
2021-05-23  3:38 ` sgn
2021-05-26  1:22 ` sgn
2021-05-28 14:22 ` sgn
2021-05-28 14:25 ` sgn
2021-06-06 14:55 ` sgn
2021-06-06 16:31 ` sgn
2021-06-07  0:29 ` [PR PATCH] [Merged]: " 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).