diff options
| author | maho <maho@FreeBSD.org> | 2004-07-14 04:49:52 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-07-14 04:49:52 +0000 |
| commit | 6a7b170e43fe301a80ef2d7fda32c54c04419268 (patch) | |
| tree | ffe4421fcfd6717216f472f34250b1291f509e7f /math/atlas | |
| parent | 6f70d5a6c1800b7f748207363aef6b25f3634ac5 (diff) | |
| download | FreeBSD-ports-6a7b170e43fe301a80ef2d7fda32c54c04419268.zip FreeBSD-ports-6a7b170e43fe301a80ef2d7fda32c54c04419268.tar.gz | |
1) correct the names of shared libs for threaded version
2) Some Pentium 4 series have more caches (not 512kB, but 1M ~ 2M)
Diffstat (limited to 'math/atlas')
| -rw-r--r-- | math/atlas/Makefile | 9 | ||||
| -rw-r--r-- | math/atlas/files/patch-config.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/math/atlas/Makefile b/math/atlas/Makefile index cf22251..5aeb3f9 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 a4719e8..57ccb7f 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") || |
