diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-07-27 17:14:39 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-07-27 17:14:39 +0000 |
| commit | 0a1b4eebf2a237bebc955ed135daf46edb573e46 (patch) | |
| tree | ec107f3b9e3787be1816cc3e6977c7714796dc9a /dev-vcs/git | |
| parent | Version bump. (diff) | |
| download | gentoo-2-0a1b4eebf2a237bebc955ed135daf46edb573e46.tar.gz gentoo-2-0a1b4eebf2a237bebc955ed135daf46edb573e46.tar.bz2 gentoo-2-0a1b4eebf2a237bebc955ed135daf46edb573e46.zip | |
Fix compilation on Solaris (libiconv), set perl path correctly for Prefix, drop applied/commented out interix patches
(Portage version: 2.2.01.20757-prefix/cvs/SunOS i386)
Diffstat (limited to 'dev-vcs/git')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.8.6.ebuild | 16 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.9.7.ebuild | 16 |
3 files changed, 16 insertions, 23 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index b75613d616f4..6e8568cf919e 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.145 2012/07/14 11:23:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.146 2012/07/27 17:14:39 grobian Exp $ + + 27 Jul 2012; Fabian Groffen <grobian@gentoo.org> git-1.7.8.6.ebuild, + git-1.7.9.7.ebuild: + Fix compilation on Solaris (libiconv), set perl path correctly for Prefix, + drop applied/commented out interix patches 14 Jul 2012; Markus Meier <maekke@gentoo.org> git-1.7.8.6.ebuild: arm stable, bug #418381 diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild index e59048da5a1e..9367d3234952 100644 --- a/dev-vcs/git/git-1.7.8.6.ebuild +++ b/dev-vcs/git/git-1.7.8.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.10 2012/07/14 11:23:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.11 2012/07/27 17:14:39 grobian Exp $ EAPI=4 @@ -164,6 +164,9 @@ exportmakeopts() { if [[ ${CHOST} == ia64-*-hpux* ]]; then myopts="${myopts} NO_NSEC=YesPlease" fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts="${myopts} NEEDS_LIBICONV=YesPlease" + fi if [[ ${CHOST} == *-*-aix* ]]; then myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" fi @@ -238,16 +241,6 @@ src_prepare() { # Fix docbook2texi command sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.6-interix.patch } git_emake() { @@ -265,6 +258,7 @@ git_emake() { htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ sysconfdir="${EPREFIX}"/etc \ PYTHON_PATH="${PYTHON_PATH}" \ + PERL_PATH="${EPREFIX}/usr/bin/perl" \ PERL_MM_OPT="" \ GIT_TEST_OPTS="--no-color" \ "$@" diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild index 69d88b96e76b..4125cc4d4cf1 100644 --- a/dev-vcs/git/git-1.7.9.7.ebuild +++ b/dev-vcs/git/git-1.7.9.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.4 2012/06/14 05:01:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.5 2012/07/27 17:14:39 grobian Exp $ EAPI=4 @@ -174,6 +174,9 @@ exportmakeopts() { if [[ ${CHOST} == ia64-*-hpux* ]]; then myopts="${myopts} NO_NSEC=YesPlease" fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts="${myopts} NEEDS_LIBICONV=YesPlease" + fi if [[ ${CHOST} == *-*-aix* ]]; then myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" fi @@ -249,16 +252,6 @@ src_prepare() { sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ Documentation/Makefile || die "sed failed" - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.6-interix.patch - # Newer versions of SVN hate a whitespace in the file URL. # So we avoid that by replaced the space with an underscore. #Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/ @@ -295,6 +288,7 @@ git_emake() { htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ sysconfdir="${EPREFIX}"/etc \ PYTHON_PATH="${PYTHON_PATH}" \ + PERL_PATH="${EPREFIX}/usr/bin/perl" \ PERL_MM_OPT="" \ GIT_TEST_OPTS="--no-color" \ "$@" |