aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2004-01-12 00:46:43 +0800
committernetchild <netchild@FreeBSD.org>2004-01-12 00:46:43 +0800
commitefe0b84b6eb1148dea1a80c9b5cdfa233c66a700 (patch)
tree2dff0cf272c09919330269f7c73f4195f1767e1b /lang
parentf85e865a838beb0e4630619216ac84e4e2a50914 (diff)
downloadfreebsd-ports-gnome-efe0b84b6eb1148dea1a80c9b5cdfa233c66a700.tar.gz
freebsd-ports-gnome-efe0b84b6eb1148dea1a80c9b5cdfa233c66a700.tar.zst
freebsd-ports-gnome-efe0b84b6eb1148dea1a80c9b5cdfa233c66a700.zip
Urgs... fix the patches, so they actually result in a working icc...
Noticed by: Marius Strobl <marius@alchemy.franken.de>
Diffstat (limited to 'lang')
-rw-r--r--lang/icc7/files/patch-ia32::bin::icc16
-rw-r--r--lang/icc7/files/patch-ia32::bin::icpc16
2 files changed, 16 insertions, 16 deletions
diff --git a/lang/icc7/files/patch-ia32::bin::icc b/lang/icc7/files/patch-ia32::bin::icc
index a671913fa720..6141a035cc58 100644
--- a/lang/icc7/files/patch-ia32::bin::icc
+++ b/lang/icc7/files/patch-ia32::bin::icc
@@ -10,10 +10,10 @@
+if [ -z "$INTEL_LICENSE_FILE" ]
then
-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
++INTEL_LICENSE_FILE=${ICC_LOCALBASE}/intel/licenses;
else
-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${ICC_LOCALBASE}/intel/licenses;
fi
export INTEL_LICENSE_FILE;
@@ -21,10 +21,10 @@
+if [ -z "$LD_LIBRARY_PATH" ]
then
- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib;
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler70/ia32/lib;
++ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib;
else
- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
++ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
fi
export LD_LIBRARY_PATH;
@@ -32,10 +32,10 @@
+if [ -z "$PATH" ]
then
- PATH=<INSTALLDIR>/compiler70/ia32/bin;
-+ PATH=${PREFIX}/intel/compiler70/ia32/bin;
++ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin;
else
- PATH=<INSTALLDIR>/compiler70/ia32/bin:$PATH;
-+ PATH=${PREFIX}/intel/compiler70/ia32/bin:$PATH;
++ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin:$PATH;
fi
export PATH;
@@ -81,8 +81,8 @@
+ set -- "$@" "$val1"
+ i=$(($i+1))
+ done
-+ exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin "$@";
++ exec ${ICC_LOCALBASE}/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;
++ exec ${ICC_LOCALBASE}/intel/compiler70/ia32/bin/iccbin;
fi
diff --git a/lang/icc7/files/patch-ia32::bin::icpc b/lang/icc7/files/patch-ia32::bin::icpc
index 2777cf0bb24e..a1034fe92498 100644
--- a/lang/icc7/files/patch-ia32::bin::icpc
+++ b/lang/icc7/files/patch-ia32::bin::icpc
@@ -10,10 +10,10 @@
+if [ -z "$INTEL_LICENSE_FILE" ]
then
-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
++INTEL_LICENSE_FILE=${ICC_LOCALBASE}/intel/licenses;
else
-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${ICC_LOCALBASE}/intel/licenses;
fi
export INTEL_LICENSE_FILE;
@@ -21,10 +21,10 @@
+if [ -z "$LD_LIBRARY_PATH" ]
then
- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib;
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler70/ia32/lib;
++ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib;
else
- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
++ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
fi
export LD_LIBRARY_PATH;
@@ -32,10 +32,10 @@
+if [ -z "$PATH" ]
then
- PATH=<INSTALLDIR>/compiler70/ia32/bin;
-+ PATH=${PREFIX}/intel/compiler70/ia32/bin;
++ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin;
else
- PATH=<INSTALLDIR>/compiler70/ia32/bin:$PATH;
-+ PATH=${PREFIX}/intel/compiler70/ia32/bin:$PATH;
++ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin:$PATH;
fi
export PATH;
@@ -74,8 +74,8 @@
+ set -- "$@" "$val1"
+ i=$(($i+1))
+ done
-+ exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin "$@";
++ exec ${ICC_LOCALBASE}/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;
++ exec ${ICC_LOCALBASE}/intel/compiler70/ia32/bin/icpcbin;
fi