diff options
author | maho <maho@FreeBSD.org> | 2007-09-30 07:34:49 +0800 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2007-09-30 07:34:49 +0800 |
commit | 0a85beff65a247b8b71b5327e2480fb70b34501d (patch) | |
tree | b5ac6ab9e9c741ba9d0bbafdc6c0948993b242da /math/atlas-devel | |
parent | 8b834ec005a97d09d3d867e9df115450446e99af (diff) | |
download | freebsd-ports-gnome-0a85beff65a247b8b71b5327e2480fb70b34501d.tar.gz freebsd-ports-gnome-0a85beff65a247b8b71b5327e2480fb70b34501d.tar.zst freebsd-ports-gnome-0a85beff65a247b8b71b5327e2480fb70b34501d.zip |
Update to 3.7.37 and unbreak.
Diffstat (limited to 'math/atlas-devel')
-rw-r--r-- | math/atlas-devel/Makefile | 26 | ||||
-rw-r--r-- | math/atlas-devel/distinfo | 6 | ||||
-rw-r--r-- | math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c | 14 | ||||
-rw-r--r-- | math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt | 42 |
4 files changed, 41 insertions, 47 deletions
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile index 0fa416b98ba4..f87526fbbf90 100644 --- a/math/atlas-devel/Makefile +++ b/math/atlas-devel/Makefile @@ -9,7 +9,7 @@ # Program and compiler flags are finetuned to gcc. PORTNAME= atlas -PORTVERSION= 3.7.34 +PORTVERSION= 3.7.37 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= math-atlas @@ -26,8 +26,6 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/ATLAS USE_LDCONFIG= yes -BROKEN= Creating ATLAS'ed LAPACK part is broken - .include <bsd.port.pre.mk> NOT_FOR_ARCHS= alpha @@ -69,7 +67,7 @@ pre-configure: @${REINPLACE_CMD} -e "s|%%CC%%|${CCOMPILER}|g" \ -e "s|%%FC%%|${FC}|g" ${WRKSRC}/CONFIG/src/atlcomp.txt @${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ - -e "s|%%PTHREAD_LIBS%%|${PTHREAD_CFLAGS}|g" \ + -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/CONFIG/src/SpewMakeInc.c @@ -94,7 +92,6 @@ do-build: @${ECHO_MSG} "===> Extracting lapack sub project" @${MKDIR} ${WRKDIR}/lapack @${CP} -r ${PORTSDIR}/math/lapack/files ${WRKDIR}/lapack - @${CP} -r ${PORTSDIR}/math/lapack/scripts ${WRKDIR}/lapack @${CP} ${PORTSDIR}/math/lapack/Makefile ${WRKDIR}/lapack @${CP} ${PORTSDIR}/math/lapack/distinfo ${WRKDIR}/lapack @${CP} ${PORTSDIR}/math/lapack/pkg-descr ${WRKDIR}/lapack @@ -110,12 +107,13 @@ do-build: ATLAS_LIBS1=libalapack libatlas libcblas libf77blas #libtstatlas ATLAS_LIBS2=libptcblas libptf77blas +LAPACKWRKSRC=`cd ${WRKDIR}/lapack; ${MAKE} -V WRKSRC` post-build: .if defined(WITH_STATICLIB) # make atlas enhanced lapack (static ver) (cd ${WRKSRC}; ${MKDIR} tmp1 ; \ - ${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\ + ${CP} ${LAPACKWRKSRC}/liblapack.a tmp1 ;\ cd tmp1 ;\ ar x liblapack.a ;\ ar x ../NON_THREADED/lib/liblapack.a ;\ @@ -123,7 +121,7 @@ post-build: ranlib ../NON_THREADED/lib/libalapack.a ) # make atlas enhanced lapack (static and thread safe ver) (cd ${WRKSRC}; ${MKDIR} tmp2 ; \ - ${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp2 ;\ + ${CP} ${LAPACKWRKSRC}/liblapack.a tmp2 ;\ cd tmp2 ;\ ar x liblapack.a ;\ ar x ../THREADED/lib/liblapack.a ;\ @@ -132,23 +130,17 @@ post-build: .endif # make atlas enhanced lapack (shared ver) ( cd ${WRKSRC}; ${MKDIR} tmp3 ;\ - ${TAR} --exclude "*.f" --exclude "*.po" --exclude "*.o" -cf - -C ${WRKDIR}/lapack/work/LAPACK/SRC . | ${TAR} xf - -C tmp3 ;\ - for object in `${FIND} tmp3 -name "*.So"` ; do \ - n=`${ECHO_CMD} $${object}|${SED} -e 's#.So##'` ; \ - ${MV} $$n.So $$n.o ; \ - done ; \ + ${CP} ${LAPACKWRKSRC}_shared/liblapack.a tmp3 ;\ cd tmp3 ;\ + ar x liblapack.a ;\ ar x ../NON_THREADED_PIC/lib/liblapack.a ;\ ar r ../NON_THREADED_PIC/lib/libalapack.a *.o ;\ ranlib ../NON_THREADED_PIC/lib/libalapack.a ) # make atlas enhanced lapack (shared and thread safe ver) ( cd ${WRKSRC}; ${MKDIR} tmp4 ;\ - ${TAR} --exclude "*.f" --exclude "*.po" --exclude "*.o" -cf - -C ${WRKDIR}/lapack/work/LAPACK/SRC . | ${TAR} xf - -C tmp4 ;\ - for object in `${FIND} tmp4 -name "*.So"` ; do \ - n=`${ECHO_CMD} $${object}|${SED} -e 's#.So##'` ; \ - ${MV} $$n.So $$n.o ; \ - done ; \ + ${CP} ${LAPACKWRKSRC}_shared/liblapack.a tmp4 ;\ cd tmp4 ;\ + ar x liblapack.a ;\ ar x ../THREADED_PIC/lib/liblapack.a ;\ ar r ../THREADED_PIC/lib/libalapack.a *.o ;\ ranlib ../THREADED_PIC/lib/libalapack.a ) diff --git a/math/atlas-devel/distinfo b/math/atlas-devel/distinfo index 4ca9470d2aa3..1d6d5442b103 100644 --- a/math/atlas-devel/distinfo +++ b/math/atlas-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (atlas3.7.34.tar.bz2) = 2cb87f02e0d131138eef8049d5a854d1 -SHA256 (atlas3.7.34.tar.bz2) = 6f29cc34266ceb9b5ee27276677281deba8438b00d4ace7c018b2b5aa5a9d333 -SIZE (atlas3.7.34.tar.bz2) = 2252847 +MD5 (atlas3.7.37.tar.bz2) = 5c3fb9a4c74e8426105558a23b2215ff +SHA256 (atlas3.7.37.tar.bz2) = bbc56b6355c07666d8021f640da00a35838e87ec4cb4cf52bdbb25336635fd65 +SIZE (atlas3.7.37.tar.bz2) = 2282682 diff --git a/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c b/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c index 2c69025a738e..ce95a4fb39cc 100644 --- a/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c +++ b/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c @@ -1,6 +1,6 @@ ---- CONFIG/src/SpewMakeInc.c.orig Sat Jan 6 13:57:34 2007 -+++ CONFIG/src/SpewMakeInc.c Sat Jan 6 13:58:21 2007 -@@ -582,13 +582,13 @@ +--- CONFIG/src/SpewMakeInc.c.orig 2007-08-11 00:57:42.000000000 +0900 ++++ CONFIG/src/SpewMakeInc.c 2007-09-29 22:03:26.000000000 +0900 +@@ -665,13 +665,13 @@ fprintf(fpout, "# ------------------------------------\n"); fprintf(fpout, "# Reference and system libraries\n"); fprintf(fpout, "# ------------------------------------\n"); @@ -13,8 +13,8 @@ if (flapack) fprintf(fpout, "%s", flapack); fprintf(fpout, "\n"); if (THREADS) -- fprintf(fpout, " LIBS = -lpthread -lm\n\n"); -+ fprintf(fpout, " LIBS = %%PTHREAD_LIBS%% -lm\n\n"); +- fprintf(fpout, " LIBS = -lpthread"); ++ fprintf(fpout, " LIBS = %%PTHREAD_LIBS%%"); else - fprintf(fpout, " LIBS = -lm\n\n"); - + fprintf(fpout, " LIBS ="); + if (!OSIsWin(OS)) diff --git a/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt b/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt index bf5f43860352..27978cbe9d00 100644 --- a/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt +++ b/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt @@ -1,16 +1,12 @@ ---- CONFIG/src/atlcomp.txt.orig Tue Jun 26 03:10:07 2007 -+++ CONFIG/src/atlcomp.txt Sat Jul 21 05:50:18 2007 -@@ -40,74 +40,74 @@ +--- CONFIG/src/atlcomp.txt.orig 2007-08-11 00:57:42.000000000 +0900 ++++ CONFIG/src/atlcomp.txt 2007-09-29 22:06:52.000000000 +0900 +@@ -40,46 +40,46 @@ # # Core2Solo and Core2Duo MACH=Core2Solo,Core2Duo OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc - 'gcc' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2' + '%%CC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2' # PPRO,PII,PIII,P4,P4E,K7,HAMMER - MACH=PPRO,PII,PIII,P4,P4E,K7,HAMMER OS=ALL LVL=2000 COMPS=smc,dmc,skc,dkc -- 'gcc32' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4' -+ '%%CC%%' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4' - # PPRO,PII,PIII,P4,P4E,K7,HAMMER MACH=PPRO,PII,PIII,P4,P4E,K7,HAMMER OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc - 'gcc' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4' + '%%CC%%' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4' @@ -63,39 +59,45 @@ - 'gcc' '-O2 -mips64 -march=5kf -mtune=5kf -fno-schedule-insns -fschedule-insns2 -fno-peephole -fno-peephole2' + '%%CC%%' '-O2 -mips64 -march=5kf -mtune=5kf -fno-schedule-insns -fschedule-insns2 -fno-peephole -fno-peephole2' # - # OS X / PowerPC970 + # OS X / PowerPC970; the + # The flags -fno-schedule-insns -fno-rerun-loop-opt are a workaround for +@@ -87,19 +87,19 @@ + # performance by removing them (for all PowerPC platforms) # MACH=PPCG5 OS=OSX LVL=1001 COMPS=icc,smc,dmc,skc,dkc,xcc - 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -O3' + '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -O3' MACH=PPCG5 OS=OSX LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc -- 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -force_cpusubtype_ALL -O3' -+ '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -force_cpusubtype_ALL -O3' +- 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -force_cpusubtype_ALL -O3 -fno-schedule-insns -fno-rerun-loop-opt' ++ '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -force_cpusubtype_ALL -O3 -fno-schedule-insns -fno-rerun-loop-opt' MACH=PPCG5 OS=ALL LVL=1000 COMPS=icc,smc,dmc,skc,dkc,xcc - 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O3' + '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O3' MACH=POWER5 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc -- 'gcc' '-mcpu=power5 -mtune=power5 -O3' -+ '%%CC%%' '-mcpu=power5 -mtune=power5 -O3' +- 'gcc' '-mcpu=power5 -mtune=power5 -O3 -fno-schedule-insns -fno-rerun-loop-opt' ++ '%%CC%%' '-mcpu=power5 -mtune=power5 -O3 -fno-schedule-insns -fno-rerun-loop-opt' MACH=POWER5 OS=ALL LVL=1010 COMPS=f77 - 'xlf' '-qtune=pwr5 -qarch=pwr5 -O3 -qmaxmem=-1 -qfloat=hsflt' + '%%FC%%' '-qtune=pwr5 -qarch=pwr5 -O3 -qmaxmem=-1 -qfloat=hsflt' - MACH=POWER4 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc -- 'gcc' '-mcpu=power4 -mtune=power4 -O3' -+ '%%CC%%' '-mcpu=power4 -mtune=power4 -O3' + MACH=POWER4 OS=ALL LVL=1010 COMPS=icc,dmc,smc,dkc,skc,xcc +- 'gcc' '-mcpu=power4 -mtune=power4 -O3 -fno-schedule-insns -fno-rerun-loop-opt' ++ '%%CC%%' '-mcpu=power4 -mtune=power4 -O3 -fno-schedule-insns -fno-rerun-loop-opt' MACH=POWER4 OS=ALL LVL=1010 COMPS=f77 -- 'xlf' '-qtune=pwr5 -qarch=pwr5 -O3 -qmaxmem=-1 -qfloat=hsflt' -+ '%%FC%%' '-qtune=pwr5 -qarch=pwr5 -O3 -qmaxmem=-1 -qfloat=hsflt' +- 'xlf' '-qtune=pwr4 -qarch=pwr4 -O3 -qmaxmem=-1 -qfloat=hsflt' ++ '%%FC%%' '-qtune=pwr4 -qarch=pwr4 -O3 -qmaxmem=-1 -qfloat=hsflt' + # + # Windows defaults ; need to make SSE/SSE2 arch dep. # +@@ -117,10 +117,10 @@ # Generic defaults # - MACH=ALL OS=ALL LVL=0 COMPS=icc,smc,dmc,skc,dkc,xcc + MACH=ALL OS=ALL LVL=5 COMPS=icc,smc,dmc,skc,dkc,xcc - 'gcc' '-O -fomit-frame-pointer' + '%%CC%%' '-O -fomit-frame-pointer' - MACH=ALL OS=ALL LVL=2 COMPS=f77 + MACH=ALL OS=ALL LVL=5 COMPS=f77 - 'gfortran' '-O' + '%%FC%%' '-O' - MACH=ALL OS=ALL LVL=1 COMPS=f77 + MACH=ALL OS=ALL LVL=4 COMPS=f77 - 'g77' '-O' + '%%FC%%' '-O' MACH=ALL OS=ALL LVL=0 COMPS=f77 |