* [gentoo-commits] gentoo-x86 commit in dev-lang/icc: icc-11.1.056-r1.ebuild ChangeLog
@ 2010-04-22 9:22 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-04-22 9:22 UTC (permalink / raw
To: gentoo-commits
jlec 10/04/22 09:22:56
Modified: ChangeLog
Added: icc-11.1.056-r1.ebuild
Log:
Bumped to EAPI=3, keyworded ~amd64-linux ~x86-linux
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.77 dev-lang/icc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 8 Oct 2009 03:48:20 -0000 1.76
+++ ChangeLog 22 Apr 2010 09:22:56 -0000 1.77
@@ -1,6 +1,11 @@
# 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.76 2009/10/08 03:48:20 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.77 2010/04/22 09:22:56 jlec Exp $
+
+*icc-11.1.056-r1 (22 Apr 2010)
+
+ 22 Apr 2010; Justin Lecher <jlec@gentoo.org> +icc-11.1.056-r1.ebuild:
+ Bumped to EAPI=3, keyworded ~amd64-linux ~x86-linux
08 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> icc-11.1.056.ebuild:
Changed to bash brackets
1.1 dev-lang/icc/icc-11.1.056-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild?rev=1.1&content-type=text/plain
Index: icc-11.1.056-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v 1.1 2010/04/22 09:22:56 jlec Exp $
EAPI="3"
inherit rpm versionator check-reqs
PB=cproc
PACKAGEID="l_${PB}_p_${PV}"
RELEASE="$(get_version_component_range 1-2)"
BUILD="$(get_version_component_range 3)"
PID=1583
DESCRIPTION="Intel compiler suite for Linux"
HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
SRC_COM="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}"
SRC_URI="amd64? ( ${SRC_COM}_intel64.tgz )
ia64? ( ${SRC_COM}_ia64.tgz )
x86? ( ${SRC_COM}_ia32.tgz )"
LICENSE="Intel-SDP"
SLOT="0"
IUSE="eclipse +idb ipp mkl"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
RESTRICT="mirror strip binchecks"
DEPEND=""
RDEPEND="~virtual/libstdc++-3.3
amd64? ( app-emulation/emul-linux-x86-compat )
eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
DESTINATION="${EPREFIX#/}/opt/intel/Compiler/${RELEASE}/${BUILD}"
pkg_setup() {
CHECKREQS_MEMORY=1024
CHECKREQS_DISK_BUILD=2048
use idb && use ipp && use mkl && CHECKREQS_DISK_BUILD=3072
check_reqs
IARCH=ia32
use amd64 && IARCH=intel64
use ia64 && IARCH=ia64
}
src_unpack() {
unpack ${A}
mv "${WORKDIR}"/l_* "${S}"
cd "${S}"
# tbb is open source, thus built from sources in dev-cpp/tbb
rm -f rpm/*tbb*.rpm
use idb || rm -f rpm/*idb*.rpm
use ipp || rm -f rpm/*ipp*.rpm
use mkl || rm -f rpm/*mkl*.rpm
use eclipse || rm -f rpm/*cdt*.rpm
if has_version "~dev-lang/ifc-${PV}"; then
rm -f rpm/*cprolib*.rpm
use idb && built_with_use dev-lang/ifc idb && rm -f rpm/*idb*.rpm
use mkl && built_with_use dev-lang/ifc mkl && rm -f rpm/*mkl*.rpm
fi
for x in rpm/intel*.rpm; do
einfo "Extracting $(basename ${x})..."
rpm_unpack ./${x} || die "rpm_unpack ${x} failed"
done
}
link_eclipse_plugins() {
ECLIPSE_V="$1"
CDT_V="$2"
einfo "Linking eclipse (v${ECLIPSE_V}) plugin cdt (v${CDT_V})"
dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/plugins"/*; do
dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
done
for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
done
eend $?
}
src_prepare() {
# from the PURGE_UB804_FNP in pset/install_cc.sh
# rm -f "${DESTINATION}"/lib/*/*libFNP.so || die
# extract the tag function from the original install
sed -n \
-e "s|find \$DESTINATION|find ${DESTINATION}|g" \
-e "s|@\$DESTINATION|@${ROOT}${DESTINATION}|g" \
-e '/^UNTAG_CFG_FILES[[:space:]]*(/,/^}/p' \
pset/install_cc.sh > tag.sh || die
# fix world writeable files
[[ -d ${DESTINATION}/mkl ]] && chmod 644 \
${DESTINATION}/mkl/tools/{environment,builder}/* \
${DESTINATION}/mkl/tools/plugins/*/*
# remove for collision (bug #288038)
has_version "~dev-lang/ifc-${PV}" && \
rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat
}
src_install() {
einfo "Tagging"
. ./tag.sh
UNTAG_CFG_FILES
keepdir /opt/intel/licenses
einfo "Copying files"
dodir "${DESTINATION}"
cp -pPR \
${DESTINATION}/* \
"${ED}"/${DESTINATION}/ \
|| die "Copying ${PN} failed"
local envf=05icfc
cat > ${envf} <<-EOF
PATH="${EROOT}${DESTINATION}/bin/${IARCH}"
ROOTPATH="${EROOT}${DESTINATION}/bin/${IARCH}"
LDPATH="${EROOT}${DESTINATION}/lib/${IARCH}"
LIBRARY_PATH="${EROOT}${DESTINATION}/lib/${IARCH}"
NLSPATH="${EROOT}${DESTINATION}/lib/locale/en_US/%N"
MANPATH="${EROOT}${DESTINATION}/man/en_US"
EOF
if [[ ! -e "${EROOT}"etc/env.d/${envf} ]] ||
[[ -n $(diff "${EROOT}"etc/env.d/${envf} ./${envf}) ]]; then
doenvd ${envf} || die "doenvd ${envf} failed"
fi
[[ -d ${DESTINATION}/idb ]] && \
dosym ../../common/com.intel.debugger.help_1.0.0 \
${DESTINATION}/idb/gui/${IARCH}/plugins
if use eclipse; then
if has_version 'dev-util/eclipse-sdk:3.4'; then
link_eclipse_plugins "3.4" "5.0" || die
fi
if has_version 'dev-util/eclipse-sdk:3.5'; then
link_eclipse_plugins "3.5" "6.0" || die
fi
fi
}
pkg_postinst() {
elog "Make sure you have recieved the an Intel license."
elog "To receive a non-commercial license, you need to register at:"
elog "http://software.intel.com/en-us/articles/non-commercial-software-development/"
elog "Install the license file into ${EROOT}opt/intel/licenses."
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/icc: icc-11.1.056-r1.ebuild ChangeLog
@ 2010-04-23 6:17 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-04-23 6:17 UTC (permalink / raw
To: gentoo-commits
jlec 10/04/23 06:17:28
Modified: icc-11.1.056-r1.ebuild ChangeLog
Log:
Fix Sandbox Violations on non prefixed arches
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-lang/icc/icc-11.1.056-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild?r1=1.1&r2=1.2
Index: icc-11.1.056-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icc-11.1.056-r1.ebuild 22 Apr 2010 09:22:56 -0000 1.1
+++ icc-11.1.056-r1.ebuild 23 Apr 2010 06:17:28 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v 1.1 2010/04/22 09:22:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v 1.2 2010/04/23 06:17:28 jlec Exp $
EAPI="3"
@@ -32,6 +32,7 @@
eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
DESTINATION="${EPREFIX#/}/opt/intel/Compiler/${RELEASE}/${BUILD}"
+DESTINATION="${DESTINATION#/}"
pkg_setup() {
CHECKREQS_MEMORY=1024
@@ -72,11 +73,11 @@
dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/plugins"/*; do
- dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
+ dosym "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
done
for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
- dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
+ dosym "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
done
eend $?
}
@@ -88,7 +89,7 @@
# extract the tag function from the original install
sed -n \
-e "s|find \$DESTINATION|find ${DESTINATION}|g" \
- -e "s|@\$DESTINATION|@${ROOT}${DESTINATION}|g" \
+ -e "s|@\$DESTINATION|@${EROOT}${DESTINATION}|g" \
-e '/^UNTAG_CFG_FILES[[:space:]]*(/,/^}/p' \
pset/install_cc.sh > tag.sh || die
# fix world writeable files
1.78 dev-lang/icc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?r1=1.77&r2=1.78
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog 22 Apr 2010 09:22:56 -0000 1.77
+++ ChangeLog 23 Apr 2010 06:17:28 -0000 1.78
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/icc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.77 2010/04/22 09:22:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.78 2010/04/23 06:17:28 jlec Exp $
+
+ 23 Apr 2010; Justin Lecher <jlec@gentoo.org> icc-11.1.056-r1.ebuild:
+ Fix Sandbox Violations on non prefixed arches
*icc-11.1.056-r1 (22 Apr 2010)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-23 6:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 6:17 [gentoo-commits] gentoo-x86 commit in dev-lang/icc: icc-11.1.056-r1.ebuild ChangeLog Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2010-04-22 9:22 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox