diff options
| author | netchild <netchild@FreeBSD.org> | 2002-08-05 04:40:14 +0800 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2002-08-05 04:40:14 +0800 |
| commit | 26d4961252d51bdb277cb2f9f96b105dc415f21c (patch) | |
| tree | 53207dbf100919ed5932e6a8ad69785469452d0a /lang/icc | |
| parent | 824b00d389cd5aa00c9452d24e6c151ce587b26f (diff) | |
| download | freebsd-ports-gnome-26d4961252d51bdb277cb2f9f96b105dc415f21c.tar.gz freebsd-ports-gnome-26d4961252d51bdb277cb2f9f96b105dc415f21c.tar.zst freebsd-ports-gnome-26d4961252d51bdb277cb2f9f96b105dc415f21c.zip | |
1) The new icc doesn't respect icc.cfg, solve this issue.
2) An actual rpm2cpio talks a little bit more, redirect sdterr to /dev/null.
Noticed by: marius@alchemy.franken.de (1)
Diffstat (limited to 'lang/icc')
| -rw-r--r-- | lang/icc/Makefile | 11 | ||||
| -rw-r--r-- | lang/icc/pkg-plist | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 1bb8da854a69..551a9d32d44f 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -7,6 +7,7 @@ PORTNAME= icc PORTVERSION= 6.0.159 +PORTREVISION= 1 CATEGORIES= lang linux MASTER_SITES= DISTNAME= l_cc_pu_6.0.159 @@ -45,7 +46,7 @@ post-extract: # intel-ecc6-6.0-159.ia64.rpm \ # intel-eldb6-6.0-228.ia64.rpm \ # intel-esubh6-6.0-159.ia64.rpm - @cd ${WRKSRC}; rpm2cpio ${i} | cpio -idu --quiet + @cd ${WRKSRC}; rpm2cpio 2>/dev/null ${i} | cpio -idu --quiet .endfor pre-patch: @@ -67,7 +68,7 @@ post-patch: # Correct some paths and patch some files .for i in ia32/bin/icc ia32/bin/icc.cfg ia32/bin/iccvars.csh \ ia32/bin/iccvars.sh ia32/bin/icpc ia32/bin/icpc.cfg docs/csupport - @${SED} 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:Intel(R) C++ Compiler for Linux:g' \ + @${SED} 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:${DISTNAME}:g' \ ${WRKSRC}/opt/intel/compiler60/${i} \ >${WRKSRC}/opt/intel/compiler60/${i}.seded @${MV} -f ${WRKSRC}/opt/intel/compiler60/${i}.seded \ @@ -80,7 +81,11 @@ post-patch: @${RM} -rf ${WRKSRC}/opt/intel/compiler60/docs .endif # Provide a more FreeBSD'ish compile environment - @${ECHO} -e "\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/compiler60/ia32/bin/icc.cfg +.for i in icc.cfg icpc.cfg + @${ECHO} -e "\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/compiler60/ia32/bin/${i} + @${CHMOD} a-x,g-w ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i} +.endfor + @cd ${WRKSRC}/opt/intel/compiler60/ia32/bin/ && ${LN} -s icc.cfg iccbin.cfg && ${LN} -s icpc.cfg icpcbin.cfg # \n-Qlocation,ld,/usr/bin\n\n-sox-\n # Some magic to be able to link @${SED} 's:@@PREFIX@@:${PREFIX}:g' ${FILESDIR}/ld >${WRKSRC}/opt/intel/compiler60/ia32/bin/ld diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist index 7b578d4558c0..63595e62ddde 100644 --- a/lang/icc/pkg-plist +++ b/lang/icc/pkg-plist @@ -685,6 +685,7 @@ intel/compiler60/ia32/bin/INTEL intel/compiler60/ia32/bin/icc intel/compiler60/ia32/bin/icc.cfg intel/compiler60/ia32/bin/iccbin +intel/compiler60/ia32/bin/iccbin.cfg intel/compiler60/ia32/bin/iccfilt intel/compiler60/ia32/bin/iccvars.csh intel/compiler60/ia32/bin/iccvars.sh @@ -692,6 +693,7 @@ intel/compiler60/ia32/bin/icid intel/compiler60/ia32/bin/icpc intel/compiler60/ia32/bin/icpc.cfg intel/compiler60/ia32/bin/icpcbin +intel/compiler60/ia32/bin/icpcbin.cfg intel/compiler60/ia32/bin/icpi intel/compiler60/ia32/bin/ld intel/compiler60/ia32/bin/lmgrd.intel |