From bf8bba61b8cde97857bc67be44fec814250be768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 14 Nov 2018 12:41:34 +0700 Subject: [PATCH] git: correct ac_cv_fread_reads_directories on musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git build system relies on FREAD_READS_DIRECTORIES flag to check if we're on a system which succeeds when attempting to fopen a directory or read from an fopen-ed directory. System with musl libc is one of such systems. The current template lies git build system on this matter. Effectively, t1308 is failing on musl system. Signed-off-by: Đoàn Trần Công Danh --- srcpkgs/git/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 24235487e96..b31a75b0275 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,10 +1,10 @@ # Template file for 'git' pkgname=git version=2.19.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 - ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" + ac_cv_snprintf_returns_bogus=no" make_install_args="NO_INSTALL_HARDLINKS=1 INSTALLDIRS=vendor perllibdir=/usr/share/perl5/vendor_perl" hostmakedepends="asciidoc perl tk xmlto" @@ -23,6 +23,11 @@ make_check_target=test subpackages="git-cvs git-svn gitk git-gui git-all" +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" ac_cv_fread_reads_directories=yes" ;; + *) configure_args+=" ac_cv_fread_reads_directories=no" ;; +esac + post_build() { make ${makejobs} -C Documentation man make ${makejobs} -C contrib/subtree all git-subtree.1