diff options
| author | netchild <netchild@FreeBSD.org> | 2003-04-18 09:10:22 +0000 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2003-04-18 09:10:22 +0000 |
| commit | c0690923505996e6ac7b52c520c49461ca3bb2f1 (patch) | |
| tree | 97712ff2437b7c62cbed2aa6d1439e788b9e4c60 /lang/icc | |
| parent | 409dc1af2bc12343a492f6a1a967b41da6c223b9 (diff) | |
| download | FreeBSD-ports-c0690923505996e6ac7b52c520c49461ca3bb2f1.zip FreeBSD-ports-c0690923505996e6ac7b52c520c49461ca3bb2f1.tar.gz | |
- back out special '-I' handling, it causes problems with the stlport [1]
(this may break ports which depend upon OpenSSL from ports which was
compiled as a base system replacement because it includes a system
header directory again)
- ignore "-pipe" in CFLAGS, this should unbreak some ports with hardcoded
"-pipe"
Noticed by: Krzysztof Parzyszek <kristof@swissmail.org> [1]
Tested by: Krzysztof Parzyszek <kristof@swissmail.org> [1]
Diffstat (limited to 'lang/icc')
| -rw-r--r-- | lang/icc/Makefile | 2 | ||||
| -rw-r--r-- | lang/icc/files/patch-ia32::bin::icc | 8 | ||||
| -rw-r--r-- | lang/icc/files/patch-ia32::bin::icpc | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 8fc2fa7..31e1394 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -7,7 +7,7 @@ PORTNAME= icc PORTVERSION= 7.1.006 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang linux devel MASTER_SITES= DISTNAME= l_cc_p_${PORTVERSION} diff --git a/lang/icc/files/patch-ia32::bin::icc b/lang/icc/files/patch-ia32::bin::icc index 5f637a0..2085422 100644 --- a/lang/icc/files/patch-ia32::bin::icc +++ b/lang/icc/files/patch-ia32::bin::icc @@ -1,6 +1,6 @@ --- ia32/bin/icc.orig Fri Jan 10 16:57:18 2003 +++ ia32/bin/icc Fri Jan 10 17:09:38 2003 -@@ -1,34 +1,68 @@ +@@ -1,34 +1,72 @@ #!/bin/sh +PREFIX=@@PREFIX@@ @@ -71,10 +71,14 @@ + unset val1 + set -- "$@" "-Qoption,ld,-MT" + fi ++ if [ "${val1}" = "-pipe" ] ; then ++ unset val1 ++ set -- "$@" ++ fi + set -- "$@" "$val1" + i=$(($i+1)) + done -+ exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin -I${PREFIX}/intel/compiler70/ia32/include -I${PREFIX}/intel/compiler70/ia32/include/substitute_headers "$@"; ++ exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin "$@"; else - exec -a "<INSTALLDIR>/compiler70/ia32/bin/icc" <INSTALLDIR>/compiler70/ia32/bin/iccbin; + exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin; diff --git a/lang/icc/files/patch-ia32::bin::icpc b/lang/icc/files/patch-ia32::bin::icpc index 712e192..a153995 100644 --- a/lang/icc/files/patch-ia32::bin::icpc +++ b/lang/icc/files/patch-ia32::bin::icpc @@ -1,6 +1,6 @@ --- ia32/bin/icpc.orig Fri Jan 10 16:47:29 2003 +++ ia32/bin/icpc Fri Jan 10 17:19:03 2003 -@@ -1,34 +1,61 @@ +@@ -1,34 +1,65 @@ #!/bin/sh +PREFIX=@@PREFIX@@ @@ -64,10 +64,14 @@ + unset val1 + set -- "$@" "-Qoption,ld,-MT" + fi ++ if [ "${val1}" = "-pipe" ] ; then ++ unset val1 ++ set -- "$@" ++ fi + set -- "$@" "$val1" + i=$(($i+1)) + done -+ exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin -I${PREFIX}/intel/compiler70/ia32/include -I${PREFIX}/intel/compiler70/ia32/include/substitute_headers "$@"; ++ exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin "$@"; else - exec -a "<INSTALLDIR>/compiler70/ia32/bin/icpc" <INSTALLDIR>/compiler70/ia32/bin/icpcbin; + exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin; |
