1) correct the names of shared libs for threaded version

2) Some Pentium 4 series have more caches (not 512kB, but 1M ~ 2M)

4 files changed, 33 insertions, 5 deletions

diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index b833870d8a77..68473d3946b5 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -93,6 +93,7 @@ do-build:
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED_PIC)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC)
+post-build:
 # make atlas enhanced lapack (static ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp1 ; \
 		${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\
@@ -139,7 +140,11 @@ do-build:
 .endfor
 
 # make atlas shared (thread safe) library
-.for i in ${ATLAS_LIBS1} ${ATLAS_LIBS2}
+.for i in ${ATLAS_LIBS1}
+	( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
+		ld -Bshareable -o ${i}_r.so.1 -x -soname ${i}_r.so.1 --whole-archive ${i}.a )
+.endfor
+.for i in ${ATLAS_LIBS2}
 	( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
 		ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
 .endfor
@@ -152,7 +157,7 @@ do-install:
 .endfor
 .for i in ${ATLAS_LIBS1}
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a       ${PREFIX}/lib/${i}_r.a
-	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}.so.1    ${PREFIX}/lib/${i}_r.so.1
+	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}_r.so.1    ${PREFIX}/lib/${i}_r.so.1
 	@${LN} -sf ${i}_r.so.1 ${PREFIX}/lib/${i}_r.so
 .endfor
 .for i in ${ATLAS_LIBS2}
diff --git a/math/atlas-devel/files/patch-config.c b/math/atlas-devel/files/patch-config.c
index f2b4e789dbd3..57ccb7f1e1e7 100644
--- a/math/atlas-devel/files/patch-config.c
+++ b/math/atlas-devel/files/patch-config.c
@@ -5,7 +5,7 @@
     if (CmndOneLine(NULL, ln, ln2) == 0)
     {
 -      *major = GetIntVers(ln2, &j);
-+      j=0; if(isalpha(ln2[0])){for(i=0;!isspace(ln2[i]);i++)j++;} /* skip gccXXX ; XXX is number */
++      j=0;if(isalpha(ln2[0])){for(i=0;!isspace(ln2[i]);i++)j++;} /*skip gccXXX ; XXX is number*/
 +      for (i=j; !isdigit(ln2[i]); i++) j++;
 +      *major = GetIntVers(ln2+j, &i); j += i;
        if (*major != -1)
@@ -45,6 +45,15 @@
        }
     }
     return(*comp ? comp : NULL);
+@@ -2587,7 +2587,7 @@
+       break;
+    case IntP4:
+       lf1 = l1 = 64;
+-      lf2 = l2 = 512;
++      lf2 = l2 = 4096;
+       s1 = 0;
+       s2 = 0;
+       break;
 @@ -2799,7 +2803,7 @@
        else if (strstr(ln, "ia64")) la = LAIA64;
        else if ( strstr(ln, "i686") || strstr(ln, "i586") ||
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index cf22251ae149..5aeb3f963694 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -92,6 +92,7 @@ do-build:
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED_PIC)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC)
+post-build:
 # make atlas enhanced lapack (static ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp1 ; \
 		${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\
@@ -138,7 +139,11 @@ do-build:
 .endfor
 
 # make atlas shared (thread safe) library
-.for i in ${ATLAS_LIBS1} ${ATLAS_LIBS2}
+.for i in ${ATLAS_LIBS1}
+	( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
+		ld -Bshareable -o ${i}_r.so.1 -x -soname ${i}_r.so.1 --whole-archive ${i}.a )
+.endfor
+.for i in ${ATLAS_LIBS2}
 	( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
 		ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
 .endfor
@@ -151,7 +156,7 @@ do-install:
 .endfor
 .for i in ${ATLAS_LIBS1}
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a       ${PREFIX}/lib/${i}_r.a
-	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}.so.1    ${PREFIX}/lib/${i}_r.so.1
+	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}_r.so.1    ${PREFIX}/lib/${i}_r.so.1
 	@${LN} -sf ${i}_r.so.1 ${PREFIX}/lib/${i}_r.so
 .endfor
 .for i in ${ATLAS_LIBS2}
diff --git a/math/atlas/files/patch-config.c b/math/atlas/files/patch-config.c
index a4719e876361..57ccb7f1e1e7 100644
--- a/math/atlas/files/patch-config.c
+++ b/math/atlas/files/patch-config.c
@@ -45,6 +45,15 @@
        }
     }
     return(*comp ? comp : NULL);
+@@ -2587,7 +2587,7 @@
+       break;
+    case IntP4:
+       lf1 = l1 = 64;
+-      lf2 = l2 = 512;
++      lf2 = l2 = 4096;
+       s1 = 0;
+       s2 = 0;
+       break;
 @@ -2799,7 +2803,7 @@
        else if (strstr(ln, "ia64")) la = LAIA64;
        else if ( strstr(ln, "i686") || strstr(ln, "i586") ||