diff options
| author | Brendan Fabeny <bf@FreeBSD.org> | 2011-09-24 18:36:59 +0000 |
|---|---|---|
| committer | Brendan Fabeny <bf@FreeBSD.org> | 2011-09-24 18:36:59 +0000 |
| commit | d5e301ddb7c1d15baed59bb6e2a9cc5090fb29b7 (patch) | |
| tree | 3636b30c61dd71b9e408c93f50c2e8f0708d1922 /math/atlas/files/patch-CONFIG+src+SpewMakeInc.c | |
| parent | Update to the 20110922 snapshot of GCC 4.5.4. (diff) | |
Update to 3.8.4 before the 3.10 release; clean up (substantially
reduce build times, introduce options, drop unneeded dependencies,
and make linking with ATLAS shared libraries easier)
Thanks to maho and A. Shterenlikht for review and testing, and to
mm, T. Ludwig, skreuzer, and E. Lemos de Sa for reminders or related
submissions
PR: 117923, 139169, 155650, 159876
Notes
Notes:
svn path=/head/; revision=282329
Diffstat (limited to 'math/atlas/files/patch-CONFIG+src+SpewMakeInc.c')
| -rw-r--r-- | math/atlas/files/patch-CONFIG+src+SpewMakeInc.c | 59 |
1 files changed, 52 insertions, 7 deletions
diff --git a/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c b/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c index 975591f13f3b..6f41c19512da 100644 --- a/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c +++ b/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c @@ -1,15 +1,60 @@ ---- CONFIG/src/SpewMakeInc.c.orig 2007-10-11 05:40:21.000000000 +0900 -+++ CONFIG/src/SpewMakeInc.c 2007-10-29 11:03:11.000000000 +0900 -@@ -693,14 +693,14 @@ +--- CONFIG/src/SpewMakeInc.c.orig 2011-05-14 13:33:24.000000000 -0400 ++++ CONFIG/src/SpewMakeInc.c 2011-09-06 06:06:00.000000000 -0400 +@@ -399,7 +399,8 @@ + &mhz, &ptrbits, &ncpu, comps, &gccflags, &outfile, &srcdir, + &blddir, &USEDEFL1, &USEARCHDEF, &nof77, &f2cdefs, &cdefs, &pmake, + &flapack, &smaflags, &dmaflags, &f77lib, &l2size, &targ); +- if (ncpu > 1) THREADS = 1; ++ /* if (ncpu > 1) THREADS = 1; */ ++ THREADS = 1; + if (!outfile) + fpout = stdout; + else +@@ -482,7 +483,7 @@ + fprintf(fpout, "# -------------------------------------------------\n"); + fprintf(fpout, "# Name indicating the platform to configure BLAS to\n"); + fprintf(fpout, "# -------------------------------------------------\n"); +- fprintf(fpout, " ARCH = %s", machnam[mach]); ++ fprintf(fpout, " ATLAS_ARCH = %s", machnam[mach]); + fprintf(fpout, "%d", ptrbits); + if (ISAX) + fprintf(fpout, "%s", ISAXNAM[ISAX]); +@@ -649,7 +650,7 @@ + comps[i][j-2] == 'c' && comps[i][j-1] == 'c') + break; + } +- goodgcc = (j < NCOMP) ? comps[j] : "gcc"; ++ goodgcc = (j < NCOMP) ? comps[j] : "%%CC%%"; + fprintf(fpout, " GOODGCC = %s", goodgcc); + if (gccflags) + fprintf(fpout, " %s", gccflags); +@@ -661,7 +662,7 @@ + fprintf(fpout, " %s", sp); + fprintf(fpout, "\n"); + +- fprintf(fpout, " LDFLAGS ="); ++ fprintf(fpout, " LDFLAGS = %%LDFLAGS%% "); + if (MachIsX86(mach)) + { + if (ptrbits == 32) +@@ -679,7 +680,7 @@ + fprintf(fpout, " FCLINKFLAGS = $(FLINKFLAGS)"); + if (strstr(comps[F77_], "ifort") && !OSIsWin(OS)) + fprintf(fpout, " -nofor_main"); +- fprintf(fpout, "\n ARCHIVER = ar\n"); ++ fprintf(fpout, "\n ARCHIVER = $(AR)\n"); + fprintf(fpout, " ARFLAGS = r\n"); + /* + * JF Mertens says that even x86 OS X still need ranlib for safety +@@ -702,14 +703,14 @@ fprintf(fpout, "# ------------------------------------\n"); fprintf(fpout, "# Reference and system libraries\n"); fprintf(fpout, "# ------------------------------------\n"); - fprintf(fpout, " BLASlib = \n"); - fprintf(fpout, " FBLASlib = \n"); -- fprintf(fpout, " FLAPACKlib = "); -+ fprintf(fpout, " BLASlib = -L%%LOCALBASE%%/lib -lblas\n"); -+ fprintf(fpout, " FBLASlib = -L%%LOCALBASE%%/lib -lblas\n"); -+ fprintf(fpout, " FLAPACKlib = -L%%LOCALBASE%%/lib -llapack"); ++ fprintf(fpout, " BLASlib = $(BLAS)\n"); ++ fprintf(fpout, " FBLASlib = $(BLAS)\n"); + fprintf(fpout, " FLAPACKlib = "); if (flapack) fprintf(fpout, "%s", flapack); fprintf(fpout, "\n"); fprintf(fpout, " SLAPACKlib = \n"); |