From: "Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sci-physics/cernlib-montecarlo: cernlib-montecarlo-2006-r3.ebuild ChangeLog
Date: Tue, 4 Jun 2013 19:10:24 +0000 (UTC) [thread overview]
Message-ID: <20130604191024.D14DA2171D@flycatcher.gentoo.org> (raw)
bicatali 13/06/04 19:10:24
Modified: cernlib-montecarlo-2006-r3.ebuild ChangeLog
Log:
Respect user toolchain (bug #468192)
(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.5 sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild?r1=1.4&r2=1.5
Index: cernlib-montecarlo-2006-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cernlib-montecarlo-2006-r3.ebuild 17 Jan 2013 18:53:15 -0000 1.4
+++ cernlib-montecarlo-2006-r3.ebuild 4 Jun 2013 19:10:24 -0000 1.5
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.4 2013/01/17 18:53:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.5 2013/06/04 19:10:24 bicatali Exp $
-EAPI=4
+EAPI=5
inherit eutils toolchain-funcs
@@ -48,6 +48,26 @@
use herwig || epatch "${FILESDIR}"/${P}-noherwig.patch
# since we depend on cfortran, do not use the one from cernlib
rm src/include/cfortran/cfortran.h || die
+ # respect users flags
+ sed -i \
+ -e 's/-O3/-O2/g' \
+ -e "s/-O2/${CFLAGS}/g" \
+ -e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
+ -e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
+ -e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
+ src/config/linux.cf \
+ || die "sed linux.cf failed"
+ sed -i \
+ -e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \
+ -e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \
+ src/config/Imake.tmpl \
+ || die "sed Imake.tmpl failed"
+
+ sed -i \
+ -e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
+ -e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
+ src/config/{biglib,fortran,Imake}.rules \
+ || die "sed for ldflags propagation failed"
}
src_compile() {
1.20 sci-physics/cernlib-montecarlo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 17 Jan 2013 18:53:15 -0000 1.19
+++ ChangeLog 4 Jun 2013 19:10:24 -0000 1.20
@@ -1,6 +1,10 @@
# ChangeLog for sci-physics/cernlib-montecarlo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.19 2013/01/17 18:53:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.20 2013/06/04 19:10:24 bicatali Exp $
+
+ 04 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ cernlib-montecarlo-2006-r3.ebuild:
+ Respect user toolchain (bug #468192)
17 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
cernlib-montecarlo-2006-r3.ebuild, metadata.xml:
next reply other threads:[~2013-06-04 19:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 19:10 Sebastien Fabbro (bicatali) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-28 10:29 [gentoo-commits] gentoo-x86 commit in sci-physics/cernlib-montecarlo: cernlib-montecarlo-2006-r3.ebuild ChangeLog Agostino Sarubbo (ago)
2015-06-09 7:20 Agostino Sarubbo (ago)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130604191024.D14DA2171D@flycatcher.gentoo.org \
--to=bicatali@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox