From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] git: not use autotools (prepare for 2.32)
Date: Sat, 22 May 2021 05:08:17 +0200 [thread overview]
Message-ID: <20210522030817.KR3duVcTBsbP10nc-3OeehIzPw1BJB9OwKsOeLRjHGY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30998@inbox.vuxu.org>
[-- 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
}
next prev parent reply other threads:[~2021-05-22 3:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 17:47 [PR PATCH] " sgn
2021-05-20 12:28 ` [PR PATCH] [Updated] " sgn
2021-05-22 3:08 ` sgn [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210522030817.KR3duVcTBsbP10nc-3OeehIzPw1BJB9OwKsOeLRjHGY@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).