diff options
| author | maho <maho@FreeBSD.org> | 2003-07-03 05:39:36 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2003-07-03 05:39:36 +0800 |
| commit | 796033bf208a6152c5e14648ad8fa9eb2ba1213b (patch) | |
| tree | cdcc2db6a055daed2f228463cf799d665b483e7c /math/atlas/files | |
| parent | c64b410e38c75615a578950e4610552346f1af2c (diff) | |
| download | freebsd-ports-gnome-796033bf208a6152c5e14648ad8fa9eb2ba1213b.tar.gz freebsd-ports-gnome-796033bf208a6152c5e14648ad8fa9eb2ba1213b.tar.zst freebsd-ports-gnome-796033bf208a6152c5e14648ad8fa9eb2ba1213b.zip | |
build both threaded/non-threaded libraries
which introduced some kludge...
Reported by: kris (broken on bento for lapack++)
Suggestion from: "Pedro F. Giffuni" <giffunip@yahoo.com>
Diffstat (limited to 'math/atlas/files')
| -rw-r--r-- | math/atlas/files/non-thread-patch | 18 | ||||
| -rw-r--r-- | math/atlas/files/patch-config.c | 7 | ||||
| -rw-r--r-- | math/atlas/files/thread-patch | 23 |
3 files changed, 41 insertions, 7 deletions
diff --git a/math/atlas/files/non-thread-patch b/math/atlas/files/non-thread-patch new file mode 100644 index 000000000000..69c632a45b6a --- /dev/null +++ b/math/atlas/files/non-thread-patch @@ -0,0 +1,18 @@ +--- config.c.orig Tue Jul 1 12:32:49 2003 ++++ config.c Tue Jul 1 12:35:09 2003 +@@ -2737,6 +2737,7 @@ + Use3DNow = IsYes('n', " ", "Use 3DNow! for computation?"); + } + ncpu = ProbeNCPU(OS, mach, targ, TOPdir); ++ ncpu = 1; // force non-threading + if (ncpu != 1) /* user may want to thread */ + { + DisplayFile("CONFIG/pthread.txt", stdout, NLINES); +@@ -3154,6 +3155,7 @@ + } + if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe"); + ++ fpout = fopen("ARCHNAME-NON-THREADED", "w"); + fprintf(fpout, "%s", ARCH); + fclose(fpout); + ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH); diff --git a/math/atlas/files/patch-config.c b/math/atlas/files/patch-config.c index 84e0fee4d10f..c3bb42b8a882 100644 --- a/math/atlas/files/patch-config.c +++ b/math/atlas/files/patch-config.c @@ -1,5 +1,5 @@ ---- config.c.orig Mon Jun 23 00:58:35 2003 -+++ config.c Sat Jun 28 16:44:25 2003 +--- config.c.orig Mon Jun 23 07:58:35 2003 ++++ config.c Tue Jul 1 12:32:49 2003 @@ -708,7 +708,7 @@ else if (mach == IA64Itan || MachIsUS(mach) || mach == Dec21164 || mach == Dec21264) @@ -66,11 +66,10 @@ } break; default:; -@@ -3136,6 +3154,9 @@ +@@ -3136,6 +3154,8 @@ } if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe"); -+ fpout = fopen("ARCHNAME", "w"); + fprintf(fpout, "%s", ARCH); + fclose(fpout); ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH); diff --git a/math/atlas/files/thread-patch b/math/atlas/files/thread-patch index 1660248f74fe..4d1a00c71f47 100644 --- a/math/atlas/files/thread-patch +++ b/math/atlas/files/thread-patch @@ -1,11 +1,28 @@ ---- config.c~ Wed Jun 11 11:25:09 2003 -+++ config.c Wed Jun 11 11:35:08 2003 +--- config.c.orig Tue Jul 1 12:35:09 2003 ++++ config.c Tue Jul 1 12:35:44 2003 @@ -79,7 +79,7 @@ char *usermmnam[2] = {"", "GOTO"}; enum USERGEMM {UG_None=0, UG_GOTO}; -int XCOMP=0, THREADS=0, USEWINF77=0, NLINES=0, ISWIN=0; -+int XCOMP=0, THREADS=1, USEWINF77=0, NLINES=0, ISWIN=0; //force threading ++int XCOMP=0, THREADS=1, USEWINF77=0, NLINES=0, ISWIN=0; // force threading char TARGNAM[512]; enum MACHTYPE mach=MACHOther; +@@ -2737,7 +2737,6 @@ + Use3DNow = IsYes('n', " ", "Use 3DNow! for computation?"); + } + ncpu = ProbeNCPU(OS, mach, targ, TOPdir); +- ncpu = 1; // force non-threading + if (ncpu != 1) /* user may want to thread */ + { + DisplayFile("CONFIG/pthread.txt", stdout, NLINES); +@@ -3155,7 +3154,7 @@ + } + if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe"); + +- fpout = fopen("ARCHNAME-NON-THREADED", "w"); ++ fpout = fopen("ARCHNAME-THREADED", "w"); + fprintf(fpout, "%s", ARCH); + fclose(fpout); + ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH); |