diff options
Diffstat (limited to 'lang/icc')
| -rw-r--r-- | lang/icc/Makefile | 21 | ||||
| -rw-r--r-- | lang/icc/files/patch-ia32::bin::icc | 13 | ||||
| -rw-r--r-- | lang/icc/files/patch-ia32::bin::icpc | 13 |
3 files changed, 31 insertions, 16 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 0f5ead6f9a25..0844e7d4dace 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -7,7 +7,7 @@ PORTNAME= icc PORTVERSION= 7.1.031 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= lang linux devel MASTER_SITES= DISTNAME= l_cc_pc_${PORTVERSION} @@ -41,6 +41,11 @@ ICC_SITE= http://www.intel.com/software/products/compilers/ .include <bsd.port.pre.mk> +EXTRACT_AFTER_ARGS= | tar -xf - \ + --exclude intel-isubh\*.rpm \ + --exclude \*ia64.rpm \ + --exclude flexlm64 + ICCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' CPIO?= /usr/bin/cpio @@ -118,6 +123,13 @@ post-patch: # Hack while there's no support for icc in the stdarg.h of FreeBSD. @${CP} ${FILESDIR}/stdarg.h ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/include +.if ( ${OSVERSION} >= 470101 && ${OSVERSION} < 500000 ) || \ + ( ${OSVERSION} >= 500042 ) +OBJCOPY_OPS= --redefine-sym stdin=__stdinp \ + --redefine-sym stdout=__stdoutp \ + --redefine-sym stderr=__stderrp +.endif + do-build: # Fix unresolved references @cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/assert_fail.c \ @@ -128,15 +140,12 @@ do-build: @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c -.else +.endif .for i in libcxa.a libimf.a libirc.a libircmt.a libunwind.a @${OBJCOPY} --redefine-sym __sigsetjmp=sigsetjmp \ - --redefine-sym stdin=__stdinp \ - --redefine-sym stdout=__stdoutp \ - --redefine-sym stderr=__stderrp \ + ${OBJCOPY_OPS} \ ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/lib/${i} .endfor -.endif @${AR} q ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/lib/libcxa.a ${WRKSRC}/*.o # Some magic to be able to link @${MKDIR} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper diff --git a/lang/icc/files/patch-ia32::bin::icc b/lang/icc/files/patch-ia32::bin::icc index 20854225ee39..69b3e4ff1c13 100644 --- a/lang/icc/files/patch-ia32::bin::icc +++ b/lang/icc/files/patch-ia32::bin::icc @@ -1,12 +1,13 @@ ---- ia32/bin/icc.orig Fri Jan 10 16:57:18 2003 -+++ ia32/bin/icc Fri Jan 10 17:09:38 2003 +--- ia32/bin/icc.orig Tue Oct 21 18:57:00 2003 ++++ ia32/bin/icc Tue Oct 21 19:12:23 2003 @@ -1,34 +1,72 @@ #!/bin/sh +-if [ -z INTEL_LICENSE_FILE ] +PREFIX=@@PREFIX@@ +export PREFIX; + - if [ -z INTEL_LICENSE_FILE ] ++if [ -z "$INTEL_LICENSE_FILE" ] then -INTEL_LICENSE_FILE=<INSTALLDIR>/licenses; +INTEL_LICENSE_FILE=${PREFIX}/intel/licenses; @@ -16,7 +17,8 @@ fi export INTEL_LICENSE_FILE; - if [ -z LD_LIBRARY_PATH ] +-if [ -z LD_LIBRARY_PATH ] ++if [ -z "$LD_LIBRARY_PATH" ] then - LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib; + LD_LIBRARY_PATH=${PREFIX}/intel/compiler70/ia32/lib; @@ -26,7 +28,8 @@ fi export LD_LIBRARY_PATH; - if [ -z PATH ] +-if [ -z PATH ] ++if [ -z "$PATH" ] then - PATH=<INSTALLDIR>/compiler70/ia32/bin; + PATH=${PREFIX}/intel/compiler70/ia32/bin; diff --git a/lang/icc/files/patch-ia32::bin::icpc b/lang/icc/files/patch-ia32::bin::icpc index a1539954756f..0557997d9a8b 100644 --- a/lang/icc/files/patch-ia32::bin::icpc +++ b/lang/icc/files/patch-ia32::bin::icpc @@ -1,12 +1,13 @@ ---- ia32/bin/icpc.orig Fri Jan 10 16:47:29 2003 -+++ ia32/bin/icpc Fri Jan 10 17:19:03 2003 +--- ia32/bin/icpc.orig Tue Oct 21 18:57:00 2003 ++++ ia32/bin/icpc Tue Oct 21 19:11:54 2003 @@ -1,34 +1,65 @@ #!/bin/sh +-if [ -z INTEL_LICENSE_FILE ] +PREFIX=@@PREFIX@@ +export PREFIX; + - if [ -z INTEL_LICENSE_FILE ] ++if [ -z "$INTEL_LICENSE_FILE" ] then -INTEL_LICENSE_FILE=<INSTALLDIR>/licenses; +INTEL_LICENSE_FILE=${PREFIX}/intel/licenses; @@ -16,7 +17,8 @@ fi export INTEL_LICENSE_FILE; - if [ -z LD_LIBRARY_PATH ] +-if [ -z LD_LIBRARY_PATH ] ++if [ -z "$LD_LIBRARY_PATH" ] then - LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib; + LD_LIBRARY_PATH=${PREFIX}/intel/compiler70/ia32/lib; @@ -26,7 +28,8 @@ fi export LD_LIBRARY_PATH; - if [ -z PATH ] +-if [ -z PATH ] ++if [ -z "$PATH" ] then - PATH=<INSTALLDIR>/compiler70/ia32/bin; + PATH=${PREFIX}/intel/compiler70/ia32/bin; |