From 462bf164197df7c05a12ef490e10c4cd76be1cac Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 21 Feb 2013 21:11:32 +0100 Subject: [PATCH] git: update to 1.8.1.3; cross build support. --- srcpkgs/git/template | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index a040b6343f..185655d2d3 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,13 +1,16 @@ # Template build file for "git". pkgname=git -version=1.8.1.1 +version=1.8.1.3 revision=1 +build_style=gnu-configure +configure_args="--with-curl --with-expat --without-tcltk" +make_install_args="NO_INSTALL_HARDLINKS=1" short_desc="GIT Tree History Storage Tool" maintainer="Juan RP " homepage="http://git-scm.com/" license="GPL-2" distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" -checksum=8b5bd081dc38f3e14acc86f234231a9a46d1e9a990c8c732aed6856d2714dff6 +checksum=3753247dbfd802aaf1cb2c917b8e873b6ed13c009ab0fa5f7d90b3c759195ff1 subpackages="git-docs git-perl git-python" # Required by https:// @@ -15,18 +18,25 @@ depends="ca-certificates" makedepends="xmlto>=0.0.25_2 asciidoc perl openssl-devel libcurl-devel expat-devel python-devel" -do_configure() { - ./configure ${CONFIGURE_SHARED_ARGS} --with-curl \ - --with-expat --without-tcltk +if [ -n "$XBPS_CROSS_TRIPLET" ]; then + subpackages="git-perl" + configure_args="${configure_args} --without-python + ac_cv_fread_reads_directories=no + ac_cv_snprintf_returns_bogus=no" + makedepends="perl" + crossmakedepends="openssl-devel libcurl-devel expat-devel" +fi + +post_build() { + if [ -z "$XBPS_CROSS_TRIPLET" ]; then + make ${makejobs} -C Documentation man + fi } -do_build() { - make ${makejobs} && make ${makejobs} -C Documentation man -} - -do_install() { - make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} \ - install install-doc +post_install() { + if [ -z "$XBPS_CROSS_TRIPLET" ]; then + make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc + fi vinstall contrib/completion/git-completion.bash 644 \ usr/share/bash-completion/completions git }