diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-11-24 01:24:00 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-11-24 01:24:00 +0000 |
| commit | 513f365b165dce388dfb8b40b567fc357a67e0ab (patch) | |
| tree | d998d7d9396a80d9b2579181747c733aad54be31 /dev-util/git | |
| parent | Even better fixup for bug #238129. (diff) | |
| download | historical-513f365b165dce388dfb8b40b567fc357a67e0ab.tar.gz historical-513f365b165dce388dfb8b40b567fc357a67e0ab.tar.bz2 historical-513f365b165dce388dfb8b40b567fc357a67e0ab.zip | |
Bug #240280, fix to use CFLAGS/LDFLAGS better.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64
Diffstat (limited to 'dev-util/git')
| -rw-r--r-- | dev-util/git/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/git/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/git/git-1.6.0.4-r1.ebuild | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 6b6d2f11d0c4..cb081103564c 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/git # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.303 2008/11/24 01:20:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.304 2008/11/24 01:24:00 robbat2 Exp $ + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild: + Bug #240280, fix to use CFLAGS/LDFLAGS better. 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild, git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild, diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 80c8117a7a67..11e6a17c319f 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -77,8 +77,8 @@ EBUILD git-1.5.6.5.ebuild 7958 RMD160 b631e788c0a0abb032fe036e96b2271a4f75282e S EBUILD git-1.6.0.1.ebuild 8416 RMD160 f66272869bf69e0a324e3bb340bb93fdfd57cb34 SHA1 27e7ba25a1161fbf0eca5c6181f798a793a99997 SHA256 8c8f4d6e22d28edcb28a633bee301b10d879995a53aefdaf05327e4a0a208ad4 EBUILD git-1.6.0.2.ebuild 8416 RMD160 df5f708da54bfd6a030c5b2dc759e1a30059aaa8 SHA1 ddb81cee72eb8628ad5f85af9354d0e943e57e18 SHA256 8c0d04907936430e533cf020923009b45ef64b7123c71e69100146f47651b40f EBUILD git-1.6.0.3.ebuild 8416 RMD160 f2c4ed1b4e0806e468a7f3dbf5ac27381ecdad9b SHA1 f63af1f522626f3fa25363baae3d72f6e5b1cde9 SHA256 bae9e11f08fecaf9ef2cc65b889c7ad15ce2496168b90366fdaa86c80613fe8f -EBUILD git-1.6.0.4-r1.ebuild 8780 RMD160 efa3edda7b578f2f9b32b9d195ba5f7b356e4865 SHA1 b644d75eab2e37664e94cffc6df1f3c32cb9bd58 SHA256 e9c2e44e5dec690acf6f0355aeea5734e984346216affb8a094cd9aacc1e46db +EBUILD git-1.6.0.4-r1.ebuild 8948 RMD160 8931b3756e1c0302d46bea731c15715b5549b0cf SHA1 4c41d4512cd01983a81b91e6da0aa872f9cdefa4 SHA256 fdb03c4d902d6169300595a231b965349844c03f0f5f5ff291daa1c0435a82bb EBUILD git-1.6.0.4.ebuild 8416 RMD160 d4d959465b22fa6747e187547d9e7c5c86dad177 SHA1 ca3eec4154653011f6b68d4d4cae5fa1c0ad31d6 SHA256 78bbe545b099da0c431f0b19da417c8c125f267005791721683961e9093c5b7b EBUILD git-1.6.0.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c -MISC ChangeLog 45831 RMD160 b73f9b7f83a696ba97168526e3df4783988ab651 SHA1 59d78a46691fd1be067a3aae57e2aa54f13ae585 SHA256 72013d3af9b816a407f8152539e071d00cdd21c6654d518847b59db4e1fc8d69 +MISC ChangeLog 45957 RMD160 a5a291a31b2781382d93fae1865969ec823f4d9a SHA1 ec4d4c822dc45544cb18c03affadea93ed6004ee SHA256 0ce421eeb8c1234765ddf48118b7f99472e2d8df841bc017ddbe71e9bb1ef6d7 MISC metadata.xml 1480 RMD160 06494b78bc4f5da7c5b377e48e8a38e6a61e71b6 SHA1 382259eed96d57835f30304b751540bc8c4a807e SHA256 347f2853546bdfc23b5c17a5d3cd6449a6e533a39fd4647dae2a653d17694b5a diff --git a/dev-util/git/git-1.6.0.4-r1.ebuild b/dev-util/git/git-1.6.0.4-r1.ebuild index 0ce5d2cb01ff..4fb0c84ff1cd 100644 --- a/dev-util/git/git-1.6.0.4-r1.ebuild +++ b/dev-util/git/git-1.6.0.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ inherit toolchain-funcs eutils elisp-common perl-module bash-completion @@ -101,8 +101,8 @@ src_unpack() { epatch "${FILESDIR}"/20081123-git-1.6.0.4-noperl-cvsserver.patch sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ Makefile || die "sed failed" @@ -113,6 +113,8 @@ src_unpack() { src_compile() { emake ${MY_MAKEOPTS} \ DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ prefix=/usr \ htmldir=/usr/share/doc/${PF}/html \ || die "make failed" @@ -123,6 +125,8 @@ src_compile() { if use perl && use cgi ; then emake ${MY_MAKEOPTS} \ DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ prefix=/usr \ htmldir=/usr/share/doc/${PF}/html \ gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" @@ -132,6 +136,8 @@ src_compile() { src_install() { emake ${MY_MAKEOPTS} \ DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ prefix=/usr \ htmldir=/usr/share/doc/${PF}/html \ install || \ |