freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1) correct the names of shared libs for threaded version

Browse Source 
2) Some Pentium 4 series have more caches (not 512kB, but 1M ~ 2M)
This commit is contained in:
Maho Nakata 2004-07-14 04:49:52 +00:00
parent 6537f6785e
commit 94bcc3f41a
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
math/atlas-devel/Makefile
View File

@ -93,6 +93,7 @@ do-build:
@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED_PIC) @(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)
@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC) @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC)
post-build:
# make atlas enhanced lapack (static ver) # make atlas enhanced lapack (static ver)
(cd ${WRKSRC}; ${MKDIR} tmp1 ; \ (cd ${WRKSRC}; ${MKDIR} tmp1 ; \
${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\ ${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\
@ -139,7 +140,11 @@ do-build:
.endfor .endfor
# make atlas shared (thread safe) library # 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/ ; \ ( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a ) ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
.endfor .endfor
@ -152,7 +157,7 @@ do-install:
.endfor .endfor
.for i in ${ATLAS_LIBS1} .for i in ${ATLAS_LIBS1}
@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a ${PREFIX}/lib/${i}_r.a @${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 @${LN} -sf ${i}_r.so.1 ${PREFIX}/lib/${i}_r.so
.endfor .endfor
.for i in ${ATLAS_LIBS2} .for i in ${ATLAS_LIBS2}

11
math/atlas-devel/files/patch-config.c
View File

@ -5,7 +5,7 @@
if (CmndOneLine(NULL, ln, ln2) == 0) if (CmndOneLine(NULL, ln, ln2) == 0)
{ {
- *major = GetIntVers(ln2, &j); - *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++; + for (i=j; !isdigit(ln2[i]); i++) j++;
+ *major = GetIntVers(ln2+j, &i); j += i; + *major = GetIntVers(ln2+j, &i); j += i;
if (*major != -1) if (*major != -1)
@ -45,6 +45,15 @@
} }
} }
return(*comp ? comp : NULL); 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 @@ @@ -2799,7 +2803,7 @@
else if (strstr(ln, "ia64")) la = LAIA64; else if (strstr(ln, "ia64")) la = LAIA64;
else if ( strstr(ln, "i686") || strstr(ln, "i586") || else if ( strstr(ln, "i686") || strstr(ln, "i586") ||

9
math/atlas/Makefile
View File

@ -92,6 +92,7 @@ do-build:
@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED_PIC) @(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)
@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC) @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC)
post-build:
# make atlas enhanced lapack (static ver) # make atlas enhanced lapack (static ver)
(cd ${WRKSRC}; ${MKDIR} tmp1 ; \ (cd ${WRKSRC}; ${MKDIR} tmp1 ; \
${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\ ${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\
@ -138,7 +139,11 @@ do-build:
.endfor .endfor
# make atlas shared (thread safe) library # 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/ ; \ ( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a ) ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
.endfor .endfor
@ -151,7 +156,7 @@ do-install:
.endfor .endfor
.for i in ${ATLAS_LIBS1} .for i in ${ATLAS_LIBS1}
@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a ${PREFIX}/lib/${i}_r.a @${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 @${LN} -sf ${i}_r.so.1 ${PREFIX}/lib/${i}_r.so
.endfor .endfor
.for i in ${ATLAS_LIBS2} .for i in ${ATLAS_LIBS2}

9
math/atlas/files/patch-config.c
View File

@ -45,6 +45,15 @@
} }
} }
return(*comp ? comp : NULL); 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 @@ @@ -2799,7 +2803,7 @@
else if (strstr(ln, "ia64")) la = LAIA64; else if (strstr(ln, "ia64")) la = LAIA64;
else if ( strstr(ln, "i686") || strstr(ln, "i586") || else if ( strstr(ln, "i686") || strstr(ln, "i586") ||