diff -uNr /tmp/openblas_/./Makefile ./Makefile --- /tmp/openblas_/./Makefile 2012-03-17 15:21:32.000000000 +0900 +++ ./Makefile 2012-03-04 22:43:00.000000000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= openblas -PORTVERSION= 0.1.a2.4 +PORTVERSION= 0.1.a2.5 CATEGORIES= math MASTER_SITES= https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \ NL:lapack,lapack_tmg @@ -25,8 +25,8 @@ FETCH_ARGS= -pRr GH_USER= xianyi GH_PORTNAME= OpenBLAS -GH_REVISION= fe7a932 -GH_VERSION= v0.1alpha2.4 +GH_REVISION= fda39c6 +GH_VERSION= v0.1alpha2.5 LAPACKVER= 3.4.0 LAPACK_SRCFILE= lapack-${LAPACKVER}.tgz LARGE_FILE= large.tgz @@ -42,7 +42,7 @@ PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} MAKE_JOBS_SAFE= yes -WRKSRC= ${WRKDIR}/${GH_USER}-${GH_PORTNAME}-92ba8a7 +WRKSRC= ${WRKDIR}/${GH_USER}-${GH_PORTNAME}-9dcea60 .if defined(PACKAGE_BUILDING) DYNAMIC_ARCH_DEFAULT= on @@ -94,6 +94,7 @@ cd ${DISTDIR}/${DIST_SUBDIR} ; \ ${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC} ${MKDIR} ${WRKDIR}/lib + ${RM} ${WRKSRC}/patch.for_lapack-3.4.0 post-patch: ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \ @@ -127,13 +128,13 @@ do-build: cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \ ${GMAKE} ${MAKE_ARGS} - ${CP} ${WRKSRC}/libopenblas-r0.1alpha2.4.a ${WRKDIR}/lib/libopenblas.a - ${CP} ${WRKSRC}/libopenblas-r0.1alpha2.4.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER} + ${CP} ${WRKSRC}/libopenblas-r0.1alpha2.5.a ${WRKDIR}/lib/libopenblas.a + ${CP} ${WRKSRC}/libopenblas-r0.1alpha2.5.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER} cd ${WRKSRC} ; ${GMAKE} ${MAKE_ARGS} clean cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ USE_THREAD=1 ${GMAKE} ${MAKE_ARGS} - ${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.4.a ${WRKDIR}/lib/libopenblasp.a - ${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.4.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER} + ${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.5.a ${WRKDIR}/lib/libopenblasp.a + ${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.5.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER} .if !defined(WITH_DEBUG) ${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER} .endif diff -uNr /tmp/openblas_/./distinfo ./distinfo --- /tmp/openblas_/./distinfo 2012-03-17 15:21:32.000000000 +0900 +++ ./distinfo 2012-03-04 22:04:20.000000000 +0900 @@ -1,5 +1,5 @@ -SHA256 (openblas/xianyi-OpenBLAS-v0.1alpha2.4-0-gfe7a932.tar.gz) = 95e0beab5cede658c075e32ec7ad10fa7e1c4cbdf69b03743e54bd67e27766c7 -SIZE (openblas/xianyi-OpenBLAS-v0.1alpha2.4-0-gfe7a932.tar.gz) = 3077836 +SHA256 (openblas/xianyi-OpenBLAS-v0.1alpha2.5-0-gfda39c6.tar.gz) = a2f13bebcd0b7e9968e216c6e772ac88784ff3a1ac779272198efd5d81b14741 +SIZE (openblas/xianyi-OpenBLAS-v0.1alpha2.5-0-gfda39c6.tar.gz) = 3092361 SHA256 (openblas/lapack-3.4.0.tgz) = a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9 SIZE (openblas/lapack-3.4.0.tgz) = 6127787 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1 diff -uNr /tmp/openblas_/./files/patch-Makefile ./files/patch-Makefile --- /tmp/openblas_/./files/patch-Makefile 2012-03-17 15:21:32.000000000 +0900 +++ ./files/patch-Makefile 2012-03-04 22:40:26.000000000 +0900 @@ -1,5 +1,5 @@ ---- Makefile.orig 2011-09-18 17:57:28.000000000 +0900 -+++ Makefile 2012-02-12 21:30:02.000000000 +0900 +--- Makefile.orig 2012-03-04 22:09:49.000000000 +0900 ++++ Makefile 2012-03-04 22:15:17.000000000 +0900 @@ -34,7 +34,7 @@ @echo " OpenBLAS build complete." @echo @@ -9,40 +9,40 @@ ifndef BINARY64 @echo " BINARY ... 32bit " else -@@ -195,47 +195,42 @@ +@@ -202,47 +202,42 @@ netlib : else --netlib : lapack-3.1.1 patch.for_lapack-3.1.1 lapack-3.1.1/make.inc +-netlib : lapack-3.4.0 patch.for_lapack-3.4.0 lapack-3.4.0/make.inc +netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc ifndef NOFORTRAN -- -@$(MAKE) -C lapack-3.1.1 lapacklib +- -@$(MAKE) -C lapack-3.4.0 lapacklib + -@$(MAKE) -C lapack-%%LAPACKVER%% lapacklib endif endif --prof_lapack : lapack-3.1.1 lapack-3.1.1/make.inc -- -@$(MAKE) -C lapack-3.1.1 lapack_prof +-prof_lapack : lapack-3.4.0 lapack-3.4.0/make.inc +- -@$(MAKE) -C lapack-3.4.0 lapack_prof +prof_lapack : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc + -@$(MAKE) -C lapack-%%LAPACKVER%% lapack_prof --lapack-3.1.1/make.inc : +-lapack-3.4.0/make.inc : +lapack-%%LAPACKVER%%/make.inc : ifndef NOFORTRAN -- -@echo "FORTRAN = $(FC)" > lapack-3.1.1/make.inc -- -@echo "OPTS = $(FFLAGS)" >> lapack-3.1.1/make.inc -- -@echo "POPTS = $(FPFLAGS)" >> lapack-3.1.1/make.inc -- -@echo "NOOPT = $(FFLAGS) -O0" >> lapack-3.1.1/make.inc -- -@echo "PNOOPT = $(FPFLAGS) -O0" >> lapack-3.1.1/make.inc -- -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> lapack-3.1.1/make.inc -- -@echo "ARCH = $(AR)" >> lapack-3.1.1/make.inc -- -@echo "RANLIB = $(RANLIB)" >> lapack-3.1.1/make.inc -- -@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.1.1/make.inc -- -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.1.1/make.inc -- -@echo "SUFFIX = $(SUFFIX)" >> lapack-3.1.1/make.inc -- -@echo "PSUFFIX = $(PSUFFIX)" >> lapack-3.1.1/make.inc --# -@echo "CEXTRALIB = $(CEXTRALIB)" >> lapack-3.1.1/make.inc -- -@cat make.inc >> lapack-3.1.1/make.inc +- -@echo "FORTRAN = $(FC)" > lapack-3.4.0/make.inc +- -@echo "OPTS = $(FFLAGS)" >> lapack-3.4.0/make.inc +- -@echo "POPTS = $(FPFLAGS)" >> lapack-3.4.0/make.inc +- -@echo "NOOPT = $(FFLAGS) -O0" >> lapack-3.4.0/make.inc +- -@echo "PNOOPT = $(FPFLAGS) -O0" >> lapack-3.4.0/make.inc +- -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> lapack-3.4.0/make.inc +- -@echo "ARCH = $(AR)" >> lapack-3.4.0/make.inc +- -@echo "RANLIB = $(RANLIB)" >> lapack-3.4.0/make.inc +- -@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.4.0/make.inc +- -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.4.0/make.inc +- -@echo "SUFFIX = $(SUFFIX)" >> lapack-3.4.0/make.inc +- -@echo "PSUFFIX = $(PSUFFIX)" >> lapack-3.4.0/make.inc +-# -@echo "CEXTRALIB = $(CEXTRALIB)" >> lapack-3.4.0/make.inc +- -@cat make.inc >> lapack-3.4.0/make.inc + -@echo "FORTRAN = $(FC)" > lapack-%%LAPACKVER%%/make.inc + -@echo "OPTS = $(FFLAGS)" >> lapack-%%LAPACKVER%%/make.inc + -@echo "POPTS = $(FPFLAGS)" >> lapack-%%LAPACKVER%%/make.inc @@ -59,39 +59,39 @@ + -@cat make.inc >> lapack-%%LAPACKVER%%/make.inc endif --lapack-3.1.1 : lapack-3.1.1.tgz +-lapack-3.4.0 : lapack-3.4.0.tgz +lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz ifndef NOFORTRAN -- @if test `$(MD5SUM) lapack-3.1.1.tgz | $(AWK) '{print $$1}'` = 00b21551a899bcfbaa7b8443e1faeef9; then \ +- @if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \ - echo $(TAR) zxf $< ;\ -- $(TAR) zxf $< && (cd lapack-3.1.1; $(PATCH) -p1 < ../patch.for_lapack-3.1.1) ;\ +- $(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\ - else \ -- echo " lapack-3.1.1.tgz check sum is wrong (Please use orignal)." ;\ -- rm -rf lapack-3.1.1 ;\ +- echo " lapack-3.4.0.tgz check sum is wrong (Please use orignal)." ;\ +- rm -rf lapack-3.4.0 ;\ - fi + echo $(TAR) zxf $< ;\ + $(TAR) zxf $< && (cd lapack-%%LAPACKVER%%; $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%) endif --lapack-3.1.1.tgz : +-lapack-3.4.0.tgz : +lapack-%%LAPACKVER%%.tgz : ifndef NOFORTRAN -- -wget http://www.netlib.org/lapack/lapack-3.1.1.tgz +- -wget http://www.netlib.org/lapack/lapack-3.4.0.tgz + -wget http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz endif large.tgz : -@@ -248,21 +243,21 @@ +@@ -255,21 +250,21 @@ -wget http://www.netlib.org/lapack/timing/timing.tgz endif --lapack-timing : lapack-3.1.1 large.tgz timing.tgz +-lapack-timing : lapack-3.4.0 large.tgz timing.tgz +lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz ifndef NOFORTRAN -- (cd lapack-3.1.1; $(TAR) zxf ../timing.tgz TIMING) -- (cd lapack-3.1.1/TIMING; $(TAR) zxf ../../large.tgz ) -- make -C lapack-3.1.1 tmglib -- make -C lapack-3.1.1/TIMING +- (cd lapack-3.4.0; $(TAR) zxf ../timing.tgz TIMING) +- (cd lapack-3.4.0/TIMING; $(TAR) zxf ../../large.tgz ) +- make -C lapack-3.4.0 tmglib +- make -C lapack-3.4.0/TIMING + (cd lapack-%%LAPACKVER%%; $(TAR) zxf ../timing.tgz TIMING) + (cd lapack-%%LAPACKVER%%/TIMING; $(TAR) zxf ../../large.tgz ) + make -C lapack-%%LAPACKVER%% tmglib @@ -100,11 +100,11 @@ lapack-test : -- $(MAKE) -C lapack-3.1.1 tmglib -- $(MAKE) -C lapack-3.1.1/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc -- @rm -f lapack-3.1.1/TESTING/*.out -- $(MAKE) -j 1 -C lapack-3.1.1/TESTING -- $(GREP) failed lapack-3.1.1/TESTING/*.out +- $(MAKE) -C lapack-3.4.0 tmglib +- $(MAKE) -C lapack-3.4.0/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc +- @rm -f lapack-3.4.0/TESTING/*.out +- $(MAKE) -j 1 -C lapack-3.4.0/TESTING +- $(GREP) failed lapack-3.4.0/TESTING/*.out + $(MAKE) -C lapack-%%LAPACKVER%% tmglib + $(MAKE) -C lapack-%%LAPACKVER%%/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc + @rm -f lapack-%%LAPACKVER%%/TESTING/*.out @@ -113,13 +113,13 @@ dummy : -@@ -280,9 +275,10 @@ +@@ -287,9 +282,10 @@ #endif @rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libopenblas.$(LIBSUFFIX) libopenblas_p.$(LIBSUFFIX) *.lnk myconfig.h @rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib -- @if test -d lapack-3.1.1; then \ -- echo deleting lapack-3.1.1; \ -- rm -rf lapack-3.1.1 ;\ +- @if test -d lapack-3.4.0; then \ +- echo deleting lapack-3.4.0; \ +- rm -rf lapack-3.4.0 ;\ + @if test -d lapack-%%LAPACKVER%%; then \ + echo deleting lapack-%%LAPACKVER%%; \ + rm -rf lapack-%%LAPACKVER%% ;\ diff -uNr /tmp/openblas_/./pkg-descr ./pkg-descr --- /tmp/openblas_/./pkg-descr 2012-03-17 15:21:32.000000000 +0900 +++ ./pkg-descr 2012-03-04 22:52:04.000000000 +0900 @@ -2,9 +2,8 @@ OpenBLAS is an open source project supported by Lab of Parallel Software and Computational Science, ISCAS. -NOTE: OpenBLAS cannot automatically detect CPU -based on "Sandy Bridge" microarchitecture. -If you use this processor, please specify set TARGET build flag, -e.g., "make TARGET_CPU_ARCH=NEHALEM". +NOTE: If you want to specify your CPU microarchitecture manually, +please use TARGET_CPU_ARCH knob, e.g., "make TARGET_CPU_ARCH=NEHALEM". +This value is set TARGET build flag. WWW: https://github.com/xianyi/OpenBLAS