* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: git-1.7.9.7.ebuild git-1.7.8.6.ebuild ChangeLog
@ 2012-07-27 17:14 Fabian Groffen (grobian)
0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2012-07-27 17:14 UTC (permalink / raw
To: gentoo-commits
grobian 12/07/27 17:14:39
Modified: git-1.7.9.7.ebuild git-1.7.8.6.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.5 dev-vcs/git/git-1.7.9.7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild?r1=1.4&r2=1.5
Index: git-1.7.9.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-1.7.9.7.ebuild 14 Jun 2012 05:01:30 -0000 1.4
+++ git-1.7.9.7.ebuild 27 Jul 2012 17:14:39 -0000 1.5
@@ -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 @@
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 @@
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 @@
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" \
"$@"
1.11 dev-vcs/git/git-1.7.8.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild?r1=1.10&r2=1.11
Index: git-1.7.8.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- git-1.7.8.6.ebuild 14 Jul 2012 11:23:01 -0000 1.10
+++ git-1.7.8.6.ebuild 27 Jul 2012 17:14:39 -0000 1.11
@@ -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 @@
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 @@
# 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 @@
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" \
"$@"
1.146 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.145&r2=1.146
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ChangeLog 14 Jul 2012 11:23:01 -0000 1.145
+++ ChangeLog 27 Jul 2012 17:14:39 -0000 1.146
@@ -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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-27 17:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-27 17:14 [gentoo-commits] gentoo-x86 commit in dev-vcs/git: git-1.7.9.7.ebuild git-1.7.8.6.ebuild ChangeLog Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox