Date: Tue, 25 May 2004 00:38:00 +0900 (JST) From: Masakazu HIGAKI <higamasa@dream.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67127: [PATCH] lang/ifc: fix for ports/66514 problem and update to 8.0.046 Message-ID: <200405241538.i4OFc0u8042791@hig_muramasa.shio.naps.kishou.go.jp> Resent-Message-ID: <200405241540.i4OFeLLM061867@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67127
>Category: ports
>Synopsis: [PATCH] lang/ifc: fix for ports/66514 problem and update to 8.0.046
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon May 24 08:40:21 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Masakazu HIGAKI
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hig_muramasa 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Sun Apr 11 15:56:01 JST 2004 root@hig_muramasa:/sys/i386/compile/MURAMASA i386
>Description:
1) fail to link a program containing a "pause" statement
2) Taking this opportunity, I recommend the update to ifort 8.0.046
>How-To-Repeat:
as described in ports/66514
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/ifc/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile 9 Apr 2004 15:19:25 -0000 1.29
+++ Makefile 24 May 2004 15:18:57 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= ifc
-PORTVERSION= 8.0.039.p044.1
+PORTVERSION= 8.0.046
CATEGORIES= lang linux devel
MASTER_SITES=
DISTNAME= l_fc_pc_${PORTVERSION:C/\.p.+$//}
@@ -166,6 +166,7 @@
--redefine-sym ftruncate=l_ftruncate \
--redefine-sym lseek64=lseek \
--redefine-sym open64=open \
+ --redefine-sym fopen64=fopen \
--redefine-sym freopen64=freopen \
--redefine-sym creat64=creat \
--redefine-sym ftruncate64=ftruncate \
@@ -178,6 +179,8 @@
--redefine-sym __strtoll_internal=strtoll \
--redefine-sym __strtoul_internal=strtoul \
--redefine-sym __strtoull_internal=strtoull \
+ --redefine-sym _IO_getc=getc \
+ --redefine-sym _IO_putc=putc \
${WRKSRC}/opt/${COMPILERDIR}/lib/lib${i}.a
.endfor
@${AR} q ${WRKSRC}/opt/${COMPILERDIR}/lib/libcxa.a ${WRKSRC}/*.o
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/lang/ifc/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 9 Apr 2004 15:19:25 -0000 1.10
+++ distinfo 24 May 2004 15:18:57 -0000
@@ -1,4 +1,2 @@
-MD5 (l_fc_pc_8.0.039.tar.gz) = 96fa6b3e9688b17d3e46886ba9ba1a46
-SIZE (l_fc_pc_8.0.039.tar.gz) = 85043840
-MD5 (l_fc_pc_8.0.039_pe044.1.tar.gz) = b64e5fdb3e24a2ab87711beee1f6bc76
-SIZE (l_fc_pc_8.0.039_pe044.1.tar.gz) = 10378600
+MD5 (l_fc_pc_8.0.046.tar.gz) = 73b204ac0eced3fc337a00c4264956df
+SIZE (l_fc_pc_8.0.046.tar.gz) = 84289874
Index: files/ld.c
===================================================================
RCS file: /home/ncvs/ports/lang/ifc/files/ld.c,v
retrieving revision 1.5
diff -u -r1.5 ld.c
--- files/ld.c 31 Jan 2004 23:32:41 -0000 1.5
+++ files/ld.c 24 May 2004 15:18:58 -0000
@@ -190,7 +190,9 @@
/* ifc8 */
ARGCMP(i, "-lpthread") ||
/* ifc8 */
- ARGCMP(i, "-PIC"))
+ ARGCMP(i, "-PIC") ||
+ (ARGCMP(i, "-m") && i<argc-1 && ARGCMP(i+1, "elf_i386")) ||
+ (ARGCMP(i, "elf_i386") && i != 0 && ARGCMP(i-1, "-m")))
continue;
/* prepend "-melf_i386" to the commandline */
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405241538.i4OFc0u8042791>