diff options
| author | maho <maho@FreeBSD.org> | 2004-12-17 13:40:56 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-12-17 13:40:56 +0800 |
| commit | d18ec452c6f14061f69b3a164db6896c1f0c95ab (patch) | |
| tree | 766a571e7c454acfca0e8840a964aa88daaedaf2 /lang/ifc/files | |
| parent | 017946dc08fa0aae0a74ed11d098bac0dbc75cab (diff) | |
| download | freebsd-ports-gnome-d18ec452c6f14061f69b3a164db6896c1f0c95ab.tar.gz freebsd-ports-gnome-d18ec452c6f14061f69b3a164db6896c1f0c95ab.tar.zst freebsd-ports-gnome-d18ec452c6f14061f69b3a164db6896c1f0c95ab.zip | |
Update to 8.1.023
and also Solved the dynamic linkage problem.
PR: 74373
Submitted by: Alexander S. Usov <usov at kvip88.kvi.nl>
Diffstat (limited to 'lang/ifc/files')
| -rw-r--r-- | lang/ifc/files/exclude | 2 | ||||
| -rw-r--r-- | lang/ifc/files/ld.c | 7 | ||||
| -rw-r--r-- | lang/ifc/files/patch-bin::ifort | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/lang/ifc/files/exclude b/lang/ifc/files/exclude index fbbdf6dc6d8c..f3a55f2908de 100644 --- a/lang/ifc/files/exclude +++ b/lang/ifc/files/exclude @@ -15,7 +15,7 @@ lib/libifcoremt.so lib/libifcoremt.so.5 lib/libifport.so lib/libifport.so.5 -lib/libimf.so lib/libompstub.a +lib/libsvml.so lib/libunwind.so lib/libunwind.so.5 diff --git a/lang/ifc/files/ld.c b/lang/ifc/files/ld.c index fb304c1854ca..475b7fdce538 100644 --- a/lang/ifc/files/ld.c +++ b/lang/ifc/files/ld.c @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: /tmp/pcvs/ports/lang/ifc/files/ld.c,v 1.6 2004-05-26 14:45:21 maho Exp $"); +__FBSDID("$FreeBSD: /tmp/pcvs/ports/lang/ifc/files/ld.c,v 1.7 2004-12-17 05:40:56 maho Exp $"); #include <err.h> #include <stdio.h> @@ -270,13 +270,14 @@ main(int argc, char *argv[], char *envp[]) } /* - * Force libcxa, libcxaguard and libunwind to static linkage, + * Force libcxa, libcxaguard, libimf and libunwind to static linkage, * since the dynamic versions have glibc dependencies. * Don't add superfluous -Bdynamic. */ if (ARGCMP(i, "-Bdynamic") && i < argc - 1) { if (ARGCMP(i + 1, "-lcxa") || ARGCMP(i + 1, "-lcxaguard") || + ARGCMP(i + 1, "-limf") || ARGCMP(i + 1, "-lunwind")) { addarg(&al, "-Bstatic"); continue; @@ -290,7 +291,7 @@ main(int argc, char *argv[], char *envp[]) /* Don't add superfluous -Bstatic. */ if (ARGCMP(i, "-Bstatic") && i < argc - 1 && (ARGCMP(i + 1, "-lcprts") || ARGCMP(i + 1, "-lgcc_s") || - ARGCMP(i + 1, "-lunwind"))) + ARGCMP(i + 1, "-limf") || ARGCMP(i + 1, "-lunwind"))) continue; /* diff --git a/lang/ifc/files/patch-bin::ifort b/lang/ifc/files/patch-bin::ifort index ba49dbea913a..959affeab09c 100644 --- a/lang/ifc/files/patch-bin::ifort +++ b/lang/ifc/files/patch-bin::ifort @@ -1,17 +1,19 @@ ---- bin/ifort.orig Tue Dec 9 19:55:12 2003 -+++ bin/ifort Tue Dec 9 20:12:01 2003 -@@ -1,6 +1,9 @@ +--- bin/ifort.orig Thu Nov 25 15:41:18 2004 ++++ bin/ifort Thu Nov 25 15:47:00 2004 +@@ -1,6 +1,11 @@ #!/bin/sh -if [ -z INTEL_LICENSE_FILE ] +ICC_LOCALBASE=%%ICC_LOCALBASE%% +export ICC_LOCALBASE; ++GXX_ROOT=<INSTALLDIR>/lib ++export GXX_ROOT + +if [ -z "$INTEL_LICENSE_FILE" ] then INTEL_LICENSE_FILE=<INSTALLDIR>/licenses; else -@@ -8,7 +11,7 @@ +@@ -8,7 +13,7 @@ fi export INTEL_LICENSE_FILE; @@ -20,7 +22,7 @@ then LD_LIBRARY_PATH=<INSTALLDIR>/lib; else -@@ -16,7 +19,7 @@ +@@ -16,7 +21,7 @@ fi export LD_LIBRARY_PATH; @@ -29,7 +31,7 @@ then PATH=<INSTALLDIR>/bin; else -@@ -24,11 +27,31 @@ +@@ -24,11 +29,31 @@ fi export PATH; |