* [gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/
@ 2011-02-23 5:39 Sebastien Fabbro
0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2011-02-23 5:39 UTC (permalink / raw
To: gentoo-commits
commit: 8ff1efe350e3b77fbc330ec937b1a3d017227c88
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 05:27:47 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 05:27:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=8ff1efe3
Switched to alternatives-2 framework
---
sci-libs/acml/ChangeLog | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 46384be..35945e7 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-libs/acml
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.40 2009/07/07 23:27:59 flameeyes Exp $
+ 23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> acml-4.4.0.ebuild:
+ Switched to alternatives-2 framework
+
14 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> acml-4.4.0.ebuild:
Added automated linking to a default fortran profile, gfortran if chosen
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/
@ 2011-03-31 18:11 Sebastien Fabbro
0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2011-03-31 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 31670d27197789c8fe9ec8327a92ef8a3e42df74
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 18:05:44 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 18:05:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=31670d27
switch to eapi4 + cleaning
---
sci-libs/acml/Manifest | 2 +-
sci-libs/acml/acml-4.4.0.ebuild | 29 ++++++++++++++---------------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 49ce50d..a09e233 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a615cf2b3294294162ccb89e9ad
DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580
DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256 f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0
DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d280715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07dc0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf
-EBUILD acml-4.4.0.ebuild 3518 RMD160 d8fd9e54163b7cd017d3d5f57eed8eb058135b46 SHA1 7fa4bf6cd5262f72ecde49f18198ee3440529ae8 SHA256 73ec1e91299543c17b12411f9b5467fafc593f1e9bf0c094bb94a5581fb98928
+EBUILD acml-4.4.0.ebuild 3384 RMD160 04293bd6cafda5b0d45bcfcd18c7c572c03f9008 SHA1 cc72743e39266d806adabe0a45868551b997b634 SHA256 aedfaf68159f0a9f4f0a52d0be3649d36ffbcd88f7027c2252712d3369b117b1
MISC ChangeLog 8360 RMD160 9ba66449beb8a1e69a85350af6aa19f0b6a75282 SHA1 3f9a99bd9338d885b78be8d6fa7dc571c45705f0 SHA256 0c5e6390e9db8d9564078133f3b4d49300782dff4f1c474f420a61213dc78b9d
MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e SHA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f836c29c818176cf23d239dc1e5aa29e4702cbbe85042
diff --git a/sci-libs/acml/acml-4.4.0.ebuild b/sci-libs/acml/acml-4.4.0.ebuild
index e48694d..3e9be5b 100644
--- a/sci-libs/acml/acml-4.4.0.ebuild
+++ b/sci-libs/acml/acml-4.4.0.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=4
inherit eutils multilib toolchain-funcs versionator alternatives-2
-ACML_INST_DIR="opt/${PN}${PV}"
+ACML_INST_DIR=opt/${PN}${PV}
QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
MYP=${PN}-$(replace_all_version_separators -)
@@ -48,13 +48,12 @@ src_unpack() {
}
src_test() {
+ local fdir d
for fdir in */examples; do
einfo "Testing acml in ${fdir}"
for d in . acml_mv; do
- pushd ${fdir} > /dev/null
- emake \
- ACMLDIR="${S}/${fdir%/examples}" \
- || die "emake test in ${fdir}/${d} failed"
+ pushd ${fdir}/${d} > /dev/null
+ emake ACMLDIR="${S}/${fdir%/examples}"
emake clean
popd > /dev/null
done
@@ -64,14 +63,14 @@ src_test() {
src_install() {
# install libraries, pkgconfig file and eselect files for each profile
# fdef will be the default (gfortran if available) to be in path
- local fdef
+ local fdef lib
for lib in */lib; do
local fdir=${lib%/*}
use examples || rm -rf ${fdir}/examples
use static-libs || rm -f ${fdir}/lib/*.a
insinto /${ACML_INST_DIR}
- doins -r ${fdir} || die "install ${fdir} failed"
- local acml_libs=
+ doins -r ${fdir}
+ local alib acml_libs
for alib in ${fdir}/lib/*.so; do
alib=$(basename ${alib} .so)
acml_libs="${acml_libs} -l${alib#lib}"
@@ -88,15 +87,15 @@ src_install() {
Libs: -L\${libdir} ${acml_libs}
Cflags: -I\${includedir}
EOF
- local libdir=$(get_libdir)
+ local libdir=$(get_libdir) x
[[ ${fdef} == gfortran${libdir#lib} ]] || fdef=${fdir}
use multilib && [[ ${fdir} == *32* ]] && libdir=lib32
insinto /usr/${libdir}/pkgconfig
doins ${PN}-${fdir}.pc
for x in blas lapack; do
alternatives_for ${x} ${PN}-${fdir} 0 \
- "/usr/${libdir}/pkgconfig/${x}.pc" "${PN}-${fdir}.pc" \
- "/${ACML_INST_DIR}/${libdir}" "${fdir}/lib"
+ /usr/${libdir}/pkgconfig/${x}.pc ${PN}-${fdir}.pc \
+ /${ACML_INST_DIR}/${libdir} ${fdir}/lib
done
done
echo -n > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
@@ -106,13 +105,13 @@ src_install() {
echo -n >> 35acml ":${EPREFIX}/${ACML_INST_DIR}/lib32"
fi
echo >> 35acml
- doenvd 35acml || die
+ doenvd 35acml
insinto /${ACML_INST_DIR}
doins ReleaseNotes*
# info files go to standard /usr/share/info to avoid more env variables
- doinfo Doc/*info* || die "info install failed"
+ doinfo Doc/*info*
rm Doc/*EULA* Doc/*info*
use doc || rm -rf Doc/*.pdf Doc/acml.html Doc/html
- doins -r Doc || die "install Doc failed"
+ doins -r Doc
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/
@ 2011-06-20 5:19 Sebastien Fabbro
0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2011-06-20 5:19 UTC (permalink / raw
To: gentoo-commits
commit: 951c145835efee4af090dde24a0c4e36282ab332
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 06:04:04 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 06:04:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=951c1458
More complete treatment of multilib. Rename profiles to be more consistent with other libraries. Some simplifications.
---
sci-libs/acml/ChangeLog | 7 ++
sci-libs/acml/Manifest | 4 +-
.../{acml-4.4.0.ebuild => acml-4.4.0-r1.ebuild} | 64 ++++++++++---------
3 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 35945e7..18ea73a 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.40 2009/07/07 23:27:59 flameeyes Exp $
+*acml-4.4.0-r1 (18 Jun 2011)
+
+ 18 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> -acml-4.4.0.ebuild,
+ +acml-4.4.0-r1.ebuild:
+ More complete treatment of multilib. Rename profiles to be more consistent
+ with other libraries. Some simplifications.
+
23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> acml-4.4.0.ebuild:
Switched to alternatives-2 framework
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index a09e233..c317b88 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a615cf2b3294294162ccb89e9ad
DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580
DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256 f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0
DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d280715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07dc0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf
-EBUILD acml-4.4.0.ebuild 3384 RMD160 04293bd6cafda5b0d45bcfcd18c7c572c03f9008 SHA1 cc72743e39266d806adabe0a45868551b997b634 SHA256 aedfaf68159f0a9f4f0a52d0be3649d36ffbcd88f7027c2252712d3369b117b1
-MISC ChangeLog 8360 RMD160 9ba66449beb8a1e69a85350af6aa19f0b6a75282 SHA1 3f9a99bd9338d885b78be8d6fa7dc571c45705f0 SHA256 0c5e6390e9db8d9564078133f3b4d49300782dff4f1c474f420a61213dc78b9d
+EBUILD acml-4.4.0-r1.ebuild 3631 RMD160 6869ffc9e4c06d3a04a21a71c2edf97d65249c76 SHA1 faf7da945643f1f672c88c2f8d4fcd90161eb49e SHA256 c40d93e96ff6ff8aa74fc21b4b718fcb5b39c449e62123f113780d22ae87372c
+MISC ChangeLog 8614 RMD160 709ed6a62bb652c14fd8fc96de3649bc24d9d973 SHA1 403bc7772bd5b7a469de7fff883f2b06271e2397 SHA256 a3e7541d8b8bc2fb743769272649792f32f7df016ca04c425f6ef21799c38184
MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e SHA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f836c29c818176cf23d239dc1e5aa29e4702cbbe85042
diff --git a/sci-libs/acml/acml-4.4.0.ebuild b/sci-libs/acml/acml-4.4.0-r1.ebuild
similarity index 63%
rename from sci-libs/acml/acml-4.4.0.ebuild
rename to sci-libs/acml/acml-4.4.0-r1.ebuild
index 3e9be5b..982e6c8 100644
--- a/sci-libs/acml/acml-4.4.0.ebuild
+++ b/sci-libs/acml/acml-4.4.0-r1.ebuild
@@ -25,26 +25,29 @@ for fcomp in gfortran ifort nag open64 pgi; do
int64? ( ${URI}/${MYP}-${fcomp}-64bit-int64.tgz ) )"
done
SRC_URI="
- x86? ( ${FCOMP32} !gfortran? ( !ifort? ( !nag? ( !pgi? ( ${URI}/${MYP}-gfortran-32bit.tgz ) ) ) ) )
+ x86? ( ${FCOMP32} !gfortran? ( !ifort? ( !nag? ( !pgi? (
+ ${URI}/${MYP}-gfortran-32bit.tgz ) ) ) ) )
amd64? ( ${FCOMP64} multilib? ( ${FCOMP32} )
- !gfortran? ( !ifort? ( !nag? ( !open64? ( !pgi? ( ${URI}/${MYP}-gfortran-64bit.tgz
- multilib? ( ${URI}/${MYP}-gfortran-32bit.tgz )
- int64? ( ${URI}/${MYP}-gfortran-64bit-int64.tgz ) ) ) ) ) ) )"
+ !gfortran? ( !ifort? ( !nag? ( !open64? ( !pgi? (
+ ${URI}/${MYP}-gfortran-64bit.tgz
+ multilib? ( ${URI}/${MYP}-gfortran-32bit.tgz )
+ int64? ( ${URI}/${MYP}-gfortran-64bit-int64.tgz ) ) ) ) ) ) )"
LICENSE="ACML"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc examples int64 multilib static-libs test gfortran ifort nag open64 pgi"
+IUSE="doc examples int64 multilib openmp static-libs test gfortran ifort nag open64 pgi"
RESTRICT="strip mirror"
-DEPEND=""
-RDEPEND=""
+DEPEND="test? ( virtual/fortran )"
+RDEPEND="virtual/fortran"
S="${WORKDIR}"
src_unpack() {
unpack ${A}
unpack ./contents-acml-*.tgz
+ use openmp || rm -rf *_mp
}
src_test() {
@@ -63,44 +66,46 @@ src_test() {
src_install() {
# install libraries, pkgconfig file and eselect files for each profile
# fdef will be the default (gfortran if available) to be in path
- local fdef lib
- for lib in */lib; do
- local fdir=${lib%/*}
+ local prof libs fdir libdir=$(get_libdir) x fdef
+ for fdir in */lib; do
+ fdir=$(dirname ${fdir})
+ prof=acml$(echo ${fdir} | sed \
+ -e 's:mp:openmp:' \
+ -e 's:_:-:g' \
+ -e 's:\([a-z]*\)\(32\|64\)\(-openmp\|\)\(-int64\|\):\2\4-\1\3:')
use examples || rm -rf ${fdir}/examples
use static-libs || rm -f ${fdir}/lib/*.a
- insinto /${ACML_INST_DIR}
- doins -r ${fdir}
- local alib acml_libs
- for alib in ${fdir}/lib/*.so; do
- alib=$(basename ${alib} .so)
- acml_libs="${acml_libs} -l${alib#lib}"
- done
- cat <<-EOF > ${PN}-${fdir}.pc
+ dodir /${ACML_INST_DIR}
+ cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR}
+ libs="$(find ${fdir} -name \*.so | \
+ sed -e "s:${fdir}/lib\(.*\).so:-l\1:")"
+ cat <<-EOF > ${prof}.pc
prefix=${EPREFIX}/${ACML_INST_DIR}/${fdir}
libdir=\${prefix}/lib
includedir=\${prefix}/include
-
- Name: ${PN}-${fdir}
+ Name: ${prof}
Description: ${DESCRIPTION}
Version: ${PV}
URL: ${HOMEPAGE}
- Libs: -L\${libdir} ${acml_libs}
+ Libs: -L\${libdir} ${libs}
Cflags: -I\${includedir}
EOF
- local libdir=$(get_libdir) x
- [[ ${fdef} == gfortran${libdir#lib} ]] || fdef=${fdir}
- use multilib && [[ ${fdir} == *32* ]] && libdir=lib32
+ has_multilib_profile && [[ ${fdir} == *32* ]] && libdir=lib32
insinto /usr/${libdir}/pkgconfig
- doins ${PN}-${fdir}.pc
+ doins ${prof}.pc
for x in blas lapack; do
- alternatives_for ${x} ${PN}-${fdir} 0 \
- /usr/${libdir}/pkgconfig/${x}.pc ${PN}-${fdir}.pc \
+ alternatives_for ${x} ${prof} 0 \
+ /usr/${libdir}/pkgconfig/${x}.pc ${prof}.pc \
/${ACML_INST_DIR}/${libdir} ${fdir}/lib
done
+ [[ ${fdef} = gfortran${libdir#lib} ]] || fdef=${fdir}
done
+
+ # install env file
+ use openmp && [[ ${fdef} != *_mp ]] && fdef=${fdef}_mp
echo -n > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
dosym ${fdef}/lib /${ACML_INST_DIR}/$(get_libdir)
- if use multilib; then
+ if has_multilib_profile; then
dosym ${fdef/64/32}/lib /${ACML_INST_DIR}/lib32
echo -n >> 35acml ":${EPREFIX}/${ACML_INST_DIR}/lib32"
fi
@@ -108,10 +113,9 @@ src_install() {
doenvd 35acml
insinto /${ACML_INST_DIR}
- doins ReleaseNotes*
# info files go to standard /usr/share/info to avoid more env variables
doinfo Doc/*info*
rm Doc/*EULA* Doc/*info*
use doc || rm -rf Doc/*.pdf Doc/acml.html Doc/html
- doins -r Doc
+ doins -r Doc ReleaseNotes*
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/
@ 2011-06-20 5:19 Sebastien Fabbro
0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2011-06-20 5:19 UTC (permalink / raw
To: gentoo-commits
commit: 49ad48429625dd97ff7947040c200ba721393c56
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 16:37:53 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 16:37:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=49ad4842
fixed linking for profiles
---
sci-libs/acml/Manifest | 2 +-
sci-libs/acml/acml-4.4.0-r1.ebuild | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index c317b88..1ccc9e9 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a615cf2b3294294162ccb89e9ad
DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580
DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256 f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0
DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d280715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07dc0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf
-EBUILD acml-4.4.0-r1.ebuild 3631 RMD160 6869ffc9e4c06d3a04a21a71c2edf97d65249c76 SHA1 faf7da945643f1f672c88c2f8d4fcd90161eb49e SHA256 c40d93e96ff6ff8aa74fc21b4b718fcb5b39c449e62123f113780d22ae87372c
+EBUILD acml-4.4.0-r1.ebuild 3646 RMD160 d65690d7b794603676fc1c22f6654bc1c732160b SHA1 edba606988b336aa4a788d81d883fe5271547f93 SHA256 41573d60d41485c39988d3b3fbab68612ad7917436c2acc35db32f91e715b706
MISC ChangeLog 8614 RMD160 709ed6a62bb652c14fd8fc96de3649bc24d9d973 SHA1 403bc7772bd5b7a469de7fff883f2b06271e2397 SHA256 a3e7541d8b8bc2fb743769272649792f32f7df016ca04c425f6ef21799c38184
MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e SHA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f836c29c818176cf23d239dc1e5aa29e4702cbbe85042
diff --git a/sci-libs/acml/acml-4.4.0-r1.ebuild b/sci-libs/acml/acml-4.4.0-r1.ebuild
index 982e6c8..65fcc3d 100644
--- a/sci-libs/acml/acml-4.4.0-r1.ebuild
+++ b/sci-libs/acml/acml-4.4.0-r1.ebuild
@@ -66,7 +66,7 @@ src_test() {
src_install() {
# install libraries, pkgconfig file and eselect files for each profile
# fdef will be the default (gfortran if available) to be in path
- local prof libs fdir libdir=$(get_libdir) x fdef
+ local prof libs fdir libdir x fdef
for fdir in */lib; do
fdir=$(dirname ${fdir})
prof=acml$(echo ${fdir} | sed \
@@ -77,8 +77,7 @@ src_install() {
use static-libs || rm -f ${fdir}/lib/*.a
dodir /${ACML_INST_DIR}
cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR}
- libs="$(find ${fdir} -name \*.so | \
- sed -e "s:${fdir}/lib\(.*\).so:-l\1:")"
+ libs="$(find ${fdir} -name \*.so -printf '%f ' | sed -e 's:lib:-l:g' -e 's:\.so::g')"
cat <<-EOF > ${prof}.pc
prefix=${EPREFIX}/${ACML_INST_DIR}/${fdir}
libdir=\${prefix}/lib
@@ -90,6 +89,7 @@ src_install() {
Libs: -L\${libdir} ${libs}
Cflags: -I\${includedir}
EOF
+ libdir=$(get_libdir)
has_multilib_profile && [[ ${fdir} == *32* ]] && libdir=lib32
insinto /usr/${libdir}/pkgconfig
doins ${prof}.pc
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-20 5:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 5:39 [gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2011-03-31 18:11 Sebastien Fabbro
2011-06-20 5:19 Sebastien Fabbro
2011-06-20 5:19 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox