From 7bf85020e11b11e340b76d08588e479dab111f59 Mon Sep 17 00:00:00 2001 From: Andrey Kislyuk Date: Sun, 23 Aug 2009 21:28:09 +0000 Subject: Fix env.d file and workaround for bug 282146 for amd64. Re-keyword ~amd64 only (Portage version: 2.2_rc30/cvs/Linux x86_64) --- dev-lang/icc/ChangeLog | 8 ++- dev-lang/icc/icc-11.1.046-r1.ebuild | 89 --------------------------- dev-lang/icc/icc-11.1.046-r2.ebuild | 117 ++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 90 deletions(-) delete mode 100644 dev-lang/icc/icc-11.1.046-r1.ebuild create mode 100644 dev-lang/icc/icc-11.1.046-r2.ebuild (limited to 'dev-lang/icc') diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog index f8640f6c799a..ae6fc14c1086 100644 --- a/dev-lang/icc/ChangeLog +++ b/dev-lang/icc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/icc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.70 2009/08/22 19:55:40 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.71 2009/08/23 21:28:09 weaver Exp $ + +*icc-11.1.046-r2 (23 Aug 2009) + + 23 Aug 2009; Andrey Kislyuk -icc-11.1.046-r1.ebuild, + +icc-11.1.046-r2.ebuild: + Fix env.d file and workaround for bug 282146 for amd64. Re-keyword ~amd64 only 22 Aug 2009; William Hubbs icc-10.0.026.ebuild, icc-10.1.017-r1.ebuild, icc-10.1.018.ebuild, icc-11.1.046-r1.ebuild: diff --git a/dev-lang/icc/icc-11.1.046-r1.ebuild b/dev-lang/icc/icc-11.1.046-r1.ebuild deleted file mode 100644 index 9a0a6928fbc0..000000000000 --- a/dev-lang/icc/icc-11.1.046-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.046-r1.ebuild,v 1.5 2009/08/22 20:29:05 williamh Exp $ - -EAPI="2" - -PID=1536 -PB=cproc -DESCRIPTION="Intel C/C++ optimized compiler for Linux" -HOMEPAGE="http://www.intel.com/software/products/compilers/clin/" - -### -# everything below common to ifc and icc -# no eclass: very likely to change for next versions -### -PACKAGEID="l_${PB}_p_${PV}" -RELEASE="${PV:0:4}" -BUILD="${PV:5:8}" -SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}.tgz" -#SRC_URI="amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_intel64.tgz ) -# ia64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia64.tgz ) -# x86? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia32.tgz )" - -LICENSE="Intel-SDP" -SLOT="0" -IUSE="" -KEYWORDS="" - -RESTRICT="mirror strip binchecks" - -INSTALL_DIR="opt/intel/Compiler/${RELEASE}/${BUILD}" -# these don't work, not sure why -#QA_TEXTRELS="${INSTALL_DIR}" -#QA_WX_LOAD="${INSTALL_DIR}" -#QA_PRESTRIPPED="${INSTALL_DIR}" - -DEPEND="app-arch/rpm" -RDEPEND="~virtual/libstdc++-3.3 - amd64? ( app-emulation/emul-linux-x86-compat )" - -S="${WORKDIR}/${PACKAGEID}" - -src_prepare() { - use amd64 || rm -f rpm/*x86_64.rpm - # debugger installed with dev-lang/idb - rm -f rpm/intel*idb*.rpm - # performance primitives installed with sci-libs/ipp - rm -f rpm/intel*ipp*.rpm - # math library installed with sci-libs/mkl - rm -f rpm/intel*mkl*.rpm -} - -src_install() { - mkdir "${WORKDIR}/rpmdb" - # rpm open_wr's / but doesn't seem to do anything with it - addpredict / - rpm --install --nodeps --dbpath "${WORKDIR}/rpmdb" --prefix "${D}/${INSTALL_DIR}" rpm/*.rpm || die - - find "${D}/${INSTALL_DIR}" -name '*.csh' | xargs sed -i "s|${D}|${ROOT}|" || die - find "${D}/${INSTALL_DIR}" -name '*.sh' | xargs sed -i "s|${D}|${ROOT}|" || die - - ENV_FILE=05${PN} - MYARCH="" - if use amd64; then MYARCH=intel64; fi - if use ia64; then MYARCH=ia64; fi - if use x86; then MYARCH=ia32; fi - - env - bash --noprofile --norc -c "source '${D}/${INSTALL_DIR}/bin/iccvars.sh' ${MYARCH}; env|egrep -v '(PWD|SHLVL|_)='" > ${ENV_FILE} - doenvd ${ENV_FILE} || die - - # PROFILE_FILE=${PN}.sh - # echo "source ${ROOT}${INSTALL_DIR}/bin/iccvars.sh ${MYARCH}" >> ${PROFILE_FILE} - # exeinto /etc/profile.d; doexe ${PROFILE_FILE} || die - - mkdir -p "${D}/opt/intel/licenses" -} - -pkg_postinst() { - elog "${PN} requires a license file in order to run." - elog "To receive a restrictive non-commercial license, please register at:" - elog "http://www.intel.com/cd/software/products/asmo-na/eng/download/download/219771.htm" - elog "Read the website for more information on this license." - elog "Install the license file into ${ROOT}opt/intel/licenses" - elog - elog "The following packages provide components bundled with icc:" - elog "\t dev-lang/idb" - elog "\t sci-libs/ipp" - elog "\t sci-libs/mkl" -} diff --git a/dev-lang/icc/icc-11.1.046-r2.ebuild b/dev-lang/icc/icc-11.1.046-r2.ebuild new file mode 100644 index 000000000000..5a43f5403aae --- /dev/null +++ b/dev-lang/icc/icc-11.1.046-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.046-r2.ebuild,v 1.1 2009/08/23 21:28:09 weaver Exp $ + +EAPI="2" + +inherit toolchain-funcs + +PID=1536 +PB=cproc +DESCRIPTION="Intel C/C++ optimized compiler for Linux" +HOMEPAGE="http://www.intel.com/software/products/compilers/clin/" + +### +# everything below common to ifc and icc +# no eclass: very likely to change for next versions +### +PACKAGEID="l_${PB}_p_${PV}" +RELEASE="${PV:0:4}" +BUILD="${PV:5:8}" +SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}.tgz" +#SRC_URI="amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_intel64.tgz ) +# ia64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia64.tgz ) +# x86? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia32.tgz )" + +LICENSE="Intel-SDP" +SLOT="0" +IUSE="" +KEYWORDS="~amd64" + +RESTRICT="mirror strip binchecks" + +INSTALL_DIR="opt/intel/Compiler/${RELEASE}/${BUILD}" +# these don't work, not sure why +#QA_TEXTRELS="${INSTALL_DIR}" +#QA_WX_LOAD="${INSTALL_DIR}" +#QA_PRESTRIPPED="${INSTALL_DIR}" + +DEPEND="app-arch/rpm" +RDEPEND="~virtual/libstdc++-3.3 + amd64? ( app-emulation/emul-linux-x86-compat )" + +S="${WORKDIR}/${PACKAGEID}" + +src_prepare() { + use amd64 || rm -f rpm/*x86_64.rpm + # debugger installed with dev-lang/idb + rm -f rpm/intel*idb*.rpm + # performance primitives installed with sci-libs/ipp + rm -f rpm/intel*ipp*.rpm + # math library installed with sci-libs/mkl + rm -f rpm/intel*mkl*.rpm +} + +src_install() { + mkdir "${WORKDIR}/rpmdb" + # rpm open_wr's / but doesn't seem to do anything with it + addpredict / + rpm --install --nodeps --dbpath "${WORKDIR}/rpmdb" --prefix "${D}/${INSTALL_DIR}" rpm/*.rpm || die + + find "${D}/${INSTALL_DIR}" -name '*.csh' | xargs sed -i "s|${D}|${ROOT}|" || die + find "${D}/${INSTALL_DIR}" -name '*.sh' | xargs sed -i "s|${D}|${ROOT}|" || die + + ENV_FILE=05${PN} + MYARCH="" + if use amd64; then MYARCH=intel64; fi + if use ia64; then MYARCH=ia64; fi + if use x86; then MYARCH=ia32; fi + + # By default, icpc 11.1 will prepend /usr to these paths, failing to find stdc++ headers + cat <> "${D}/${INSTALL_DIR}/bin/${MYARCH}/icpc.cfg" +-nostdinc++ +-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4 +-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/${CHOST} +-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/backward +EOF + + cat < ${ENV_FILE} +MANPATH=${ROOT}${INSTALL_DIR}/man/en_US +INTEL_LICENSE_FILE=${ROOT}${INSTALL_DIR}/licenses:${ROOT}opt/intel/licenses +LIBRARY_PATH=${ROOT}${INSTALL_DIR}/lib/intel64:${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib +LD_LIBRARY_PATH=${ROOT}${INSTALL_DIR}/lib/intel64:${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib +CPATH=${ROOT}${INSTALL_DIR}/tbb/include +NLSPATH=${ROOT}${INSTALL_DIR}/lib/intel64/locale/%l_%t/%N +PATH=${ROOT}${INSTALL_DIR}/bin/${MYARCH} +ROOTPATH=${ROOT}${INSTALL_DIR}/bin/${MYARCH} +DYLD_LIBRARY_PATH=${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib +EOF + + doenvd ${ENV_FILE} || die + + keepdir /opt/intel/licenses +} + +pkg_postinst() { + env-update + elog "${PN} requires a license file in order to run." + elog "To receive a restrictive non-commercial license, please register at:" + elog "http://www.intel.com/cd/software/products/asmo-na/eng/download/download/219771.htm" + elog "Read the website for more information on this license." + elog "Install the license file into ${ROOT}opt/intel/licenses" + elog + elog "The following packages provide components bundled with icc:" + elog "\t dev-lang/idb" + elog "\t sci-libs/ipp" + elog "\t sci-libs/mkl" + ewarn + ewarn "The ${P} C++ compiler (icpc) is unable to find the GNU C++ headers on Gentoo." + ewarn "To correct this, the following icpc options have been put in the file" + ewarn "${ROOT}${INSTALL_DIR}/bin/${MYARCH}/icpc.cfg:" + ewarn "\t -nostdinc++" + ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4" + ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/${CHOST}" + ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/backward" + ewarn "You will have to update these lines every time you upgrade GCC for icpc to work." + ewarn +} -- cgit v1.2.3-65-gdbad