summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2008-04-08 21:07:57 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2008-04-08 21:07:57 +0000
commit401085e7c0e184c7dd7a0bc0a9ce889e1c8c4fe7 (patch)
tree450291649dd6278bdf98d638aa0540001c23d00d /sci-biology/ncbi-tools
parentadd a patch to build with new ffmpeg headers layout (diff)
downloadgentoo-2-401085e7c0e184c7dd7a0bc0a9ce889e1c8c4fe7.tar.gz
gentoo-2-401085e7c0e184c7dd7a0bc0a9ce889e1c8c4fe7.tar.bz2
gentoo-2-401085e7c0e184c7dd7a0bc0a9ce889e1c8c4fe7.zip
Respect CFLAGS and compiler on 64-bit systems. Apparently I'm the only person on amd64 who actually watches it build. =)
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'sci-biology/ncbi-tools')
-rw-r--r--sci-biology/ncbi-tools/ChangeLog9
-rw-r--r--sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild11
2 files changed, 16 insertions, 4 deletions
diff --git a/sci-biology/ncbi-tools/ChangeLog b/sci-biology/ncbi-tools/ChangeLog
index ba0d5de0e361..d723c69c6ca2 100644
--- a/sci-biology/ncbi-tools/ChangeLog
+++ b/sci-biology/ncbi-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-biology/ncbi-tools
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.57 2007/12/31 15:42:24 je_fro Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.58 2008/04/08 21:07:57 dberkholz Exp $
+
+ 08 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+ ncbi-tools-20070826.ebuild:
+ Respect CFLAGS and compiler on 64-bit systems. Apparently I'm the only
+ person on amd64 who actually watches it build. =)
31 Dec 2007; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
fixing my email address
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild
index dc8601189005..cd1a0d084adc 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild,v 1.3 2007/10/19 22:22:41 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20070826.ebuild,v 1.4 2008/04/08 21:07:57 dberkholz Exp $
inherit flag-o-matic toolchain-funcs eutils autotools
@@ -92,6 +92,11 @@ src_unpack() {
-e "s/NCBI_LDFLAGS1 = -O2/NCBI_LDFLAGS1 = ${CFLAGS}/" \
-e "s/NCBI_OPTFLAG = -O2/NCBI_OPTFLAG = ${CFLAGS}/" \
-i ppclinux.ncbi.mk || die
+ # ... on generic 64-bit Linux...
+ sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
+ -e "s/NCBI_LDFLAGS1 = -O3/NCBI_LDFLAGS1 = ${CFLAGS}/" \
+ -e "s/NCBI_OPTFLAG = -O3/NCBI_OPTFLAG = ${CFLAGS}/" \
+ -i linux64.ncbi.mk || die
# ... on generic Linux.
sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
-e "s/NCBI_LDFLAGS1 = -O3/NCBI_LDFLAGS1 = ${CFLAGS}/" \
@@ -110,6 +115,8 @@ src_unpack() {
sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" hppalinux.ncbi.mk || die
# ... on ppc...
sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" ppclinux.ncbi.mk || die
+ # ... on generic 64-bit Linux...
+ sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux64.ncbi.mk || die
# ... on generic Linux.
sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux.ncbi.mk || die