| 1 |
bicatali 07/12/19 19:30:48 |
| 2 |
|
| 3 |
Modified: ChangeLog acml-3.6.0-r1.ebuild acml-3.6.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix also older versions for g2c/gfortran libs |
| 6 |
(Portage version: 2.1.4_rc9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.29 sci-libs/acml/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/ChangeLog?rev=1.29&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/ChangeLog?rev=1.29&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/ChangeLog?r1=1.28&r2=1.29 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v |
| 18 |
retrieving revision 1.28 |
| 19 |
retrieving revision 1.29 |
| 20 |
diff -u -r1.28 -r1.29 |
| 21 |
--- ChangeLog 19 Dec 2007 13:03:51 -0000 1.28 |
| 22 |
+++ ChangeLog 19 Dec 2007 19:30:47 -0000 1.29 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sci-libs/acml |
| 25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.28 2007/12/19 13:03:51 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.29 2007/12/19 19:30:47 bicatali Exp $ |
| 28 |
+ |
| 29 |
+ 19 Dec 2007; Sébastien Fabbro <bicatali@g.o> acml-3.6.0-r1.ebuild, |
| 30 |
+ acml-3.6.1-r1.ebuild: |
| 31 |
+ Fix also older versions for g2c/gfortran libs |
| 32 |
|
| 33 |
19 Dec 2007; Sébastien Fabbro <bicatali@g.o> acml-4.0.1.ebuild: |
| 34 |
Fixed directory for acml and forced dynamic linking with gfortran when |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.6 sci-libs/acml/acml-3.6.0-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild?rev=1.6&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild?rev=1.6&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild?r1=1.5&r2=1.6 |
| 43 |
|
| 44 |
Index: acml-3.6.0-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v |
| 47 |
retrieving revision 1.5 |
| 48 |
retrieving revision 1.6 |
| 49 |
diff -u -r1.5 -r1.6 |
| 50 |
--- acml-3.6.0-r1.ebuild 21 Nov 2007 00:25:36 -0000 1.5 |
| 51 |
+++ acml-3.6.0-r1.ebuild 19 Dec 2007 19:30:47 -0000 1.6 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2007 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.5 2007/11/21 00:25:36 bicatali Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $ |
| 57 |
|
| 58 |
inherit eutils toolchain-funcs fortran |
| 59 |
|
| 60 |
@@ -98,9 +98,10 @@ |
| 61 |
local libname=${acmldir}/lib/libacml |
| 62 |
local extlibs |
| 63 |
local extflags |
| 64 |
+ [[ ${fort} =~ g77 ]] && extlibs="${extlibs} -lg2c" |
| 65 |
if [[ ${fort} =~ _mp ]]; then |
| 66 |
ESELECT_PROF=${ESELECT_PROF}-openmp |
| 67 |
- extlibs=-lpthread |
| 68 |
+ extlibs="${extlibs} -lpthread" |
| 69 |
libname=${libname}_mp |
| 70 |
extflags="${extflags} -openmp" |
| 71 |
fi |
| 72 |
@@ -108,7 +109,7 @@ |
| 73 |
# pkgconfig files |
| 74 |
sed -e "s:@LIBDIR@:$(get_libdir):" \ |
| 75 |
-e "s:@PV@:${PV}:" \ |
| 76 |
- -e "s:@ACMLDIR@:${acmldir}:g" \ |
| 77 |
+ -e "s:@ACMLDIR@:${acmldir}/lib:g" \ |
| 78 |
-e "s:@EXTLIBS@:${extlibs}:g" \ |
| 79 |
-e "s:@EXTFLAGS@:${extflags}:g" \ |
| 80 |
"${FILESDIR}"/${l}.pc.in > ${l}.pc \ |
| 81 |
@@ -117,12 +118,12 @@ |
| 82 |
doins ${l}.pc || die "doins ${l}.pc failed" |
| 83 |
|
| 84 |
# eselect files |
| 85 |
- cat > eselect.${l} << EOF |
| 86 |
-${libname}.so /usr/@LIBDIR@/lib${l}.so.0 |
| 87 |
-${libname}.so /usr/@LIBDIR@/lib${l}.so |
| 88 |
-${libname}.a /usr/@LIBDIR@/lib${l}.a |
| 89 |
-${acmldir}/lib/${l}.pc /usr/@LIBDIR@/pkgconfig/${l}.pc |
| 90 |
-EOF |
| 91 |
+ cat > eselect.${l} <<-EOF |
| 92 |
+ ${libname}.so /usr/@LIBDIR@/lib${l}.so.0 |
| 93 |
+ ${libname}.so /usr/@LIBDIR@/lib${l}.so |
| 94 |
+ ${libname}.a /usr/@LIBDIR@/lib${l}.a |
| 95 |
+ ${acmldir}/lib/${l}.pc /usr/@LIBDIR@/pkgconfig/${l}.pc |
| 96 |
+ EOF |
| 97 |
eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF} |
| 98 |
done |
| 99 |
echo "LDPATH=${instdir}/${fort}/lib" > 35acml |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
1.6 sci-libs/acml/acml-3.6.1-r1.ebuild |
| 104 |
|
| 105 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild?rev=1.6&view=markup |
| 106 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild?rev=1.6&content-type=text/plain |
| 107 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild?r1=1.5&r2=1.6 |
| 108 |
|
| 109 |
Index: acml-3.6.1-r1.ebuild |
| 110 |
=================================================================== |
| 111 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v |
| 112 |
retrieving revision 1.5 |
| 113 |
retrieving revision 1.6 |
| 114 |
diff -u -r1.5 -r1.6 |
| 115 |
--- acml-3.6.1-r1.ebuild 21 Nov 2007 00:25:36 -0000 1.5 |
| 116 |
+++ acml-3.6.1-r1.ebuild 19 Dec 2007 19:30:47 -0000 1.6 |
| 117 |
@@ -1,6 +1,6 @@ |
| 118 |
# Copyright 1999-2007 Gentoo Foundation |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.5 2007/11/21 00:25:36 bicatali Exp $ |
| 121 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $ |
| 122 |
|
| 123 |
inherit eutils toolchain-funcs fortran |
| 124 |
|
| 125 |
@@ -62,7 +62,7 @@ |
| 126 |
(DISTDIR="${S}" unpack contents-acml-*.tgz) |
| 127 |
case ${FORTRANC} in |
| 128 |
gfortran) FORT=gfortran ;; |
| 129 |
- ifc|ifort) FORT=ifort ;; |
| 130 |
+ if*) FORT=ifort ;; |
| 131 |
*) eerror "Unsupported fortran compiler: ${FORTRANC}" |
| 132 |
die ;; |
| 133 |
esac |
| 134 |
@@ -114,9 +114,10 @@ |
| 135 |
ESELECT_PROF=${ESELECT_PROF}-int64 |
| 136 |
extflags="${extflags} -fdefault-integer-8" |
| 137 |
fi |
| 138 |
+ [[ ${fort} =~ gfortran ]] && extlibs="${extlibs} -lgfortran" |
| 139 |
if [[ ${fort} =~ _mp ]]; then |
| 140 |
ESELECT_PROF=${ESELECT_PROF}-openmp |
| 141 |
- extlibs=-lpthread |
| 142 |
+ extlibs="${extlibs} -lpthread" |
| 143 |
libname=${libname}_mp |
| 144 |
extflags="${extflags} -fopenmp" |
| 145 |
fi |
| 146 |
@@ -124,7 +125,7 @@ |
| 147 |
# pkgconfig files |
| 148 |
sed -e "s:@LIBDIR@:$(get_libdir):" \ |
| 149 |
-e "s:@PV@:${PV}:" \ |
| 150 |
- -e "s:@ACMLDIR@:${acmldir}:g" \ |
| 151 |
+ -e "s:@ACMLDIR@:${acmldir}/lib:g" \ |
| 152 |
-e "s:@EXTLIBS@:${extlibs}:g" \ |
| 153 |
-e "s:@EXTFLAGS@:${extflags}:g" \ |
| 154 |
"${FILESDIR}"/${l}.pc.in > ${l}.pc \ |
| 155 |
@@ -133,12 +134,12 @@ |
| 156 |
doins ${l}.pc |
| 157 |
|
| 158 |
# eselect files |
| 159 |
- cat > eselect.${l} << EOF |
| 160 |
-${libname}.so /usr/@LIBDIR@/lib${l}.so.0 |
| 161 |
-${libname}.so /usr/@LIBDIR@/lib${l}.so |
| 162 |
-${libname}.a /usr/@LIBDIR@/lib${l}.a |
| 163 |
-${acmldir}/lib/${l}.pc /usr/@LIBDIR@/pkgconfig/${l}.pc |
| 164 |
-EOF |
| 165 |
+ cat > eselect.${l} <<-EOF |
| 166 |
+ ${libname}.so /usr/@LIBDIR@/lib${l}.so.0 |
| 167 |
+ ${libname}.so /usr/@LIBDIR@/lib${l}.so |
| 168 |
+ ${libname}.a /usr/@LIBDIR@/lib${l}.a |
| 169 |
+ ${acmldir}/lib/${l}.pc /usr/@LIBDIR@/pkgconfig/${l}.pc |
| 170 |
+ EOF |
| 171 |
eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF} |
| 172 |
done |
| 173 |
echo "LDPATH=${acmldir}/lib" > "${S}"/35acml |
| 174 |
|
| 175 |
|
| 176 |
|
| 177 |
-- |
| 178 |
gentoo-commits@g.o mailing list |
Archives