Added amd64 directive for better compatibility with gcc. Thanks Matt Turner, bug #233739

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64

5 files changed, 38 insertions, 15 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index fc7722dc37af..efad0976623e 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.62 2008/07/10 16:47:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.63 2008/08/22 17:16:46 bicatali Exp $
+
+*icc-10.1.017-r1 (22 Aug 2008)
+
+  22 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/icc-add-amd64-preprocessor-directives.patch, -icc-10.1.013.ebuild,
+  +icc-10.1.017-r1.ebuild:
+  Added amd64 directive for better compatibility with gcc. Thanks Matt
+  Turner, bug #233739
 
   10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> icc-10.1.017.ebuild:
   Removed slotting, not ready yet.
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 33b4009089f1..4d71e64436eb 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX icc-add-amd64-preprocessor-directives.patch 397 RMD160 63ad40982bf7b4dbdfc28037e5b31e94a8b55ea2 SHA1 7f4fdf6be8d9fd98557df43e4d3eef208aef6d60 SHA256 96de3a7331d55963300feda7e33cd5f04211af9bba31ec467b1277340a6a7e4f
 DIST l_cc_c_10.0.026_ia32.tar.gz 41278910 RMD160 7c2046d1c8bfbf98639c4cc1d77db0ccf5fd5637 SHA1 b44fdb3f91df847b03307b96256ea83252983432 SHA256 36258784fba6550a117b30e9bfd48d414d8986b95e802191be0b37005eedc0f6
 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
-DIST l_cc_p_10.1.013_ia32.tar.gz 50690142 RMD160 48f0edcc39de1cc45be03c9cb899cdd0d811812e SHA1 2f0f4f3d0c3e366bc33d89eb06f9eecd3622b977 SHA256 edd3ffa6f148ed54fd7b26109eb945516169e8a9daf09962a3a6919539d538d1
-DIST l_cc_p_10.1.013_ia64.tar.gz 72808364 RMD160 1f8f746dc53d100a3ee4c86ba6de840d6d002d52 SHA1 f5ce8a610e2619e7264c8dcaf485c9950368c825 SHA256 0966dd401e8c641f944cb45ed03cfafbf7df14fdd4ba2100e6a5b6e9a1a9ed07
-DIST l_cc_p_10.1.013_intel64.tar.gz 40204037 RMD160 499242587d2a02085f09dc2ea58c64d14c730b0e SHA1 7264106093727c1792423c1f166049b46285a394 SHA256 2aa519f5aaa1951c02e3e1fd51aac4b248221bd2ff32ebe82d6bdfa29a2813da
 DIST l_cc_p_10.1.017_ia32.tar.gz 50917413 RMD160 41f86deaab128065d43fbd7e711dbb235b235fbb SHA1 5a3fe5327a29ec96d988dda9b482ae17d1da1d55 SHA256 9211c2bcad5690b34ac616b195a9bd5b801f91a75213b6984037f94a551e14b9
 DIST l_cc_p_10.1.017_ia64.tar.gz 72917743 RMD160 398c3c991b9429702619a5d1574404a279e87be9 SHA1 7c7e42a2aeef634394ca854a83753b9d35249e93 SHA256 15c5a28b9310b05f5a0227a35f36bdb9a2ae0729a94f09d60c91965bd157f5cb
 DIST l_cc_p_10.1.017_intel64.tar.gz 40469760 RMD160 34a08752bd86631db6b8edfffb68bc4b9825295b SHA1 af25ab180e1fabaa65ef75884b59010a099d8944 SHA256 a5288827ed4c7dd5f931dfef3d197f1a8cbcf5a6d2364f48fc2823888b583fb6
-EBUILD icc-10.0.026.ebuild 3123 RMD160 15ad5fe75e3d346c17c3e56a409f80a7cf3d1ada SHA1 28314c5cb1785578b0762bd709063fcd0fda7c6c SHA256 986ea095638d8b66ee025af99eb0b0296a80b5c1bd7f29e0c2b9546717113f09
-EBUILD icc-10.1.013.ebuild 2852 RMD160 b2ea6acbbedc0cd19ce0c0f15694527e45999c76 SHA1 f2c1f5b06b27241869e68a007017df76d2124563 SHA256 dd2175a032c7fefc343a5c7a86dea966f58e91e1d7ba9bfe58043f2775cf94b6
+EBUILD icc-10.0.026.ebuild 3124 RMD160 cd9ce8e7c9c5c0fad21c30d72925ad6ea0b724a1 SHA1 dfe5acbde8dc25b75b17727e17a9aeeff16897a1 SHA256 313b003b1a231cbdae308e5f50a458b063c72dadf260096a6077fb0f47e6bb4e
+EBUILD icc-10.1.017-r1.ebuild 2929 RMD160 9d3b1313efc5c983b2b78c0e16441bc4dea794a0 SHA1 7f73bf458611936203682f47e34a4edd672e7835 SHA256 3d49611285932687f5874428bdb788094948e1c97ca4cbc6c71b3e29131a2a0e
 EBUILD icc-10.1.017.ebuild 2860 RMD160 b6a5a8c6a1d260cce4c75263efce54b566498236 SHA1 b02c8681a7bb43069116cfac06da7bd9e525ef5b SHA256 f5062067997b71d5de683c02d34f2b09a912ad194d0fdf01edf8f07c30591bd2
-MISC ChangeLog 13086 RMD160 bac325bb08c5c08a11a4b0a954e93f76c103e64c SHA1 7e200afc833130882fc1d799035cecb9030c88fd SHA256 c4ff3ad71e5ab80c360b9eb56058c0a93ca05472f2af8b84d2eb51f192d76d69
+MISC ChangeLog 13370 RMD160 04fd67ecbea5d304b45ce3dcd18b52a41b147114 SHA1 2b49da593e3ad2c1f0d0faae22d468560dc38f17 SHA256 4ef4d2521103959c8ae694bf517a177660c8f607624dad6ac7413600614046b9
 MISC metadata.xml 691 RMD160 88ccdebd0a4ae8feb2ae82d8aaf890859da245b4 SHA1 03e1409b044aeace78453837f794cf7e65df1ed1 SHA256 9d137d042eb138203681cfab942ed2ceefe794875330811bc4980a909b35b3e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh2PVYACgkQ1ycZbhPLE2CrKwCghjo6xR6oWP9L+qjdfzW5CQHz
-DlsAnjno8CCeaKEe3ZZuxLw98w7OtnWc
-=r1DP
+iEYEARECAAYFAkiu9I0ACgkQ1ycZbhPLE2BYWwCgmqlelubx10IpFzi+5QJitZPU
+NNIAoLNWvUE+iVx51njrcPwt9qa5MlTM
+=+Gp2
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/icc/files/icc-add-amd64-preprocessor-directives.patch b/dev-lang/icc/files/icc-add-amd64-preprocessor-directives.patch
new file mode 100644
index 000000000000..43e76c0f8e52
--- /dev/null
+++ b/dev-lang/icc/files/icc-add-amd64-preprocessor-directives.patch
@@ -0,0 +1,16 @@
+--- opt/intel/cce/10.1.017/include/stddef.h	2008-08-02 15:06:51.000000000 -0400
++++ opt/intel/cce/10.1.017/include/stddef.h	2008-08-02 15:07:06.000000000 -0400
+@@ -5,6 +5,13 @@
+ #define _STDDEF
+ */
+ 
++#ifndef __amd64
++#define __amd64 __x86_64
++#endif
++#ifndef __amd64__
++#define __amd64__ __x86_64__
++#endif
++
+ #ifdef __QNX__ /* Just take QNX one */
+ #include_next <stddef.h>
+ #else /* __QNX__ */
diff --git a/dev-lang/icc/icc-10.0.026.ebuild b/dev-lang/icc/icc-10.0.026.ebuild
index c81bef33d48a..799104c7858e 100644
--- a/dev-lang/icc/icc-10.0.026.ebuild
+++ b/dev-lang/icc/icc-10.0.026.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-10.0.026.ebuild,v 1.12 2007/12/24 19:35:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-10.0.026.ebuild,v 1.13 2008/08/22 17:16:46 bicatali Exp $
 
 inherit rpm eutils
 
diff --git a/dev-lang/icc/icc-10.1.013.ebuild b/dev-lang/icc/icc-10.1.017-r1.ebuild
index fae954416bf6..1a08c1de1245 100644
--- a/dev-lang/icc/icc-10.1.013.ebuild
+++ b/dev-lang/icc/icc-10.1.017-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-10.1.013.ebuild,v 1.1 2008/03/13 21:25:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-10.1.017-r1.ebuild,v 1.1 2008/08/22 17:16:46 bicatali Exp $
 
 inherit rpm eutils check-reqs
 
-PID=964
+PID=1136
 PB=cc
 PEXEC="icc icpc"
 DESCRIPTION="Intel C/C++ optimized compiler for Linux"
@@ -56,6 +56,7 @@ src_unpack() {
 		einfo "Extracting $(basename ${x})..."
 		rpm_unpack "${S}/${x}" || die "rpm_unpack ${x} failed"
 	done
+	epatch "${FILESDIR}/icc-add-amd64-preprocessor-directives.patch"
 
 	einfo "Fixing paths and tagging"
 	cd "${S}"/${INSTALL_DIR}/bin
@@ -101,6 +102,6 @@ pkg_postinst () {
 	elog "Read the website for more information on this license:"
 	elog "${HOMEPAGE}"
 	elog "Then put the license file into ${ROOT}/opt/intel/licenses."
-	elog "\nTo use ${PN} issue first \n\tsource /etc/profile"
+	elog "\nTo use ${PN} issue first \n\tsource ${ROOT}/etc/profile"
 	elog "Debugger is installed with dev-lang/idb"
 }