From owner-freebsd-ports Sat Mar 30 17:40:11 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9CCC137B400 for ; Sat, 30 Mar 2002 17:40:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2V1e1035934; Sat, 30 Mar 2002 17:40:01 -0800 (PST) (envelope-from gnats) Received: from homeip.net (r96-12.bas1.srl.dublin.eircom.net [159.134.96.12]) by hub.freebsd.org (Postfix) with ESMTP id 1D43B37B41A for ; Sat, 30 Mar 2002 17:35:01 -0800 (PST) Received: (from root@localhost) by homeip.net (8.11.6/8.11.6) id g2V1YxH74629; Sun, 31 Mar 2002 02:34:59 +0100 (IST) (envelope-from nick) Message-Id: <200203310134.g2V1YxH74629@homeip.net> Date: Sun, 31 Mar 2002 02:34:59 +0100 (IST) From: Nick Hilliard Reply-To: Nick Hilliard To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/36555: ports/lang/icc doesn't work from a csh prompt Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 36555 >Category: ports >Synopsis: ports/lang/icc doesn't work from a csh prompt >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Mar 30 17:40:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Nick Hilliard >Release: FreeBSD 4.5-RELEASE-p1 i386 >Organization: Network Ability Ltd. >Environment: System: FreeBSD flapjack.netability.ie 4.5-RELEASE-p1 FreeBSD 4.5-RELEASE-p1 #0: Mon Feb 25 13:52:31 GMT 2002 nick@flapjack.netability.ie:/data/usr.obj/data/usr.src/sys/FLAPJACK i386 >Description: The Intel C compile port doesn't work if you're using a C shell due to a silly bug in opt/intel/compiler50/ia32/bin/iccvars.csh, which reads by default: setenv INTEL_FLEXLM_LICENSE=/licenses Clearly, this doesn't work and should read: setenv INTEL_FLEXLM_LICENSE /licenses Without changing this, the compiler can't find the license manager config and bombs out. >How-To-Repeat: >Fix: Mmmm, several possibilities here. The problem is that iccvars.csh is modified with pre-patch in the Makefile, which means that putting a patch into files/ will prevent the user from specifying a different installation location. The options are to 1) move the sed command for iccvars.csh in pre-patch to post-patch, and put a normal patch for iccvars.csh in the files/ directory (probably the best solution), or 2) write up some really gross-looking sed patch to mutilate iccvars.csh after it's been patched (not recommended). Here's a patch for the first suggestion. diff -N -ur icc.b0rked/Makefile icc/Makefile --- icc.b0rked/Makefile Tue Mar 26 17:01:02 2002 +++ icc/Makefile Sun Mar 31 02:30:29 2002 @@ -51,6 +51,14 @@ xargs -0 ${CHMOD} a-x,g-w .endfor @${FIND} ${WRKSRC}/opt -type d -print0 | xargs -0 ${CHMOD} go-w +.for i in icc iccfilt icid icpc icpi mcpcom profmerge proforder + @brandelf -t Linux ${WRKSRC}/opt/intel/compiler50/ia32/bin/${i} +.endfor +.for i in intelpto lmgrd lmutil + @brandelf -t Linux ${WRKSRC}/opt/intel/compiler50/flexlm/${i} +.endfor + +post-patch: .for i in ia32/bin/iccvars.csh ia32/bin/iccvars.sh ia32/bin/icc.cfg \ ia32/bin/icpc.cfg docs/iccsupport @${SED} 's@\@${PREFIX}/intel@g' \ @@ -60,14 +68,6 @@ ${WRKSRC}/opt/intel/compiler50/${i} @${CHMOD} 755 ${WRKSRC}/opt/intel/compiler50/${i} .endfor -.for i in icc iccfilt icid icpc icpi mcpcom profmerge proforder - @brandelf -t Linux ${WRKSRC}/opt/intel/compiler50/ia32/bin/${i} -.endfor -.for i in intelpto lmgrd lmutil - @brandelf -t Linux ${WRKSRC}/opt/intel/compiler50/flexlm/${i} -.endfor - -post-patch: @${RM} ${WRKSRC}/opt/intel/compiler50/ia32/include/yvals.h.orig .if defined(NOPORTDOCS) @${RM} -rf ${WRKSRC}/opt/intel/compiler50/docs diff -N -ur icc.b0rked/files/patch-iccvars.csh icc/files/patch-iccvars.csh --- icc.b0rked/files/patch-iccvars.csh Thu Jan 1 01:00:00 1970 +++ icc/files/patch-iccvars.csh Sun Mar 31 02:32:24 2002 @@ -0,0 +1,10 @@ +--- work/opt/intel/compiler50/ia32/bin/iccvars.csh.orig Sun Mar 31 02:05:56 2002 ++++ work/opt/intel/compiler50/ia32/bin/iccvars.csh Sun Mar 31 02:06:08 2002 +@@ -24,6 +24,6 @@ + setenv LD_LIBRARY_PATH $IA32ROOT/lib:$IA32_SAVE_LD_LIBRARY_PATH + endif + +-setenv INTEL_FLEXLM_LICENSE=/licenses ++setenv INTEL_FLEXLM_LICENSE /licenses + + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message