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?= 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 " 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?= 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?= 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 " 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