| 1 |
robbat2 08/11/24 01:24:00 |
| 2 |
|
| 3 |
Modified: git-1.6.0.4-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Bug #240280, fix to use CFLAGS/LDFLAGS better. |
| 6 |
(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 dev-util/git/git-1.6.0.4-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: git-1.6.0.4-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -p -w -b -B -u -u -r1.4 -r1.5 |
| 21 |
--- git-1.6.0.4-r1.ebuild 24 Nov 2008 01:20:46 -0000 1.4 |
| 22 |
+++ git-1.6.0.4-r1.ebuild 24 Nov 2008 01:24:00 -0000 1.5 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild,v 1.5 2008/11/24 01:24:00 robbat2 Exp $ |
| 28 |
|
| 29 |
inherit toolchain-funcs eutils elisp-common perl-module bash-completion |
| 30 |
|
| 31 |
@@ -101,8 +101,8 @@ src_unpack() { |
| 32 |
epatch "${FILESDIR}"/20081123-git-1.6.0.4-noperl-cvsserver.patch |
| 33 |
|
| 34 |
sed -i \ |
| 35 |
- -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ |
| 36 |
- -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ |
| 37 |
+ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 38 |
+ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ |
| 39 |
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \ |
| 40 |
-e "s:^\(AR = \).*$:\1$(tc-getAR):" \ |
| 41 |
Makefile || die "sed failed" |
| 42 |
@@ -113,6 +113,8 @@ src_unpack() { |
| 43 |
src_compile() { |
| 44 |
emake ${MY_MAKEOPTS} \ |
| 45 |
DESTDIR="${D}" \ |
| 46 |
+ OPTCFLAGS="${CFLAGS}" \ |
| 47 |
+ OPTLDFLAGS="${LDFLAGS}" \ |
| 48 |
prefix=/usr \ |
| 49 |
htmldir=/usr/share/doc/${PF}/html \ |
| 50 |
|| die "make failed" |
| 51 |
@@ -123,6 +125,8 @@ src_compile() { |
| 52 |
if use perl && use cgi ; then |
| 53 |
emake ${MY_MAKEOPTS} \ |
| 54 |
DESTDIR="${D}" \ |
| 55 |
+ OPTCFLAGS="${CFLAGS}" \ |
| 56 |
+ OPTLDFLAGS="${LDFLAGS}" \ |
| 57 |
prefix=/usr \ |
| 58 |
htmldir=/usr/share/doc/${PF}/html \ |
| 59 |
gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" |
| 60 |
@@ -132,6 +136,8 @@ src_compile() { |
| 61 |
src_install() { |
| 62 |
emake ${MY_MAKEOPTS} \ |
| 63 |
DESTDIR="${D}" \ |
| 64 |
+ OPTCFLAGS="${CFLAGS}" \ |
| 65 |
+ OPTLDFLAGS="${LDFLAGS}" \ |
| 66 |
prefix=/usr \ |
| 67 |
htmldir=/usr/share/doc/${PF}/html \ |
| 68 |
install || \ |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.304 dev-util/git/ChangeLog |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.304&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.304&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?r1=1.303&r2=1.304 |
| 77 |
|
| 78 |
Index: ChangeLog |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v |
| 81 |
retrieving revision 1.303 |
| 82 |
retrieving revision 1.304 |
| 83 |
diff -p -w -b -B -u -u -r1.303 -r1.304 |
| 84 |
--- ChangeLog 24 Nov 2008 01:20:46 -0000 1.303 |
| 85 |
+++ ChangeLog 24 Nov 2008 01:24:00 -0000 1.304 |
| 86 |
@@ -1,6 +1,9 @@ |
| 87 |
# ChangeLog for dev-util/git |
| 88 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.303 2008/11/24 01:20:46 robbat2 Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.304 2008/11/24 01:24:00 robbat2 Exp $ |
| 91 |
+ |
| 92 |
+ 24 Nov 2008; Robin H. Johnson <robbat2@g.o> git-1.6.0.4-r1.ebuild: |
| 93 |
+ Bug #240280, fix to use CFLAGS/LDFLAGS better. |
| 94 |
|
| 95 |
24 Nov 2008; Robin H. Johnson <robbat2@g.o> git-1.5.4.5.ebuild, |
| 96 |
git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild, |
Archives