aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2007-09-03 14:47:36 +0000
committerbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2007-09-03 14:47:36 +0000
commit0de3e046bcb10da24d029f77b6aa9fb70e94e9d0 (patch)
treec6c4646a1e4c7081ea2deeff36d41690165df47e /dev-lang/icc
parentdelete numeric, now in main tree (diff)
downloadsci-0de3e046bcb10da24d029f77b6aa9fb70e94e9d0.tar.gz
sci-0de3e046bcb10da24d029f77b6aa9fb70e94e9d0.tar.bz2
sci-0de3e046bcb10da24d029f77b6aa9fb70e94e9d0.zip
icc/ifc: few fixes with envd files
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@725 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'dev-lang/icc')
-rw-r--r--dev-lang/icc/Manifest8
-rw-r--r--dev-lang/icc/icc-10.0.026.ebuild26
2 files changed, 18 insertions, 16 deletions
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index e881172d9..f12a4b808 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,10 +1,10 @@
DIST l_cc_c_10.0.026_ia32.tar.gz 3122026 RMD160 10193730676646cf99f510ff83b991fe5763f158 SHA1 908c535c80bc3115a91aa4bd1c00a767165f6172 SHA256 595f6abea328fa0b52f373a8729d3ed322e20349f0086d96f6b65d60920c15f5
DIST l_cc_c_10.0.026_ia64.tar.gz 64662221 RMD160 51601383678f759979a2c9d456102e28a9d017bf SHA1 2f71ffe6fcb9d8a2bb8fe46bf82dc29382e5cdc5 SHA256 1d55e6040fef6c3e42725049c19ab80c506efff99b7810e04cc55731d0e31b19
DIST l_cc_c_10.0.026_intel64.tar.gz 36405579 RMD160 bcf8bec436ad4c9e91b35201e709491b197f6145 SHA1 9a39aee94d2cd67476a4aad198657c1333854676 SHA256 00ca4de9510e04c7d3f27590e21339d663d17b12b39ebc5153d9bd58e750128e
-EBUILD icc-10.0.026.ebuild 3367 RMD160 d16ba5a02e0bb93def1dc293fb693db35075464a SHA1 64284d1e99685f0692ccffd0b815a432bf985bd8 SHA256 202f0bfd276c28f852566deb986d658aefe9c74922a8b9dc9d885605bacfa244
-MD5 360aa4f9941ac22b4e4bfa006f384967 icc-10.0.026.ebuild 3367
-RMD160 d16ba5a02e0bb93def1dc293fb693db35075464a icc-10.0.026.ebuild 3367
-SHA256 202f0bfd276c28f852566deb986d658aefe9c74922a8b9dc9d885605bacfa244 icc-10.0.026.ebuild 3367
+EBUILD icc-10.0.026.ebuild 3429 RMD160 052ad9de362013d2164e9a72516d8bdb5800efa3 SHA1 78ff15a0f09c5feb2fc104b142873db5af776c0a SHA256 86d3ba8631627ad5711c49e40e5d22d66839a2739e47d115c4091c1b094c94fd
+MD5 a91c69998ea3432ad5cb43552e70fee2 icc-10.0.026.ebuild 3429
+RMD160 052ad9de362013d2164e9a72516d8bdb5800efa3 icc-10.0.026.ebuild 3429
+SHA256 86d3ba8631627ad5711c49e40e5d22d66839a2739e47d115c4091c1b094c94fd icc-10.0.026.ebuild 3429
MD5 6642a1185af53e19781fa8aaa5933d9e files/digest-icc-10.0.026 810
RMD160 7741c7d450e02431042aafaedc4d72a183fd3663 files/digest-icc-10.0.026 810
SHA256 16e47ab76cf32466b175d6f8a20b42a1dbf2b39aa0ea7957a7bafca0f1bd259e files/digest-icc-10.0.026 810
diff --git a/dev-lang/icc/icc-10.0.026.ebuild b/dev-lang/icc/icc-10.0.026.ebuild
index 819e08197..e77982648 100644
--- a/dev-lang/icc/icc-10.0.026.ebuild
+++ b/dev-lang/icc/icc-10.0.026.ebuild
@@ -6,7 +6,8 @@ inherit versionator elisp-common rpm multilib
PID=786
PB=cc
-DESCRIPTION="Intel C/C++ Compiler - Intel's optimized compiler for Linux"
+PEXEC=icc
+DESCRIPTION="Intel C/C++ optimized compiler for Linux"
HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
# everything below should not change between ifc and icc
@@ -56,23 +57,23 @@ src_unpack() {
done
einfo "Fixing paths and tagging"
- sed -i \
- -e "s|<INSTALLDIR>|${INSTALL_DIR}|g" \
- "${S}"/opt/intel/*/*/bin/* \
+ cd "${S}/${INSTALL_DIR}"/bin
+ sed -e "s|<INSTALLDIR>|${INSTALL_DIR}|g" \
+ -i ${PEXEC} ${PEXEC}*sh \
|| die "sed fixing path failed"
- sed -i \
- -e "s|\<installpackageid\>|${PACKAGEID}|g" \
+ cd "${S}/${INSTALL_DIR}"/doc
+ sed -e "s|\<installpackageid\>|${PACKAGEID}|g" \
-e "s|\<INSTALLTIMECOMBOPACKAGEID\>|${PACKAGEID}|g" \
- "${S}"/opt/intel/*/*/doc/*support \
+ -i *support \
|| die "sed support file failed"
- chmod 644 "${S}"/opt/intel/*/*/doc/*support
-
+ chmod 644 *support
}
src_install() {
- dodir /opt/intel
- cp -pPR "${S}"/opt/intel/${PB}* "${D}"/opt/intel || die "copying ${PN} failed"
+ einfo "Copying files"
+ dodir ${INSTALL_DIR}
+ cp -pPR "${S}/${INSTALL_DIR}"/* "${D}/${INSTALL_DIR}/" || die "copying ${PN} failed"
local env_file=05${PN}
echo "PATH=${INSTALL_DIR}/bin" > ${env_file}
@@ -83,7 +84,8 @@ src_install() {
doenvd ${env_file} || die "doenvd ${env_file} failed"
if [[ -n "${INSTALL_IDB_DIR}" ]]; then
- cp -pPR "${S}"/opt/intel/idb* "${D}"/opt/intel || die "copying debugger failed"
+ dodir ${INSTALL_IDB_DIR}
+ cp -pPR "${S}/${INSTALL_IDB_DIR}"/* "${D}/${INSTALL_IDB_DIR}/" || die "copying debugger failed"
local idb_env_file=06idb
echo "PATH=${INSTALL_IDB_DIR}/bin" > ${idb_env_file}
echo "ROOTPATH=${INSTALL_IDB_DIR}/bin" >> ${idb_env_file}