From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [RFC] Support git worktree
Date: Wed, 22 Apr 2020 18:14:14 +0200 [thread overview]
Message-ID: <20200422161414.mDKYpO-bQc6eZavTtUoHA6VnM1KWYUnufcHZ7jvfFv4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21207@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1853 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/21207#issuecomment-617878315
Comment:
I tempted to include this patch:
```diff
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 4f471ad2b7..b0d5c6d9f1 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -5,9 +5,6 @@ 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"
makedepends="zlib-devel"
short_desc="GIT Tree History Storage Tool -- for xbps-src use"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,17 +14,34 @@ distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848
if [ "$CHROOT_READY" ]; then
- hostmakedepends="perl gettext tar"
-else
- configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+ hostmakedepends="perl tar"
fi
-post_configure() {
+do_configure() {
cat <<-EOF >config.mak
+ prefix=/usr
+ CC = $CC
+ CFLAGS = $CFLAGS
+ CPPFLAGS = $CPPFLAGS
+ LDFLAGS = $LDFLAGS
CC_LD_DYNPATH=-L
NO_INSTALL_HARDLINKS=Yes
NO_GETTEXT=Yes
+ NO_CURL=Yes
+ NO_OPENSSL=Yes
+ NO_PYTHON=Yes
+ NO_EXPAT=Yes
+ NO_TCLTK=Yes
+ USE_LIBPCRE1 =
+ USE_LIBPCRE2 =
EOF
+
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ cat <<-EOF >>config.mak
+ ICONV_OMITS_BOM=Yes
+ NO_REGEX=NeedsStartEnd
+ EOF
+ fi
}
do_install() {
```
to get rid of configure stuff, since it's recommended by upstream
https://lore.kernel.org/git/xmqqefxe33t5.fsf@gitster.mtv.corp.google.com/
https://lore.kernel.org/git/20200401221835.GH2224@szeder.dev/
next prev parent reply other threads:[~2020-04-22 16:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 16:25 [PR PATCH] " sgn
2020-04-21 16:43 ` xtraeme
2020-04-22 0:01 ` sgn
2020-04-22 0:44 ` sgn
2020-04-22 0:49 ` [PR PATCH] [Updated] " sgn
2020-04-22 0:51 ` sgn
2020-04-22 0:51 ` sgn
2020-04-22 15:07 ` [PR PATCH] [Updated] " sgn
2020-04-22 16:00 ` sgn
2020-04-22 16:14 ` sgn [this message]
2020-04-22 16:15 ` sgn
2020-04-22 16:28 ` sgn
2020-04-22 16:30 ` sgn
2020-04-22 16:41 ` Piraty
2020-04-26 1:19 ` [PR PATCH] [Updated] " sgn
2020-04-26 1:20 ` sgn
2020-04-26 7:53 ` Piraty
2020-05-18 11:49 ` [PR PATCH] [Updated] " sgn
2020-05-19 12:26 ` sgn
2020-05-19 13:19 ` sgn
2020-05-23 6:59 ` [PR PATCH] [Merged]: " sgn
2020-05-23 12:25 ` Piraty
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=20200422161414.mDKYpO-bQc6eZavTtUoHA6VnM1KWYUnufcHZ7jvfFv4@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).