diff options
Diffstat (limited to 'sci-libs/mkl')
| -rw-r--r-- | sci-libs/mkl/Manifest | 15 | ||||
| -rw-r--r-- | sci-libs/mkl/files/digest-mkl-9.1.023 | 6 | ||||
| -rw-r--r-- | sci-libs/mkl/mkl-9.1.023.ebuild | 69 |
3 files changed, 59 insertions, 31 deletions
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest index 64ed14f66..c49d80c87 100644 --- a/sci-libs/mkl/Manifest +++ b/sci-libs/mkl/Manifest @@ -11,10 +11,11 @@ MD5 18e0d606b5e2065c44e06ea054bc7e62 files/lapack.pc.in 280 RMD160 29c8001a4939e550f29f44ae49c66bcf2faae038 files/lapack.pc.in 280 SHA256 e2201c50675f5e4636e8c5d19ba6a9fba3904789a35369ec8bbed83b8c493a2c files/lapack.pc.in 280 DIST l_mkl_enh_p_9.1.023.tgz 316915220 RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58b94f4b SHA1 9b03333627ab69cf9139838444e6e43d0b7404c8 SHA256 609ba57261b4959dfc8e6e56959f93ff7dba7b568ca5c80e09f4013df0207106 -EBUILD mkl-9.1.023.ebuild 7447 RMD160 f4fdf0c0e827f1554d50fe713325ef094bb3f3c6 SHA1 75234c43437dfb6c24e618e45f4c1df9a4046eb2 SHA256 e8f248a086d7249ed30e6aa87b24935fc4b54b8c10ea7a818777638bb329459c -MD5 9ad9ced840c4ea935562805a6c30eab5 mkl-9.1.023.ebuild 7447 -RMD160 f4fdf0c0e827f1554d50fe713325ef094bb3f3c6 mkl-9.1.023.ebuild 7447 -SHA256 e8f248a086d7249ed30e6aa87b24935fc4b54b8c10ea7a818777638bb329459c mkl-9.1.023.ebuild 7447 -MD5 a6aa995482c9c728e58975709e4ad1c7 files/digest-mkl-9.1.023 259 -RMD160 d27118039d5eb0fcc493a6229a46d9b3a0429d40 files/digest-mkl-9.1.023 259 -SHA256 9741096282e8484ea64b98c4aa07e2cc6c6fbcdf9e4dc1e88bbff126fcb1a0c3 files/digest-mkl-9.1.023 259 +DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd +EBUILD mkl-9.1.023.ebuild 8171 RMD160 9a3d2f7bf4ff95f371e0d304a998a47674e5d9d3 SHA1 18b3bba3e2c9393cbf7ae67f2d6f87e5aa0b73b0 SHA256 6fdabace2ce62e2e7b5b762626c56e7db255e5a65c34c2ffd49aca30facde821 +MD5 e0b72902111472c27823d5bc09c911ec mkl-9.1.023.ebuild 8171 +RMD160 9a3d2f7bf4ff95f371e0d304a998a47674e5d9d3 mkl-9.1.023.ebuild 8171 +SHA256 6fdabace2ce62e2e7b5b762626c56e7db255e5a65c34c2ffd49aca30facde821 mkl-9.1.023.ebuild 8171 +MD5 61ded4dd525992c1902728f18b521abd files/digest-mkl-9.1.023 506 +RMD160 e72344085e93d70d5d93605d9a70101d825c5d06 files/digest-mkl-9.1.023 506 +SHA256 4d6a55d472b164daba360ca503d9071907142bb6956d5d396f235ec38df5225d files/digest-mkl-9.1.023 506 diff --git a/sci-libs/mkl/files/digest-mkl-9.1.023 b/sci-libs/mkl/files/digest-mkl-9.1.023 new file mode 100644 index 000000000..d17705aaa --- /dev/null +++ b/sci-libs/mkl/files/digest-mkl-9.1.023 @@ -0,0 +1,6 @@ +MD5 c302a2b4700666d3272b428f7b7b5a9d l_mkl_enh_p_9.1.023.tgz 316915220 +RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58b94f4b l_mkl_enh_p_9.1.023.tgz 316915220 +SHA256 609ba57261b4959dfc8e6e56959f93ff7dba7b568ca5c80e09f4013df0207106 l_mkl_enh_p_9.1.023.tgz 316915220 +MD5 5d484063a5d416cdb0c1c08b79deeb4f l_mkl_p_9.1.023.tgz 155907883 +RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad l_mkl_p_9.1.023.tgz 155907883 +SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd l_mkl_p_9.1.023.tgz 155907883 diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild index ab7d9f202..17ae2eabb 100644 --- a/sci-libs/mkl/mkl-9.1.023.ebuild +++ b/sci-libs/mkl/mkl-9.1.023.ebuild @@ -9,7 +9,9 @@ MYP="${PN}-${MYPV}" DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, random number generators." HOMEPAGE="http://developer.intel.com/software/products/mkl/" -SRC_URI="l_${PN}_enh_p_${PV}.tgz" +SRC_URI="!int64? ( !serial? ( l_${PN}_p_${PV}.tgz ) ) + int64? ( l_${PN}_enh_p_${PV}.tgz ) + serial? ( l_${PN}_enh_p_${PV}.tgz )" LICENSE="${MYP}" @@ -19,7 +21,7 @@ LICENSE="${MYP}" SLOT="0" RESTRICT="strip fetch" KEYWORDS="~x86 ~amd64 ~ia64" -IUSE="threads int64 fortran95 fftw doc examples" +IUSE="serial int64 fortran95 fftw doc examples" DEPEND="app-admin/eselect-blas app-admin/eselect-cblas @@ -38,11 +40,18 @@ pkg_nofetch() { einfo "Also you need to register in ${HOMEPAGE}" einfo "and keep the license Intel sent you" einfo "SRC=${A}" + + if use int64 || use serial; then + einfo "Since you have either USE=int64 or USE=serial" + einfo "You will need to download the enhanced version" + fi } pkg_setup() { # setting up license - [[ -z "${MKL_LICENSE}" ]] && MKL_LICENSE="$(find /opt/intel/licenses -name *MKL*.lic)" + [[ -z "${MKL_LICENSE}" ]] && [[ -d /opt/intel/licenses ]] && \ + MKL_LICENSE="$(find /opt/intel/licenses -name *MKL*.lic)" + if [[ -z "${MKL_LICENSE}" ]]; then eerror "Did not find any valid mkl license." eerror "Please locate your license file and run:" @@ -64,8 +73,10 @@ pkg_setup() { src_unpack() { ewarn - ewarn "Intel ${PN} requires in average 400Mb of disk space" - ewarn "Make sure you have them on ${PORTAGE_TMPDIR} and in /opt" + local dp=950 + ! use serial && ! use int64 && dp=400 + ewarn "Intel ${PN} requires ${dp}Mb of disk space" + ewarn "Make sure you have enough in ${PORTAGE_TMPDIR} and in /opt" ewarn unpack ${A} @@ -92,8 +103,11 @@ EOF --silent ${PWD}/mkl.ini \ --log log.txt &> /dev/null - [[ -z $(find "${S}" -name libmkl.so) ]] \ - && die "extracting failed" + if [[ -z $(find "${S}" -name libmkl.so) ]]; then + eerror "could not find extracted files" + eerror "see ${PWD}/log.txt to see why" + die "extracting failed" + fi # remove unused stuff and set up intel names rm -rf "${WORKDIR}"/l_* @@ -112,18 +126,18 @@ EOF ;; esac - MKL_PROF="serial" + MKL_PROF="regular" - if use threads; then - MKL_PROF="${MKL_PROF} regular" + if use serial; then + MKL_PROF="${MKL_PROF} serial" else - rm -rf "${S}"/lib + [[ -d "${S}"/lib_serial ]] && rm -rf "${S}"/lib_serial fi if use int64; then MKL_PROF="${MKL_PROF} ilp64" else - rm -rf "${S}"/lib_ilp64 + [[ -d "${S}"/lib_ilp64 ]] && rm -rf "${S}"/lib_ilp64 fi # fix a bad makefile in the test @@ -188,17 +202,14 @@ src_test() { mkl_install_lib() { local proflib=lib_${1} - [[ "${1}" == "regular" ]] && proflib=lib + local prof=${PN}-${1} + [[ "${1}" == "regular" ]] && proflib=lib && prof=${PN}-threads local libdir="${MKL_DIR}/${proflib}/${MKL_ARCH}" - local prof=${PN} - local extlibs + local extlibs="-L${libdir} -lguide -lpthread" + [[ "${1}" == "serial" ]] && extlibs="" + [[ "${FORTRANC}" == "gfortran" ]] && \ extlibs="${extlibs} -L${libdir} -lmkl_gfortran" - if [[ "${1}" == "regular" ]]; then - extlibs="${extlibs} -L${libdir} -lguide -lpthread" - prof=${prof}-threads - fi - [[ "${1}" == "ilp64" ]] && prof=${prof}-int64 cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR} @@ -247,17 +258,25 @@ src_install() { fi # keep intel dir in /opt as default install + einfo "Installing headers, man pages and tools" insinto ${MKL_DIR} doins -r include man tools || die "doins include|man|tools failed" - use examples && doins -r examples + if use examples; then + einfo "Installing examples" + doins -r examples || die "doins examples failed" + fi insinto ${MKL_DIR}/doc - doins doc/*.txt - use doc && doins doc/*.pdf doc/*.htm + doins doc/*.txt || die "basic doc install failed" + if use doc; then + einfo "Installing examples" + doins doc/*.pdf doc/*.htm || die "" + fi # take care of lib and eselect files for p in ${MKL_PROF}; do + einfo "Installing profile ${p}" mkl_install_lib ${p} done @@ -271,7 +290,9 @@ pkg_postinst() { local defprof="${PN}-${FORTRANC}" if use int64; then defprof="${defprof}-int64" - elif use threads; then + elif use serial; then + defprof="${defprof}-serial" + else defprof="${defprof}-threads" fi |