diff options
| author | maho <maho@FreeBSD.org> | 2004-03-27 13:55:45 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-03-27 13:55:45 +0800 |
| commit | 0f112673d0733fbce7912fc30a5b0cb404dbac83 (patch) | |
| tree | 8252ad728c921b124fdfb84f079e7a4ba5ce4b2b | |
| parent | 3a35714502040fb6fe298d3a0f491d4c98795244 (diff) | |
| download | freebsd-ports-gnome-0f112673d0733fbce7912fc30a5b0cb404dbac83.tar.gz freebsd-ports-gnome-0f112673d0733fbce7912fc30a5b0cb404dbac83.tar.zst freebsd-ports-gnome-0f112673d0733fbce7912fc30a5b0cb404dbac83.zip | |
unbreak for 4-STABLE i386 and alpha
PR: 64692 (loosely depended on)
Submitted by: Kay Lehmann <kay_lehmann@web.de> and kris via bento
| -rw-r--r-- | math/atlas/files/patch-config.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/math/atlas/files/patch-config.c b/math/atlas/files/patch-config.c index b2d4ef86dd0e..c176e88b7061 100644 --- a/math/atlas/files/patch-config.c +++ b/math/atlas/files/patch-config.c @@ -1,16 +1,17 @@ --- config.c.orig Mon Dec 22 23:06:32 2003 -+++ config.c Wed Mar 17 18:40:50 2004 -@@ -666,7 +666,8 @@ ++++ config.c Sat Mar 27 14:47:04 2004 +@@ -666,7 +666,9 @@ sprintf(ln, "%s --version", gcc); if (CmndOneLine(NULL, ln, ln2) == 0) { - *major = GetIntVers(ln2, &j); -+ j=0; for (i=0; ln2[i] && !isspace(ln[i]); i++) j++; -+ *major = GetIntVers(ln2+j, &i); ++ j=0; if(isalpha(ln2[0])){for(i=0;!isspace(ln2[i]);i++)j++;} /* skip gccXXX ; XXX is number */ ++ for (i=0; !isdigit(ln2[i]); i++) j++; ++ *major = GetIntVers(ln2+j, &i); j += i; if (*major != -1) { *minor = GetIntVers(ln2+j, &i); j += i; -@@ -1188,7 +1189,9 @@ +@@ -1188,7 +1190,9 @@ switch(OS) { case OSOSX: /* don't know answer */ @@ -21,7 +22,7 @@ case OSLinux: break; case OSSunOS: -@@ -1450,9 +1453,9 @@ +@@ -1450,9 +1454,9 @@ if (THREADS && OS == OSFreeBSD) { if (which == CPF77) @@ -33,7 +34,7 @@ } break; case OSSunOS4: -@@ -1984,8 +1987,8 @@ +@@ -1984,8 +1988,8 @@ if (OS == OSFreeBSD) { if (strstr(comp, "cc")) @@ -44,7 +45,7 @@ } } return(*comp ? comp : NULL); -@@ -2799,7 +2802,7 @@ +@@ -2799,7 +2803,7 @@ else if (strstr(ln, "ia64")) la = LAIA64; else if ( strstr(ln, "i686") || strstr(ln, "i586") || strstr(ln, "i486") || strstr(ln, "i386") || @@ -53,7 +54,7 @@ } return(la); } -@@ -2835,12 +2838,22 @@ +@@ -2835,12 +2839,22 @@ } break; case LASPARC: /* don't know */ @@ -76,7 +77,7 @@ } break; case LAIA64: /* don't know */ -@@ -2849,14 +2862,32 @@ +@@ -2849,14 +2863,32 @@ if (!CmndOneLine(targ, "sysctl hw.model", ln)) { if (strstr(ln, "Pentium Pro")) mach = IntPPRO; @@ -114,7 +115,7 @@ } break; default:; -@@ -3641,8 +3672,8 @@ +@@ -3641,8 +3673,8 @@ } if (THREADS) /* add ncpu to ARCH */ { @@ -125,7 +126,7 @@ } do { -@@ -4047,9 +4078,9 @@ +@@ -4047,9 +4079,9 @@ if (mach == IA64Itan || mach == IA64Itan2 ) fprintf(fpout, " -DATL_MAXNREG=128"); if (ASMD != ASM_None) fprintf(fpout, " -DATL_%s", ASMNAM[ASMD]); @@ -137,7 +138,7 @@ if (mach == IA64Itan2 && strstr(CC, "icc")) fprintf(fpout, " -DATL_IntelIccBugs"); fprintf(fpout, "\n\n"); -@@ -4080,7 +4111,7 @@ +@@ -4080,7 +4112,7 @@ if (THREADS) { fprintf(fpout, " -DATL_NCPU=%d", ncpu); |