| 1 |
weaver 09/08/23 21:28:09 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: icc-11.1.046-r2.ebuild |
| 5 |
Removed: icc-11.1.046-r1.ebuild |
| 6 |
Log: |
| 7 |
Fix env.d file and workaround for bug 282146 for amd64. Re-keyword ~amd64 only |
| 8 |
(Portage version: 2.2_rc30/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.71 dev-lang/icc/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.71&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.71&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?r1=1.70&r2=1.71 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v |
| 20 |
retrieving revision 1.70 |
| 21 |
retrieving revision 1.71 |
| 22 |
diff -u -r1.70 -r1.71 |
| 23 |
--- ChangeLog 22 Aug 2009 19:55:40 -0000 1.70 |
| 24 |
+++ ChangeLog 23 Aug 2009 21:28:09 -0000 1.71 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for dev-lang/icc |
| 27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.70 2009/08/22 19:55:40 williamh Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.71 2009/08/23 21:28:09 weaver Exp $ |
| 30 |
+ |
| 31 |
+*icc-11.1.046-r2 (23 Aug 2009) |
| 32 |
+ |
| 33 |
+ 23 Aug 2009; Andrey Kislyuk <weaver@g.o> -icc-11.1.046-r1.ebuild, |
| 34 |
+ +icc-11.1.046-r2.ebuild: |
| 35 |
+ Fix env.d file and workaround for bug 282146 for amd64. Re-keyword ~amd64 only |
| 36 |
|
| 37 |
22 Aug 2009; William Hubbs <williamh@g.o> icc-10.0.026.ebuild, |
| 38 |
icc-10.1.017-r1.ebuild, icc-10.1.018.ebuild, icc-11.1.046-r1.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 dev-lang/icc/icc-11.1.046-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.046-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.046-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: icc-11.1.046-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2009 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $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 $ |
| 52 |
|
| 53 |
EAPI="2" |
| 54 |
|
| 55 |
inherit toolchain-funcs |
| 56 |
|
| 57 |
PID=1536 |
| 58 |
PB=cproc |
| 59 |
DESCRIPTION="Intel C/C++ optimized compiler for Linux" |
| 60 |
HOMEPAGE="http://www.intel.com/software/products/compilers/clin/" |
| 61 |
|
| 62 |
### |
| 63 |
# everything below common to ifc and icc |
| 64 |
# no eclass: very likely to change for next versions |
| 65 |
### |
| 66 |
PACKAGEID="l_${PB}_p_${PV}" |
| 67 |
RELEASE="${PV:0:4}" |
| 68 |
BUILD="${PV:5:8}" |
| 69 |
SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}.tgz" |
| 70 |
#SRC_URI="amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_intel64.tgz ) |
| 71 |
# ia64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia64.tgz ) |
| 72 |
# x86? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia32.tgz )" |
| 73 |
|
| 74 |
LICENSE="Intel-SDP" |
| 75 |
SLOT="0" |
| 76 |
IUSE="" |
| 77 |
KEYWORDS="~amd64" |
| 78 |
|
| 79 |
RESTRICT="mirror strip binchecks" |
| 80 |
|
| 81 |
INSTALL_DIR="opt/intel/Compiler/${RELEASE}/${BUILD}" |
| 82 |
# these don't work, not sure why |
| 83 |
#QA_TEXTRELS="${INSTALL_DIR}" |
| 84 |
#QA_WX_LOAD="${INSTALL_DIR}" |
| 85 |
#QA_PRESTRIPPED="${INSTALL_DIR}" |
| 86 |
|
| 87 |
DEPEND="app-arch/rpm" |
| 88 |
RDEPEND="~virtual/libstdc++-3.3 |
| 89 |
amd64? ( app-emulation/emul-linux-x86-compat )" |
| 90 |
|
| 91 |
S="${WORKDIR}/${PACKAGEID}" |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
use amd64 || rm -f rpm/*x86_64.rpm |
| 95 |
# debugger installed with dev-lang/idb |
| 96 |
rm -f rpm/intel*idb*.rpm |
| 97 |
# performance primitives installed with sci-libs/ipp |
| 98 |
rm -f rpm/intel*ipp*.rpm |
| 99 |
# math library installed with sci-libs/mkl |
| 100 |
rm -f rpm/intel*mkl*.rpm |
| 101 |
} |
| 102 |
|
| 103 |
src_install() { |
| 104 |
mkdir "${WORKDIR}/rpmdb" |
| 105 |
# rpm open_wr's / but doesn't seem to do anything with it |
| 106 |
addpredict / |
| 107 |
rpm --install --nodeps --dbpath "${WORKDIR}/rpmdb" --prefix "${D}/${INSTALL_DIR}" rpm/*.rpm || die |
| 108 |
|
| 109 |
find "${D}/${INSTALL_DIR}" -name '*.csh' | xargs sed -i "s|${D}|${ROOT}|" || die |
| 110 |
find "${D}/${INSTALL_DIR}" -name '*.sh' | xargs sed -i "s|${D}|${ROOT}|" || die |
| 111 |
|
| 112 |
ENV_FILE=05${PN} |
| 113 |
MYARCH="" |
| 114 |
if use amd64; then MYARCH=intel64; fi |
| 115 |
if use ia64; then MYARCH=ia64; fi |
| 116 |
if use x86; then MYARCH=ia32; fi |
| 117 |
|
| 118 |
# By default, icpc 11.1 will prepend /usr to these paths, failing to find stdc++ headers |
| 119 |
cat <<EOF >> "${D}/${INSTALL_DIR}/bin/${MYARCH}/icpc.cfg" |
| 120 |
-nostdinc++ |
| 121 |
-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4 |
| 122 |
-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/${CHOST} |
| 123 |
-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/backward |
| 124 |
EOF |
| 125 |
|
| 126 |
cat <<EOF > ${ENV_FILE} |
| 127 |
MANPATH=${ROOT}${INSTALL_DIR}/man/en_US |
| 128 |
INTEL_LICENSE_FILE=${ROOT}${INSTALL_DIR}/licenses:${ROOT}opt/intel/licenses |
| 129 |
LIBRARY_PATH=${ROOT}${INSTALL_DIR}/lib/intel64:${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib |
| 130 |
LD_LIBRARY_PATH=${ROOT}${INSTALL_DIR}/lib/intel64:${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib |
| 131 |
CPATH=${ROOT}${INSTALL_DIR}/tbb/include |
| 132 |
NLSPATH=${ROOT}${INSTALL_DIR}/lib/intel64/locale/%l_%t/%N |
| 133 |
PATH=${ROOT}${INSTALL_DIR}/bin/${MYARCH} |
| 134 |
ROOTPATH=${ROOT}${INSTALL_DIR}/bin/${MYARCH} |
| 135 |
DYLD_LIBRARY_PATH=${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib |
| 136 |
EOF |
| 137 |
|
| 138 |
doenvd ${ENV_FILE} || die |
| 139 |
|
| 140 |
keepdir /opt/intel/licenses |
| 141 |
} |
| 142 |
|
| 143 |
pkg_postinst() { |
| 144 |
env-update |
| 145 |
elog "${PN} requires a license file in order to run." |
| 146 |
elog "To receive a restrictive non-commercial license, please register at:" |
| 147 |
elog "http://www.intel.com/cd/software/products/asmo-na/eng/download/download/219771.htm" |
| 148 |
elog "Read the website for more information on this license." |
| 149 |
elog "Install the license file into ${ROOT}opt/intel/licenses" |
| 150 |
elog |
| 151 |
elog "The following packages provide components bundled with icc:" |
| 152 |
elog "\t dev-lang/idb" |
| 153 |
elog "\t sci-libs/ipp" |
| 154 |
elog "\t sci-libs/mkl" |
| 155 |
ewarn |
| 156 |
ewarn "The ${P} C++ compiler (icpc) is unable to find the GNU C++ headers on Gentoo." |
| 157 |
ewarn "To correct this, the following icpc options have been put in the file" |
| 158 |
ewarn "${ROOT}${INSTALL_DIR}/bin/${MYARCH}/icpc.cfg:" |
| 159 |
ewarn "\t -nostdinc++" |
| 160 |
ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4" |
| 161 |
ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/${CHOST}" |
| 162 |
ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/backward" |
| 163 |
ewarn "You will have to update these lines every time you upgrade GCC for icpc to work." |
| 164 |
ewarn |
| 165 |
} |
Archives