aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2006-02-02 20:21:53 +0000
committerbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2006-02-02 20:21:53 +0000
commit485be7b2683f4ac5ac252439afcce1cc45c19bbc (patch)
treeb321cfbb3964d58f61ce685bb94cb7b955c9753c
parentadded experimental mkl-8.0.1.006 (diff)
downloadsci-485be7b2683f4ac5ac252439afcce1cc45c19bbc.tar.gz
sci-485be7b2683f4ac5ac252439afcce1cc45c19bbc.tar.bz2
sci-485be7b2683f4ac5ac252439afcce1cc45c19bbc.zip
mkl/mkl-8.0.1.006.ebuild: corrected some installation bugs
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@90 32389bae-6d03-0410-99cf-db05cde120eb
-rw-r--r--sci-libs/mkl/Manifest2
-rw-r--r--sci-libs/mkl/mkl-8.0.1.006.ebuild13
2 files changed, 8 insertions, 7 deletions
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index cf9079b98..395eca62e 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,4 +1,4 @@
MD5 f0122114658bed82421c724016249798 ChangeLog 1771
MD5 f1853cde0595400d25d2fa52f079a46e files/digest-mkl-8.0.1.006 68
MD5 729a826a74e62fe48daf668e3dccefb4 metadata.xml 603
-MD5 139b4f46e209df9bc979811896752d05 mkl-8.0.1.006.ebuild 3165
+MD5 685a0f20f59bb5712917b2d8c1b85ec6 mkl-8.0.1.006.ebuild 3195
diff --git a/sci-libs/mkl/mkl-8.0.1.006.ebuild b/sci-libs/mkl/mkl-8.0.1.006.ebuild
index cf6827c51..1afec0621 100644
--- a/sci-libs/mkl/mkl-8.0.1.006.ebuild
+++ b/sci-libs/mkl/mkl-8.0.1.006.ebuild
@@ -64,7 +64,7 @@ RPM_INSTALLATION=
" > answers.txt
einfo "Building rpm file (be patient)..."
- ./install --noroot --nonrpm --installpath ${D}/${INSTDIR} --silent answers.txt &> /dev/null
+ ./install --noroot --nonrpm --installpath ${S}/opt --silent answers.txt &> /dev/null
rm -rf ${WORKDIR}/bin ${S}/*
cd ${WORKDIR}/rpm
@@ -74,7 +74,8 @@ RPM_INSTALLATION=
tar xfz ${x/.rpm/.tar.gz} -C ${S}
rm -f ${x} ${x/.rpm/.tar.gz}
done
- cp ${PN}_license ${S}/opt/intel/licenses
+ mkdir ${S}/opt/intel/licenses
+ cp ${PN}_license ${S}/opt/intel/licenses/
cd ${WORKDIR}
rm -rf rpm
case ${ARCH} in
@@ -97,8 +98,8 @@ src_compile() {
src_test() {
- # todo: testing with other compilers than gnu
- cd ${WORKDIR}${INSTDIR}/tests
+ # todo: testing with compilers other than gcc/g77
+ cd ${S}${INSTDIR}/tests
for testdir in *; do
einfo "Testing $testdir"
cd $testdir
@@ -107,7 +108,7 @@ src_test() {
}
src_install () {
- cd ${WORKDIR}${INSTDIR}
+ cd ${S}${INSTDIR}
# remove unnecessary libraries
use ${ARCH} || rm -rf lib/${IARCH}
@@ -115,7 +116,7 @@ src_install () {
insinto ${INSTDIR}
doins -r doc examples include interfaces tests tools/builder
insinto ${INSTDIR}/lib
- doins -r lib/${IARCH}/*
+ install -m0644 lib/${IARCH}/*.{so,a}
echo "INCLUDE=${INSTDIR}/include:\${INCLUDE}" > 35mkl
echo "LD_LIBRARY_PATH=${INSTDIR}/lib/${IARCH}:\${LD_LIBRARY_PATH}" >> 35mkl