diff options
| author |   Sébastien Fabbro <bicatali@gentoo.org> | 2011-06-19 17:37:53 +0100 |
|---|---|---|
| committer | Sébastien Fabbro <bicatali@gentoo.org> | 2011-06-19 17:37:53 +0100 |
| commit | 49ad48429625dd97ff7947040c200ba721393c56 (patch) | |
| tree | b7db453a5aab0585b0262e3261aef354aa65d120 | |
| parent | More complete treatment of multilib. Rename profiles to be more consistent wi... (diff) | |
| download | bicatali-49ad48429625dd97ff7947040c200ba721393c56.tar.gz bicatali-49ad48429625dd97ff7947040c200ba721393c56.tar.bz2 bicatali-49ad48429625dd97ff7947040c200ba721393c56.zip | |
fixed linking for profiles
| -rw-r--r-- | sci-libs/acml/Manifest | 2 | ||||
| -rw-r--r-- | 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 |