From: <lin...@us...> - 2008-07-04 18:59:51
|
Revision: 5160 http://octave.svn.sourceforge.net/octave/?rev=5160&view=rev Author: lindnerb Date: 2008-07-04 11:01:34 -0700 (Fri, 04 Jul 2008) Log Message: ----------- also install static library, small fix in unpack code Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/blas/blas-2.patch trunk/octave-forge/admin/Windows/mingw32/blas/build-2.sh Modified: trunk/octave-forge/admin/Windows/mingw32/blas/blas-2.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/blas/blas-2.patch 2008-07-04 17:59:58 UTC (rev 5159) +++ trunk/octave-forge/admin/Windows/mingw32/blas/blas-2.patch 2008-07-04 18:01:34 UTC (rev 5160) @@ -1,7 +1,7 @@ diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def blas-orig/makefile.mingw32 blas/makefile.mingw32 --- blas-orig/makefile.mingw32 Thu Jan 1 01:00:00 1970 -+++ blas/makefile.mingw32 Sat Dec 8 15:40:20 2007 -@@ -0,0 +1,103 @@ ++++ blas/makefile.mingw32 Sun Jun 29 15:51:08 2008 +@@ -0,0 +1,104 @@ +SRCDIR = @SRCDIR@ + +vpath %.f $(SRCDIR) @@ -102,6 +102,7 @@ + $(RM) $(DEF_FILES) $(LIB_DEFFILE) + $(RM) $(LIBTARGET) $(OTHER_CLEANFILES) + -+install: blas.dll -+ cp blas.dll $(SHAREDLIB_PATH) -+ cp libblas.dll.a $(LIBRARY_PATH) ++install: $(LIBTARGET) $(STATICLIB) ++ cp -uvp libblas.a $(STATICLIBRARY_PATH) ++ cp -uvp blas.dll $(SHAREDLIB_PATH) ++ cp -uvp libblas.dll.a $(LIBRARY_PATH) Modified: trunk/octave-forge/admin/Windows/mingw32/blas/build-2.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/blas/build-2.sh 2008-07-04 17:59:58 UTC (rev 5159) +++ trunk/octave-forge/admin/Windows/mingw32/blas/build-2.sh 2008-07-04 18:01:34 UTC (rev 5160) @@ -41,7 +41,13 @@ BUILDDIR=".build_mingw32_${VER}-${REL}_gcc${GCC_VER}${GCC_SYS}" # BLAS is packed NOT in a subdirectory, so we must manually create one... -unpack_pre() { mkdir ${SRCDIR} && cd ${SRCDIR}; } +unpack_pre() +{ + if [ -e ${BUILDDIR} ]; + then rm -rf ${BUILDDIR}; + fi; + mkdir ${SRCDIR} && cd ${SRCDIR}; +} unpack_post() { cd ..; } mkdirs_pre() { if [ -e ${BUILDDIR} ]; then rm -rf ${BUILDDIR}; fi; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |