| 1 |
bicatali 13/06/04 19:10:24 |
| 2 |
|
| 3 |
Modified: cernlib-montecarlo-2006-r3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Respect user toolchain (bug #468192) |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild?rev=1.5&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: cernlib-montecarlo-2006-r3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- cernlib-montecarlo-2006-r3.ebuild 17 Jan 2013 18:53:15 -0000 1.4 |
| 23 |
+++ cernlib-montecarlo-2006-r3.ebuild 4 Jun 2013 19:10:24 -0000 1.5 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
-EAPI=4 |
| 31 |
+EAPI=5 |
| 32 |
|
| 33 |
inherit eutils toolchain-funcs |
| 34 |
|
| 35 |
@@ -48,6 +48,26 @@ |
| 36 |
use herwig || epatch "${FILESDIR}"/${P}-noherwig.patch |
| 37 |
# since we depend on cfortran, do not use the one from cernlib |
| 38 |
rm src/include/cfortran/cfortran.h || die |
| 39 |
+ # respect users flags |
| 40 |
+ sed -i \ |
| 41 |
+ -e 's/-O3/-O2/g' \ |
| 42 |
+ -e "s/-O2/${CFLAGS}/g" \ |
| 43 |
+ -e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \ |
| 44 |
+ -e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \ |
| 45 |
+ -e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \ |
| 46 |
+ src/config/linux.cf \ |
| 47 |
+ || die "sed linux.cf failed" |
| 48 |
+ sed -i \ |
| 49 |
+ -e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \ |
| 50 |
+ -e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \ |
| 51 |
+ src/config/Imake.tmpl \ |
| 52 |
+ || die "sed Imake.tmpl failed" |
| 53 |
+ |
| 54 |
+ sed -i \ |
| 55 |
+ -e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \ |
| 56 |
+ -e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \ |
| 57 |
+ src/config/{biglib,fortran,Imake}.rules \ |
| 58 |
+ || die "sed for ldflags propagation failed" |
| 59 |
} |
| 60 |
|
| 61 |
src_compile() { |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.20 sci-physics/cernlib-montecarlo/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog?rev=1.20&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog?rev=1.20&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog?r1=1.19&r2=1.20 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v |
| 74 |
retrieving revision 1.19 |
| 75 |
retrieving revision 1.20 |
| 76 |
diff -u -r1.19 -r1.20 |
| 77 |
--- ChangeLog 17 Jan 2013 18:53:15 -0000 1.19 |
| 78 |
+++ ChangeLog 4 Jun 2013 19:10:24 -0000 1.20 |
| 79 |
@@ -1,6 +1,10 @@ |
| 80 |
# ChangeLog for sci-physics/cernlib-montecarlo |
| 81 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.19 2013/01/17 18:53:15 bicatali Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.20 2013/06/04 19:10:24 bicatali Exp $ |
| 84 |
+ |
| 85 |
+ 04 Jun 2013; Sébastien Fabbro <bicatali@g.o> |
| 86 |
+ cernlib-montecarlo-2006-r3.ebuild: |
| 87 |
+ Respect user toolchain (bug #468192) |
| 88 |
|
| 89 |
17 Jan 2013; Sébastien Fabbro <bicatali@g.o> |
| 90 |
cernlib-montecarlo-2006-r3.ebuild, metadata.xml: |
Archives