Page MenuHomeFreeBSD
Differential D1140 Diff 2351 math/atlas/files/patch-CONFIG+src+SpewMakeInc.c

Changeset View

Standalone View

View Options

math/atlas/files/patch-CONFIG+src+SpewMakeInc.c

--- CONFIG/src/SpewMakeInc.c.orig 2011-05-14 13:33:24.000000000 -0400 --- CONFIG/src/SpewMakeInc.c.orig 2014-07-10 18:22:02.000000000 +0200
+++ CONFIG/src/SpewMakeInc.c 2011-09-06 06:06:00.000000000 -0400 +++ CONFIG/src/SpewMakeInc.c 2014-11-07 21:38:02.000000000 +0100
@@ -399,7 +399,8 @@ @@ -540,7 +540,7 @@
&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, "# -------------------------------------------------\n");
fprintf(fpout, "# Name indicating the platform to configure BLAS to\n"); fprintf(fpout, "# Name indicating the platform to configure BLAS to\n");
fprintf(fpout, "# -------------------------------------------------\n"); fprintf(fpout, "# -------------------------------------------------\n");
Context not available.
fprintf(fpout, "%d", ptrbits); fprintf(fpout, "%d", ptrbits);
if (ISAX) if (ISAX)
fprintf(fpout, "%s", ISAXNAM[ISAX]); fprintf(fpout, "%s", ISAXNAM[ISAX]);
@@ -649,7 +650,7 @@ @@ -739,7 +739,7 @@
comps[i][j-2] == 'c' && comps[i][j-1] == 'c') comps[i][j-2] == 'c' && comps[i][j-1] == 'c')
break; break;
} }
- goodgcc = (j < NCOMP) ? comps[j] : "gcc"; - goodgcc = (i < NCOMP) ? comps[i] : "gcc";
+ goodgcc = (j < NCOMP) ? comps[j] : "%%CC%%"; + goodgcc = (i < NCOMP) ? comps[i] : "%%CC%%";
fprintf(fpout, " GOODGCC = %s", goodgcc); fprintf(fpout, " GOODGCC = %s", goodgcc);
if (gccflags) if (gccflags)
fprintf(fpout, " %s", gccflags); fprintf(fpout, " %s", gccflags);
@@ -661,7 +662,7 @@ @@ -756,7 +756,7 @@
fprintf(fpout, " %s", sp);
fprintf(fpout, "\n"); fprintf(fpout, "\n");
fprintf(fpout, " KC = $(DKC)\n KCFLAGS = $(CDEFS) $(DKCFLAGS)\n");
- fprintf(fpout, " LDFLAGS ="); - fprintf(fpout, " LDFLAGS =");
+ fprintf(fpout, " LDFLAGS = %%LDFLAGS%% "); + fprintf(fpout, " LDFLAGS = %%LDFLAGS%% ");
if (MachIsX86(mach)) if (MachIsX86(mach))
{ {
if (ptrbits == 32) if (OSIsWin(OS))
@@ -679,7 +680,7 @@ @@ -788,7 +788,7 @@
fprintf(fpout, " FCLINKFLAGS = $(FLINKFLAGS)"); if (USEMINGW)
if (strstr(comps[F77_], "ifort") && !OSIsWin(OS)) fprintf(fpout, "\n ARCHIVER = $(BLDdir)/mgwar\n");
fprintf(fpout, " -nofor_main"); else
- fprintf(fpout, "\n ARCHIVER = ar\n"); - fprintf(fpout, "\n ARCHIVER = ar\n");
+ fprintf(fpout, "\n ARCHIVER = $(AR)\n"); + fprintf(fpout, "\n ARCHIVER = $(AR)\n");
fprintf(fpout, " ARFLAGS = r\n"); fprintf(fpout, " ARFLAGS = r\n");
/* /*
* JF Mertens says that even x86 OS X still need ranlib for safety * JF Mertens says that even x86 OS X still need ranlib for safety
@@ -702,14 +703,14 @@ @@ -818,8 +818,8 @@
fprintf(fpout, "# ------------------------------------\n");
fprintf(fpout, "# Reference and system libraries\n");
fprintf(fpout, "# ------------------------------------\n");
- fprintf(fpout, " BLASlib = \n");
- fprintf(fpout, " FBLASlib = \n");
+ fprintf(fpout, " BLASlib = $(BLAS)\n");
+ fprintf(fpout, " FBLASlib = $(BLAS)\n");
fprintf(fpout, " FLAPACKlib = ");
if (flapack) fprintf(fpout, "%s", flapack); if (flapack) fprintf(fpout, "%s", flapack);
else if (lapackref) fprintf(fpout, "$(FLAdir)/lapack_$(ARCH).a");
fprintf(fpout, "\n"); fprintf(fpout, "\n");
fprintf(fpout, " SLAPACKlib = \n"); - fprintf(fpout, " SBLASlib = $(FBLASlib) # should be serial sysblas\n");
- fprintf(fpout, " BLASlib = $(FBLASlib) # should be parallel sysblas\n");
+ fprintf(fpout, " SBLASlib = $(BLAS) # should be serial sysblas\n");
+ fprintf(fpout, " BLASlib = $(BLAS) # should be parallel sysblas\n");
fprintf(fpout, " SLAPACKlib = # set to parallel system lapack\n");
fprintf(fpout, " SSLAPACKlib = # set to serial system lapack\n");
if (THREADS) if (THREADS)
- fprintf(fpout, " LIBS = -lpthread"); @@ -827,7 +827,7 @@
+ fprintf(fpout, " LIBS = %%PTHREAD_LIBS%%"); if (OSIsWin(OS))
fprintf(fpout, " LIBS = -lkernel32 -lm\n\n");
else
- fprintf(fpout, " LIBS = -lpthread -lm\n\n");
+ fprintf(fpout, " LIBS = %%PTHREAD_LIBS%% -lm\n\n");
}
else else
fprintf(fpout, " LIBS ="); fprintf(fpout, " LIBS = -lm\n\n");
if (!OSIsWin(OS))
Context not available.