From 1d45e48d337ce66232c64bab7dd352e00734d3df Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 8 Jan 2014 14:02:42 +0100 Subject: [PATCH] chroot-git: update to 1.8.5.2; cross musl support. --- srcpkgs/chroot-git/template | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 7a50fa9d37..6b77b0674f 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,15 +1,17 @@ # Template build file for "chroot-git". pkgname=chroot-git -version=1.8.2 +version=1.8.5.2 revision=1 -wrksrc="git-$version" bootstrap=yes +wrksrc="git-$version" conflicts="git>=0" -provides="git-${version}" +provides="git-${version}_${revision}" build_style=gnu-configure -configure_args="--without-curl --without-openssl --without-python - --without-expat --without-tcltk --with-zlib=${XBPS_MASTERDIR}/usr - ac_cv_lib_curl_curl_global_init=no ac_cv_lib_expat_XML_ParserCreate=no" +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 + ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" +makedepends="zlib-devel" make_build_args="CC_LD_DYNPATH=-L" make_install_args="NO_INSTALL_HARDLINKS=1" short_desc="GIT Tree History Storage Tool -- for xbps-src use" @@ -17,15 +19,12 @@ maintainer="Juan RP " homepage="http://git-scm.com/" license="GPL-2" distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" -checksum=c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 +checksum=024694524b8be91fe29afca65bc3a9e40de1322dd5ef2b2c0babb6849c913e8a if [ "$CHROOT_READY" ]; then hostmakedepends="perl" -fi - -if [ "$CROSS_BUILD" ]; then - makedepends="zlib-devel" - configure_args+=" ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" +else + configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr" fi post_install() {