Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/icc: metadata.xml ChangeLog icc-11.1.056.ebuild
Date: Tue, 06 Oct 2009 20:33:08
Message-Id: E1MvGiY-00027E-19@stork.gentoo.org
1 bicatali 09/10/06 20:33:06
2
3 Modified: metadata.xml ChangeLog
4 Added: icc-11.1.056.ebuild
5 Log:
6 Version bump. Completely rewritten. Now ship with mkl, ipp, and idb. Added eclipse plugin, thanks to Jacek Szafarkiewicz. No more rpm dependency (fixing bug #282095), no more env-update in pkg_postinstall (bug #284212). Merging icc and ifc environment files. dev-lang/idb, sci-libs/mkl and sci-libs/ipp will follow icc version numbering
7 (Portage version: 2.2_rc42/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.11 dev-lang/icc/metadata.xml
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/metadata.xml?rev=1.11&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/metadata.xml?rev=1.11&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/metadata.xml?r1=1.10&r2=1.11
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/metadata.xml,v
19 retrieving revision 1.10
20 retrieving revision 1.11
21 diff -u -r1.10 -r1.11
22 --- metadata.xml 19 Aug 2009 07:53:54 -0000 1.10
23 +++ metadata.xml 6 Oct 2009 20:33:05 -0000 1.11
24 @@ -7,8 +7,8 @@
25 <email>bicatali@g.o</email>
26 </maintainer>
27 <maintainer>
28 - <email>weaver@g.o</email>
29 - <name>Andrey Kislyuk</name>
30 + <email>weaver@g.o</email>
31 + <name>Andrey Kislyuk</name>
32 </maintainer>
33 <longdescription lang="en">
34 The Intel® C++ Compiler is a full featured C/C++ compiler for Intel
35 @@ -18,4 +18,10 @@
36 documentation. The product can be installed as a non-commercial as
37 well. License, terms of qualifications can be found on the web site.
38 </longdescription>
39 +<use>
40 + <flag name='eclipse'>Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
41 + <flag name='idb'>Install the Intel Debugger</flag>
42 + <flag name='mkl'>Install the Intel Math Kernel Library</flag>
43 + <flag name='ipp'>Install the Intel Integrated Primitive</flag>
44 +</use>
45 </pkgmetadata>
46
47
48
49 1.72 dev-lang/icc/ChangeLog
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.72&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.72&content-type=text/plain
53 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?r1=1.71&r2=1.72
54
55 Index: ChangeLog
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v
58 retrieving revision 1.71
59 retrieving revision 1.72
60 diff -u -r1.71 -r1.72
61 --- ChangeLog 23 Aug 2009 21:28:09 -0000 1.71
62 +++ ChangeLog 6 Oct 2009 20:33:05 -0000 1.72
63 @@ -1,6 +1,16 @@
64 # ChangeLog for dev-lang/icc
65 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
66 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.71 2009/08/23 21:28:09 weaver Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.72 2009/10/06 20:33:05 bicatali Exp $
68 +
69 +*icc-11.1.056 (06 Oct 2009)
70 +
71 + 06 Oct 2009; Sébastien Fabbro <bicatali@g.o> +icc-11.1.056.ebuild,
72 + metadata.xml:
73 + Version bump. Completely rewritten. Now ship with mkl, ipp, and idb. Added
74 + eclipse plugin, thanks to Jacek Szafarkiewicz. No more rpm dependency
75 + (fixing bug #282095), no more env-update in pkg_postinstall (bug #284212).
76 + Merging icc and ifc environment files. dev-lang/idb, sci-libs/mkl and
77 + sci-libs/ipp will follow icc version numbering
78
79 *icc-11.1.046-r2 (23 Aug 2009)
80
81
82
83
84 1.1 dev-lang/icc/icc-11.1.056.ebuild
85
86 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?rev=1.1&view=markup
87 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?rev=1.1&content-type=text/plain
88
89 Index: icc-11.1.056.ebuild
90 ===================================================================
91 # Copyright 1999-2009 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93 # $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v 1.1 2009/10/06 20:33:05 bicatali Exp $
94
95 EAPI=2
96
97 inherit rpm versionator check-reqs
98
99 PB=cproc
100 PACKAGEID="l_${PB}_p_${PV}"
101 RELEASE="$(get_version_component_range 1-2)"
102 BUILD="$(get_version_component_range 3)"
103 PID=1583
104
105 DESCRIPTION="Intel compiler suite for Linux"
106 HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
107 SRC_COM="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}"
108 SRC_URI="amd64? ( ${SRC_COM}_intel64.tgz )
109 ia64? ( ${SRC_COM}_ia64.tgz )
110 x86? ( ${SRC_COM}_ia32.tgz )"
111
112 LICENSE="Intel-SDP"
113 SLOT="0"
114 IUSE="eclipse +idb ipp mkl"
115 KEYWORDS="~amd64 ~x86"
116
117 RESTRICT="mirror strip binchecks"
118
119 DEPEND=""
120 RDEPEND="~virtual/libstdc++-3.3
121 amd64? ( app-emulation/emul-linux-x86-compat )
122 eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
123
124 DESTINATION="opt/intel/Compiler/${RELEASE}/${BUILD}"
125
126 pkg_setup() {
127 CHECKREQS_MEMORY=1024
128 CHECKREQS_DISK_BUILD=2048
129 use idb && use ipp && use mkl && CHECKREQS_DISK_BUILD=3072
130 check_reqs
131 IARCH=ia32
132 use amd64 && IARCH=intel64
133 use ia64 && IARCH=ia64
134 }
135
136 src_unpack() {
137 unpack ${A}
138 mv "${WORKDIR}"/l_* "${S}"
139 cd "${S}"
140 # tbb is open source, thus built from sources in dev-cpp/tbb
141 rm -f rpm/*tbb*.rpm
142 use idb || rm -f rpm/*idb*.rpm
143 use ipp || rm -f rpm/*ipp*.rpm
144 use mkl || rm -f rpm/*mkl*.rpm
145 use eclipse || rm -f rpm/*cdt*.rpm
146 if has_version "~dev-lang/ifc-${PV}"; then
147 rm -f rpm/*cprolib*.rpm
148 use idb && built_with_use dev-lang/ifc idb && rm -f rpm/*idb*.rpm
149 use mkl && built_with_use dev-lang/ifc mkl && rm -f rpm/*mkl*.rpm
150 fi
151 for x in rpm/intel*.rpm; do
152 einfo "Extracting $(basename ${x})..."
153 rpm_unpack ./${x} || die "rpm_unpack ${x} failed"
154 done
155 }
156
157 link_eclipse_plugins() {
158 ECLIPSE_V="$1"
159 CDT_V="$2"
160 einfo "Linking eclipse (v${ECLIPSE_V}) plugin cdt (v${CDT_V})"
161 dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
162 dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
163
164 for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/plugins"/*; do
165 dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
166 done
167
168 for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
169 dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
170 done
171 eend $?
172 }
173
174
175 src_prepare() {
176 # from the PURGE_UB804_FNP in pset/install_cc.sh
177 # rm -f "${DESTINATION}"/lib/*/*libFNP.so || die
178
179 # extract the tag function from the original install
180 sed -n \
181 -e "s|find \$DESTINATION|find ${DESTINATION}|g" \
182 -e "s|@\$DESTINATION|@${ROOT}${DESTINATION}|g" \
183 -e '/^UNTAG_CFG_FILES[[:space:]]*(/,/^}/p' \
184 pset/install_cc.sh > tag.sh || die
185 # fix world writeable files
186 [ -d ${DESTINATION}/mkl ] && chmod 644 \
187 ${DESTINATION}/mkl/tools/{environment,builder}/* \
188 ${DESTINATION}/mkl/tools/plugins/*/*
189 }
190
191 src_install() {
192 einfo "Tagging"
193 . ./tag.sh
194 UNTAG_CFG_FILES
195
196 keepdir /opt/intel/licenses
197 einfo "Copying files"
198 dodir "${DESTINATION}"
199 cp -pPR \
200 ${DESTINATION}/* \
201 "${D}"/${DESTINATION}/ \
202 || die "Copying ${PN} failed"
203
204 local envf=05icfc
205 cat > ${envf} <<-EOF
206 PATH="${ROOT}${DESTINATION}/bin/${IARCH}"
207 ROOTPATH="${ROOT}${DESTINATION}/bin/${IARCH}"
208 LDPATH="${ROOT}${DESTINATION}/lib/${IARCH}"
209 LIBRARY_PATH="${ROOT}${DESTINATION}/lib/${IARCH}"
210 NLSPATH="${ROOT}${DESTINATION}/lib/locale/en_US/%N"
211 MANPATH="${ROOT}${DESTINATION}/man/en_US"
212 EOF
213 if [ -n "$(diff ${ROOT}etc/env.d/${envf} ./${envf})" ]; then
214 doenvd ${envf} || die "doenvd ${envf} failed"
215 fi
216 [ -d ${DESTINATION}/idb ] && \
217 dosym ../../common/com.intel.debugger.help_1.0.0 \
218 ${DESTINATION}/idb/gui/${IARCH}/plugins
219
220 if use eclipse; then
221 if has_version 'dev-util/eclipse-sdk:3.4'; then
222 link_eclipse_plugins "3.4" "5.0" || die
223 fi
224 if has_version 'dev-util/eclipse-sdk:3.5'; then
225 link_eclipse_plugins "3.5" "6.0" || die
226 fi
227 fi
228 }
229
230 pkg_postinst() {
231 elog "Make sure you have recieved the an Intel license."
232 elog "To receive a non-commercial license, you need to register at:"
233 elog "http://software.intel.com/en-us/articles/non-commercial-software-development/"
234 elog "Install the license file into ${ROOT}opt/intel/licenses."
235 }