From: <lin...@us...> - 2007-11-21 17:30:45
|
Revision: 4279 http://octave.svn.sourceforge.net/octave/?rev=4279&view=rev Author: lindnerb Date: 2007-11-21 09:30:41 -0800 (Wed, 21 Nov 2007) Log Message: ----------- add new build scripts&patches for octave 2.9.17 with gcc-4.2.1-dw2 Added Paths: ----------- trunk/octave-forge/admin/Windows/mingw32/curl/build-7.17.1-2.sh trunk/octave-forge/admin/Windows/mingw32/curl/curl-7.17.1-2.patch trunk/octave-forge/admin/Windows/mingw32/less/build-406-2.sh trunk/octave-forge/admin/Windows/mingw32/less/less-406-2.patch trunk/octave-forge/admin/Windows/mingw32/qhull/build-2003.1-2.sh trunk/octave-forge/admin/Windows/mingw32/qhull/qhull-2003.1-2.patch trunk/octave-forge/admin/Windows/mingw32/sed/build-4.1.5-2.sh trunk/octave-forge/admin/Windows/mingw32/sed/sed-4.1.5-2.patch trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.0.0-2.sh trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.0.0-2.patch Added: trunk/octave-forge/admin/Windows/mingw32/curl/build-7.17.1-2.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/curl/build-7.17.1-2.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/curl/build-7.17.1-2.sh 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,71 @@ +#! /usr/bin/sh + +# Name of package +PKG=curl +# Version of Package +VER=7.17.1 +# Release of (this patched) package +REL=2 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file +SRCFILE=${PKGVER}.tar.bz2 +TAR_TYPE=j +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL of source code file +URL="http://curl.haxx.se/download/curl-7.17.1.tar.bz2" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +#TOPDIR=`pwd -W | sed -e 's+\([a-z]\):/+/\1/+'` +TOPDIR=`pwd` +# Directory Source code is extracted to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig +# Directory the lib is built in +BUILDDIR=${SRCDIR}/lib + +# Make file to use +MAKEFILE="Makefile.m32" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS="-x ca-bundle.h -x libcurl.res" + +# header files to be installed +INSTALL_HEADERS="curl.h curlver.h easy.h mprintf.h multi.h stdcheaders.h types.h" +INCLUDE_DIR=include/curl + +source ../gcc42_common.sh + +#mkdirs_pre() { if [ -e ${BUILDDIR} ]; then rm -rf ${BUILDDIR}; fi; } + +build() +{ + export ZLIB_PATH=${LIBRARY_PATH} + ( cd ${BUILDDIR} && make -f Makefile.m32 ZLIB=1 ) +} + +install() +{ + install_pre + ${CP} ${CP_FLAGS} ${BUILDDIR}/curl.dll ${BINARY_PATH} + ${CP} ${CP_FLAGS} ${BUILDDIR}/libcurl.dll.a ${LIBRARY_PATH} + ${CP} ${CP_FLAGS} ${BUILDDIR}/libcurl.a ${STATICLIBRARY_PATH} + for a in ${INSTALL_HEADERS}; do ${CP} ${CP_FLAGS} ${SRCDIR}/include/curl/$a ${INCLUDE_PATH}; done + install_post +} + +uninstall() +{ + ${RM} ${RM_FLAGS} ${BINARY_PATH}/curl.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libcurl.dll.a + ${RM} ${RM_FLAGS} ${STATICLIBRARY_PATH}/libcurl.a + for a in ${INSTALL_HEADERS}; do ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/$a; done +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/curl/build-7.17.1-2.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Rev Date Name: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/curl/curl-7.17.1-2.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/curl/curl-7.17.1-2.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/curl/curl-7.17.1-2.patch 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,80 @@ +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x ca-bundle.h -x libcurl.res curl-7.17.1-orig/include/curl/curl.h curl-7.17.1/include/curl/curl.h +--- curl-7.17.1-orig/include/curl/curl.h Mon Oct 22 16:30:17 2007 ++++ curl-7.17.1/include/curl/curl.h Wed Nov 14 22:02:56 2007 +@@ -147,7 +147,7 @@ + + #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \ + !defined(__CYGWIN__) || defined(__MINGW32__) +-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H)) ++#if !(defined(_WINSOCKAPI_) || (defined(_WINSOCK_H) && !defined(_WINSOCK2_H))) + /* The check above prevents the winsock2 inclusion if winsock.h already was + included, since they can't co-exist without problems */ + #include <winsock2.h> +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x ca-bundle.h -x libcurl.res curl-7.17.1-orig/lib/Makefile.m32 curl-7.17.1/lib/Makefile.m32 +--- curl-7.17.1-orig/lib/Makefile.m32 Mon Aug 27 15:01:10 2007 ++++ curl-7.17.1/lib/Makefile.m32 Tue Nov 13 19:30:26 2007 +@@ -34,21 +34,22 @@ + + ARES_LIB = ../ares + +-CC = gcc ++#CC = gcc ++CFLAGS=$(GCC_ARCH_FLAGS) $(GCC_OPT_FLAGS) + AR = ar + # comment LDFLAGS below to keep debug info + LDFLAGS = -s + RANLIB = ranlib + RC = windres + RCFLAGS = --include-dir=../include -DCURLDEBUG=0 -O COFF -i +-RM = del /q /f +-STRIP = strip -g ++RM = rm -f ++STRIP = strip + + ######################################################## + ## Nothing more to do below this line! + + INCLUDES = -I. -I../include +-CFLAGS = -g -O2 -DBUILDING_LIBCURL ++CFLAGS = $(GCC_ARCH_FLAGS) $(GCC_OPT_FLAGS) -DBUILDING_LIBCURL + ifdef ARES + INCLUDES += -I$(ARES_LIB) + CFLAGS += -DUSE_ARES +@@ -102,8 +103,8 @@ + # Makefile.inc provides the CSOURCES and HHEADERS defines + include Makefile.inc + +-libcurl_dll_LIBRARY = libcurl.dll +-libcurl_dll_a_LIBRARY = libcurldll.a ++libcurl_dll_LIBRARY = curl.dll ++libcurl_dll_a_LIBRARY = libcurl.dll.a + libcurl_a_LIBRARY = libcurl.a + + libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES))) +@@ -119,14 +120,15 @@ + -$(RM) $@ + $(AR) cru $@ $(libcurl_a_OBJECTS) + $(RANLIB) $@ +- $(STRIP) $@ ++ $(STRIP) $(STRIP_FLAGS) $@ + + # remove the last line above to keep debug info + + $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENCIES) + -$(RM) $@ + $(CC) $(LDFLAGS) -shared -Wl,--out-implib,$(libcurl_dll_a_LIBRARY) \ +- -o $@ $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS) ++ -o $@ $(libcurl_a_OBJECTS) $(RESOURCE) -Wl,--no-whole-archive $(DLL_LIBS) ++ $(STRIP) $(STRIP_FLAGS) $@ + + .c.o: + $(COMPILE) -c $< +@@ -144,7 +146,7 @@ + + ca-bundle.h: FORCE Makefile.m32 + @echo Creating $@ +- @echo $(DL)/* Do not edit this file - it is created by make!$(DL) > $@ ++ @echo "$(DL)/* Do not edit this file - it is created by make!$(DL)" > $@ + @echo $(DL)*/$(DL) >> $@ + + $(ARES_LIB)/libcares.a: Added: trunk/octave-forge/admin/Windows/mingw32/less/build-406-2.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/less/build-406-2.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/less/build-406-2.sh 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,55 @@ +#! /usr/bin/sh + +# Name of package +PKG=less +# Version of Package +VER=406 +# Release of (this patched) package +REL=2 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file +SRCFILE=${PKGVER}.tar.gz +TAR_TYPE=z +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL of source code file +URL="http://www.greenwoodsoftware.com/less/less-406.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory Source code is extracted to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig +# Directory the lib is built in +BUILDDIR=${SRCDIR} + +# Make file to use +MAKEFILE="Makefile.mingw32" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS="-x defines.h" + +# header files to be installed +INSTALL_HEADERS="" + +source ../gcc42_common.sh + + +install() +{ + ${CP} ${CP_FLAGS} ${BUILDDIR}/less.exe ${BINARY_PATH} +} + +uninstall() +{ + ${RM} ${RM_FLAGS} ${BINARY_PATH}/less.exe +} + + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/less/build-406-2.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Rev Date Name: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/less/less-406-2.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/less/less-406-2.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/less/less-406-2.patch 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,118 @@ +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x defines.h less-406-orig/Makefile.mingw32 less-406/Makefile.mingw32 +--- less-406-orig/Makefile.mingw32 Thu Jan 1 01:00:00 1970 ++++ less-406/Makefile.mingw32 Fri Nov 9 20:17:04 2007 +@@ -0,0 +1,74 @@ ++# Makefile for less. ++# Windows version ++# mingw32 gcc ++ ++#### Start of system configuration section. #### ++# ++# Borland's make knows its own location in the ++# filesystem. ++# ++ ++#CC = mingw32-gcc ++#LIBDIR = $(MAKEDIR)\..\lib ++ ++CFLAGS = $(GCC_ARCH_FLAGS) $(GCC_OPT_FLAGS) ++LDFLAGS = -mconsole ++LD = $(CC) ++#LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\cw32.lib ++LIBS = -lpcre -lregex ++ ++#### End of system configuration section. #### ++ ++# ++# This rule allows us to supply the necessary -D options ++# in addition to whatever the user asks for. ++# ++.c.o: ++ ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $< ++ ++OBJ = main.o screen.o brac.o ch.o charset.o cmdbuf.o command.o \ ++ decode.o edit.o filename.o forwback.o help.o ifile.o \ ++ input.o jump.o line.o linenum.o lsystem.o \ ++ mark.o optfunc.o option.o opttbl.o os.o output.o \ ++ position.o prompt.o search.o signal.o tags.o \ ++ ttyin.o version.o regexp.o ++ ++all: less.exe lesskey.exe lessecho.exe ++ ++# ++# This is really horrible, but the command line is too long for ++# MS-DOS if we try to link ${OBJ}. ++# ++less.exe: ${OBJ} ++ ${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS} ++ strip $(STRIP_FLAGS) $@ ++ ++lesskey.exe: lesskey.o version.o ++ ${CC} ${LDFLAGS} -o $@ $^ ${LIBS} ++ strip $(STRIP_FLAGS) $@ ++ ++lessecho.exe: lessecho.o version.o ++ ${CC} ${LDFLAGS} -o $@ $^ ${LIBS} ++ strip $(STRIP_FLAGS) $@ ++ ++defines.h: defines.wn ++ -rm defines.h ++ -cp defines.wn defines.h ++ ++${OBJ}: less.h defines.h funcs.h cmd.h ++ ++clean: ++ -rm *.o ++ -rm *.il? ++ -rm *.tds ++ -rm defines.h ++ ++spotless: clean ++ -rm less.exe ++ -rm lesskey.exe ++ -rm lessecho.exe ++ ++realclean: spotless ++ ++distclean: spotless ++ +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x defines.h less-406-orig/defines.wn less-406/defines.wn +--- less-406-orig/defines.wn Sat Jun 16 00:06:23 2007 ++++ less-406/defines.wn Fri Nov 9 20:03:30 2007 +@@ -200,9 +200,10 @@ + /* #undef HAVE_POSIX_REGCOMP */ + /* #undef HAVE_RE_COMP */ + /* #undef HAVE_REGCMP */ +-#define HAVE_V8_REGCOMP 1 ++/* #define HAVE_V8_REGCOMP 1 */ + /* #undef NO_REGEX */ +-#define HAVE_REGEXEC2 1 ++/* #define HAVE_REGEXEC2 1 */ ++#define HAVE_PCRE 1 + + /* Define HAVE_VOID if your compiler supports the "void" type. */ + #define HAVE_VOID 1 +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x defines.h less-406-orig/lglob.h less-406/lglob.h +--- less-406-orig/lglob.h Sat Jun 16 00:06:24 2007 ++++ less-406/lglob.h Fri Nov 9 20:03:30 2007 +@@ -57,7 +57,7 @@ + char ext[_MAX_EXT]; \ + int handle; + #else +-#if MSDOS_COMPILER==WIN32C && defined(_MSC_VER) ++#if MSDOS_COMPILER==WIN32C &&( defined(_MSC_VER) || defined(__MINGW32__) ) + + #define GLOB_FIRST_NAME(filename,fndp,h) h = _findfirst(filename, fndp) + #define GLOB_FIRST_FAILED(handle) ((handle) == -1) +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x defines.h less-406-orig/lsystem.c less-406/lsystem.c +--- less-406-orig/lsystem.c Sun Jun 17 18:56:04 2007 ++++ less-406/lsystem.c Fri Nov 9 20:03:30 2007 +@@ -20,7 +20,7 @@ + + #if MSDOS_COMPILER + #include <dos.h> +-#ifdef _MSC_VER ++#if defined(_MSC_VER) || defined(__MINGW32__) + #include <direct.h> + #define setdisk(n) _chdrive((n)+1) + #else Added: trunk/octave-forge/admin/Windows/mingw32/qhull/build-2003.1-2.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/qhull/build-2003.1-2.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/qhull/build-2003.1-2.sh 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,70 @@ +#! /usr/bin/sh + +# Name of package +PKG=qhull +# Version of Package +VER=2003.1 +# Release of (this patched) package +REL=2 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file +SRCFILE=${PKGVER}-src.tgz +TAR_TYPE=z +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL of source code file +URL="http://www.qhull.org/download/qhull-2003.1-src.tgz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +#TOPDIR=`pwd -W | sed -e 's+\([a-z]\):/+/\1/+'` +TOPDIR=`pwd` +# Directory Source code is extracted to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig +# Directory the lib is built in +BUILDDIR=${SRCDIR} + +# Make file to use +MAKEFILE="makefile" + +# Additional DIFF Flags for generating diff file +#DIFF_FLAGS="-x *.def" + +# header files to be installed +INSTALL_HEADERS="user.h qhull.h qhull_a.h geom.h io.h mem.h merge.h poly.h qset.h stat.h" +INCLUDE_DIR=include/qhull + +source ../gcc42_common.sh + +#mkdirs_pre() { if [ -e ${BUILDDIR} ]; then rm -rf ${BUILDDIR}; fi; } + +build() +{ + cd ${BUILDDIR}/src && make lib +} + +install() +{ + install_pre + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/qhull.dll ${BINARY_PATH} + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/libqhull.dll.a ${LIBRARY_PATH} + ${CP} ${CP_FLAGS} ${BUILDDIR}/src/libqhull.a ${STATICLIBRARY_PATH} + for a in ${INSTALL_HEADERS}; do ${CP} ${CP_FLAGS} ${SRCDIR}/src/$a ${INCLUDE_PATH}; done + install_post +} + +uninstall() +{ + ${RM} ${RM_FLAGS} ${BINARY_PATH}/qhull.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/libqhull.dll.a + ${RM} ${RM_FLAGS} ${STATICLIBRARY_PATH}/libqhull.a + for a in ${INSTALL_HEADERS}; do ${RM} ${RM_FLAGS} ${INCLUDE_PATH}/$a; done +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/qhull/build-2003.1-2.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Rev Date Name: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/qhull/qhull-2003.1-2.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/qhull/qhull-2003.1-2.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/qhull/qhull-2003.1-2.patch 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,32 @@ +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak qhull-2003.1-orig/src/Makefile qhull-2003.1/src/Makefile +--- qhull-2003.1-orig/src/Makefile Wed Dec 31 03:20:50 2003 ++++ qhull-2003.1/src/Makefile Tue Nov 13 07:15:29 2007 +@@ -43,8 +43,8 @@ + + #for Gnu's gcc compiler -O2 for optimization, -g for debugging, -Wall for check + # +-CC = gcc +-CCOPTS1 = -O2 -ansi ++#CC = gcc ++CCOPTS1 = $(GCC_ARCH_FLAGS) $(GCC_OPT_FLAGS) + + # for Sun's cc compiler, -fast or O2 for optimization, -g for debugging, -Xc for ANSI + #CC = cc +@@ -80,6 +80,17 @@ + qdelau_f.htm qhalf.htm qvoronoi.htm qvoron_f.htm rbox.htm + + all: rbox qconvex qdelaunay qhalf qvoronoi qhull ++ ++lib: libqhull.a qhull.dll ++ ++qhull.dll : libqhull.a ++ $(CC) -shared -o $@ \ ++ -Wl,--export-all-symbols \ ++ -Wl,--enable-runtime-pseudo-reloc \ ++ -Wl,--out-implib=$(<:.a=.dll.a) \ ++ -Wl,--whole-archive $< \ ++ -Wl,--no-whole-archive ++ strip $(STRIP_FLAGS) $@ + + unix.o: qhull.h user.h mem.h + qconvex.o: qhull.h user.h mem.h Added: trunk/octave-forge/admin/Windows/mingw32/sed/build-4.1.5-2.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/sed/build-4.1.5-2.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/sed/build-4.1.5-2.sh 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,73 @@ +#! /usr/bin/sh + +# Name of package +PKG=sed +# Version of Package +VER=4.1.5 +# Release of (this patched) package +REL=2 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file +SRCFILE=${PKGVER}.tar.gz +TAR_TYPE=z +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL of source code file +URL="" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory Source code is extracted to (relative to TOPDIR) +SRCDIR=${PKGVER} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig +# Directory the lib is built in +BUILDDIR=".build_mingw32_${VER}-${REL}_gcc421_dw2" + +# Make file to use +MAKEFILE="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS="-x defines.h" + +# header files to be installed +INSTALL_HEADERS="" + +source ../gcc42_common.sh + +mkdirs_pre() { if [ -e ${BUILDDIR} ]; then rm -rf ${BUILDDIR}; fi; } + +conf() +{ + mkdirs; + ( cd ${BUILDDIR} && ${TOPDIR}/${SRCDIR}/configure \ + --srcdir=${TOPDIR}/${SRCDIR} \ + CC=${CC} \ + CXX=${CXX} \ + F77=${F77} \ + LDFLAGS="${LDFLAGS}" \ + CPPFLAGS="${GCC_ARCH_FLAGS} ${GCC_OPT_FLAGS} -Wall" \ + CXXFLAGS="" \ + CFLAGS="" \ + --prefix="${PREFIX}" \ + --disable-nls --with-gnu-ld --with-included-gettext --without-included-regex + ) +} + +install() +{ + ${CP} ${CP_FLAGS} ${BUILDDIR}/sed/sed.exe ${BINARY_PATH} +} + +uninstall() +{ + ${RM} ${RM_FLAGS} ${BINARY_PATH}/sed.exe +} + + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/sed/build-4.1.5-2.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Rev Date Name: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/sed/sed-4.1.5-2.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/sed/sed-4.1.5-2.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/sed/sed-4.1.5-2.patch 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,11 @@ +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x defines.h sed-4.1.5-orig/sed/Makefile.in sed-4.1.5/sed/Makefile.in +--- sed-4.1.5-orig/sed/Makefile.in Fri Feb 3 10:24:35 2006 ++++ sed-4.1.5/sed/Makefile.in Fri Nov 9 20:24:43 2007 +@@ -279,6 +279,7 @@ + sed$(EXEEXT): $(sed_OBJECTS) $(sed_DEPENDENCIES) + @rm -f sed$(EXEEXT) + $(LINK) $(sed_LDFLAGS) $(sed_OBJECTS) $(sed_LDADD) $(LIBS) ++ $(STRIP) $(STRIP_FLAGS) $@ + + mostlyclean-compile: + -rm -f *.$(OBJEXT) Added: trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.0.0-2.sh =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.0.0-2.sh (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.0.0-2.sh 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,134 @@ +#! /usr/bin/sh + +# Name of package +PKG=suitesparse +# Version of Package +VER=3.0.0 +# Release of (this patched) package +REL=1 +# Name&Version of Package +PKGVER=${PKG}-${VER} +# Full name of this patched Package +FULLPKG=${PKGVER}-${REL} + +# Name of source file +SRCFILE=${PKGVER}.tar.gz +TAR_TYPE=z +# Name of Patch file +PATCHFILE=${FULLPKG}.patch + +# URL of source code file +URL="http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.0.0.tar.gz" + +# Top dir of this building process (i.e. where the patch file and source file(s) reside) +TOPDIR=`pwd` +# Directory Source code is extracted to (relative to TOPDIR) +SRCDIR=${PKG} +# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR) +SRCDIR_ORIG=${SRCDIR}-orig +# Directory the lib is built in +BUILDDIR=${SRCDIR} + +# Make file to use +MAKEFILE="" + +# Additional DIFF Flags for generating diff file +DIFF_FLAGS="-x *.def" + +# Directory to put include files into +INCLUDE_DIR=include/suitesparse + +CHOLMOD_INCLUDES="cholmod_core.h cholmod_io64.h cholmod.h cholmod_supernodal.h cholmod_partition.h cholmod_modify.h cholmod_matrixops.h cholmod_internal.h cholmod_config.h cholmod_cholesky.h cholmod_check.h cholmod_blas.h cholmod_complexity.h cholmod_template.h" +UMFPACK_INCLUDES="umfpack.h umfpack_get_lunz.h umfpack_numeric.h umfpack_report_perm.h umfpack_save_symbolic.h umfpack_transpose.h umfpack_col_to_triplet.h umfpack_get_numeric.h umfpack_qsymbolic.h umfpack_report_status.h umfpack_scale.h umfpack_triplet_to_col.h umfpack_defaults.h umfpack_get_symbolic.h umfpack_report_control.h umfpack_report_symbolic.h umfpack_solve.h umfpack_wsolve.h umfpack_free_numeric.h umfpack_global.h umfpack_report_info.h umfpack_report_triplet.h umfpack_symbolic.h umfpack_free_symbolic.h umfpack_load_numeric.h umfpack_report_matrix.h umfpack_report_vector.h umfpack_tictoc.h umfpack_get_determinant.h umfpack_load_symbolic.h umfpack_report_numeric.h umfpack_save_numeric.h umfpack_timer.h" +AMD_INCLUDES="amd.h amd_internal.h" +CAMD_INCLUDES="camd.h camd_internal.h" +COLAMD_INCLUDES="colamd.h" +CCOLAMD_INCLUDES="ccolamd.h" +CXSPARSE_INCLUDES="cs.h" + +source ../gcc42_common.sh + +build() { +( + ( cd ${BUILDDIR}/AMD/Lib && make -f GNUmakefile ); + ( cd ${BUILDDIR}/CAMD/Lib && make -f GNUmakefile ); + ( cd ${BUILDDIR}/CCOLAMD/Lib && make ); + ( cd ${BUILDDIR}/COLAMD/Lib && make ); + ( cd ${BUILDDIR}/CSparse/Lib && make ); + ( cd ${BUILDDIR}/CXSparse/Lib && make ); + ( cd ${BUILDDIR}/CHOLMOD/Lib && make ); + ( cd ${BUILDDIR}/UMFPACK/Lib && make -f GNUmakefile ); +) +} + +clean() { +( + ( cd ${BUILDDIR}/AMD/Lib && make -f GNUmakefile clean ); + ( cd ${BUILDDIR}/CAMD/Lib && make -f GNUmakefile clean ); + ( cd ${BUILDDIR}/CCOLAMD/Lib && make clean ); + ( cd ${BUILDDIR}/COLAMD/Lib && make clean ); + ( cd ${BUILDDIR}/CSparse/Lib && make clean ); + ( cd ${BUILDDIR}/CXSparse/Lib && make clean ); + ( cd ${BUILDDIR}/CHOLMOD/Lib && make clean ); + ( cd ${BUILDDIR}/UMFPACK/Lib && make -f GNUmakefile clean ); +) +} + +install_lib_core() { +( + ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/lib/$1.dll ${BINARY_PATH} + ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/lib/lib$1.dll.a ${LIBRARY_PATH} + ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/lib/lib$1.a ${STATICLIBRARY_PATH} +) +} + +install_header_core() { +( + for a in $2; do ${CP} ${CP_FLAGS} ${BUILDDIR}/$1/Include/${a} ${INCLUDE_PATH}; done +) +} + +install_pre() { if [ ! -e ${INCLUDE_PATH} ]; then mkdir -p ${INCLUDE_PATH}; fi; } + +install() +{ + install_pre + + # Install the libs + install_lib_core amd + install_lib_core camd + install_lib_core ccolamd + install_lib_core colamd + install_lib_core csparse + install_lib_core cxsparse + install_lib_core cholmod + install_lib_core umfpack + + # Install the headers + install_header_core UMFPACK "${UMFPACK_INCLUDES}" + install_header_core CHOLMOD "${CHOLMOD_INCLUDES}" + install_header_core AMD "${AMD_INCLUDES}" + install_header_core CAMD "${CAMD_INCLUDES}" + install_header_core COLAMD "${COLAMD_INCLUDES}" + install_header_core CCOLAMD "${CCOLAMD_INCLUDES}" + install_header_core CXSPARSE "${CXSPARSE_INCLUDES}" + ${CP} ${CP_FLAGS} ${BUILDDIR}/UFconfig/UFconfig.h ${INCLUDE_PATH} + +} + +uninstall() +{ + ${RM} ${RM_FLAGS} ${BINARY_PATH}/lapack.dll + ${RM} ${RM_FLAGS} ${LIBRARY_PATH}/liblapack.dll.a + ${RM} ${RM_FLAGS} ${STATICLIBRARY_PATH}/liblapack.a +} + +all() { + download + unpack + applypatch + build + install +} + +main $* Property changes on: trunk/octave-forge/admin/Windows/mingw32/suitesparse/build-3.0.0-2.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Rev Date Name: svn:eol-style + LF Added: trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.0.0-2.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.0.0-2.patch (rev 0) +++ trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.0.0-2.patch 2007-11-21 17:30:41 UTC (rev 4279) @@ -0,0 +1,280 @@ +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/AMD/Lib/GNUmakefile suitesparse/AMD/Lib/GNUmakefile +--- suitesparse-orig/AMD/Lib/GNUmakefile Sun May 6 12:32:19 2007 ++++ suitesparse/AMD/Lib/GNUmakefile Thu Nov 8 09:58:17 2007 +@@ -2,7 +2,7 @@ + # AMD Makefile for compiling on Unix systems (for GNU make only) + #------------------------------------------------------------------------------- + +-default: ../Lib/libamd.a ++default: ../Lib/libamd.a ../Lib/amd.dll + + include ../../UFconfig/UFconfig.mk + +@@ -46,6 +46,13 @@ + ../Lib/libamd.a: amd_global.o $(AMDI) $(AMDL) + $(AR) ../Lib/libamd.a $^ + - $(RANLIB) ../Lib/libamd.a ++ ++../Lib/amd.dll : ../Lib/libamd.a ++ $(CC) -shared -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive ++ $(STRIP) $(STRIP_FLAGS) $@ + + #------------------------------------------------------------------------------- + # compile the Fortran versions and the libamdf77.a library +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/CAMD/Lib/GNUmakefile suitesparse/CAMD/Lib/GNUmakefile +--- suitesparse-orig/CAMD/Lib/GNUmakefile Sat May 5 14:29:25 2007 ++++ suitesparse/CAMD/Lib/GNUmakefile Thu Nov 8 09:58:43 2007 +@@ -2,7 +2,7 @@ + # CAMD Makefile for compiling on Unix systems (for GNU make only) + #------------------------------------------------------------------------------- + +-default: libcamd.a ++default: libcamd.a camd.dll + + include ../../UFconfig/UFconfig.mk + +@@ -46,6 +46,13 @@ + libcamd.a: camd_global.o $(CAMDI) $(CAMDL) + $(AR) libcamd.a $^ + - $(RANLIB) libcamd.a ++ ++camd.dll : libcamd.a ++ $(CC) -shared -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive ++ $(STRIP) $(STRIP_FLAGS) $@ + + #------------------------------------------------------------------------------- + # Remove all but the files in the original distribution +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/CCOLAMD/Lib/Makefile suitesparse/CCOLAMD/Lib/Makefile +--- suitesparse-orig/CCOLAMD/Lib/Makefile Sat May 5 13:59:13 2007 ++++ suitesparse/CCOLAMD/Lib/Makefile Thu Nov 8 09:58:55 2007 +@@ -2,7 +2,7 @@ + # CCOLAMD Makefile + #------------------------------------------------------------------------------- + +-default: libccolamd.a ++default: libccolamd.a ccolamd.dll + + include ../../UFconfig/UFconfig.mk + +@@ -18,6 +18,13 @@ + $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c + $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o + $(AR) libccolamd.a ccolamd.o ccolamd_l.o ccolamd_global.o ++ ++ccolamd.dll : libccolamd.a ++ $(CC) -shared -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive ++ $(STRIP) $(STRIP_FLAGS) $@ + + ccode: libccolamd.a + +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/CHOLMOD/Lib/Makefile suitesparse/CHOLMOD/Lib/Makefile +--- suitesparse-orig/CHOLMOD/Lib/Makefile Sat May 5 14:36:56 2007 ++++ suitesparse/CHOLMOD/Lib/Makefile Thu Nov 8 09:59:09 2007 +@@ -10,7 +10,7 @@ + + C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) + +-all: libcholmod.a ++all: libcholmod.a cholmod.dll + + library: libcholmod.a + +@@ -112,6 +112,13 @@ + libcholmod.a: $(OBJ) + $(AR) libcholmod.a $(OBJ) + $(RANLIB) libcholmod.a ++ ++cholmod.dll : libcholmod.a ++ $(CC) -shared -o $@ -L../../AMD/Lib -L../../COLAMD/Lib \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive -lamd -lcolamd $(LAPACK) $(BLAS) ++ $(STRIP) $(STRIP_FLAGS) $@ + + $(OBJ): $(INC) + +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/COLAMD/Lib/Makefile suitesparse/COLAMD/Lib/Makefile +--- suitesparse-orig/COLAMD/Lib/Makefile Sat May 5 13:41:47 2007 ++++ suitesparse/COLAMD/Lib/Makefile Thu Nov 8 09:59:18 2007 +@@ -2,7 +2,7 @@ + # COLAMD Makefile + #------------------------------------------------------------------------------- + +-default: libcolamd.a ++default: libcolamd.a colamd.dll + + include ../../UFconfig/UFconfig.mk + +@@ -18,6 +18,13 @@ + $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c + $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o + $(AR) libcolamd.a colamd.o colamd_l.o colamd_global.o ++ ++colamd.dll : libcolamd.a ++ $(CC) -shared -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive ++ $(STRIP) $(STRIP_FLAGS) $@ + + ccode: libcolamd.a + +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/CSparse/Lib/Makefile suitesparse/CSparse/Lib/Makefile +--- suitesparse-orig/CSparse/Lib/Makefile Sat May 5 20:46:13 2007 ++++ suitesparse/CSparse/Lib/Makefile Thu Nov 8 09:59:29 2007 +@@ -1,11 +1,11 @@ + # Modify the "-O" optimization option for best performance (-O3 on Linux): +-CC = cc +-CFLAGS = -O -I../Include ++#CC = cc ++CFLAGS_ADD = -I../Include + + AR = ar cr + RANLIB = ranlib + +-all: libcsparse.a ++all: libcsparse.a csparse.dll + + CS = cs_add.o cs_amd.o cs_chol.o cs_cholsol.o cs_counts.o cs_cumsum.o \ + cs_droptol.o cs_dropzeros.o cs_dupl.o cs_entry.o \ +@@ -20,11 +20,18 @@ + $(CS): ../Include/cs.h Makefile + + %.o: ../Source/%.c ../Include/cs.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CFLAGS_ADD) -c $< + + libcsparse.a: $(CS) + $(AR) libcsparse.a $(CS) + $(RANLIB) libcsparse.a ++ ++csparse.dll : libcsparse.a ++ $(CC) -shared -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive ++ $(STRIP) $(STRIP_FLAGS) $@ + + clean: + rm -f *.o +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/CXSparse/Lib/Makefile suitesparse/CXSparse/Lib/Makefile +--- suitesparse-orig/CXSparse/Lib/Makefile Sat May 5 21:03:41 2007 ++++ suitesparse/CXSparse/Lib/Makefile Thu Nov 8 09:59:41 2007 +@@ -1,12 +1,12 @@ + # Modify the "-O" optimization option for best performance (-O3 on Linux): +-CC = cc +-CFLAGS = -O ++#CC = cc ++#CFLAGS = -O + I = -I../../UFconfig -I../Include + + AR = ar cr + RANLIB = ranlib + +-all: libcxsparse.a ++all: libcxsparse.a cxsparse.dll + + CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \ + cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \ +@@ -88,6 +88,13 @@ + libcxsparse.a: $(CS) + $(AR) libcxsparse.a $(CS) + $(RANLIB) libcxsparse.a ++ ++cxsparse.dll : libcxsparse.a ++ $(CC) -shared -o $@ \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive ++ $(STRIP) $(STRIP_FLAGS) $@ + + clean: + rm -f *.o +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/UFconfig/UFconfig.mk suitesparse/UFconfig/UFconfig.mk +--- suitesparse-orig/UFconfig/UFconfig.mk Thu May 10 13:46:08 2007 ++++ suitesparse/UFconfig/UFconfig.mk Thu Nov 8 09:21:35 2007 +@@ -32,8 +32,8 @@ + # C compiler and compiler flags: These will normally not give you optimal + # performance. You should select the optimization parameters that are best + # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. +-CC = cc +-CFLAGS = -O ++#CC = cc ++CFLAGS = $(GCC_ARCH_FLAGS) $(GCC_OPT_FLAGS) + + # ranlib, and ar, for generating libraries + RANLIB = ranlib +@@ -44,8 +44,8 @@ + MV = mv -f + + # Fortran compiler (not normally required) +-F77 = f77 +-F77FLAGS = -O ++#F77 = f77 ++F77FLAGS = $(GCC_OPT_FLAGS) + F77LIB = + + # C and Fortran libraries +@@ -85,7 +85,8 @@ + # BLAS = -lgoto -lgfortran -lgfortranbegin + + # This is probably slow ... it might connect to the Standard Reference BLAS: +-BLAS = -lblas -lgfortran -lgfortranbegin ++#BLAS = -lblas -lgfortran -lgfortranbegin ++BLAS = -lblas + LAPACK = -llapack + + # The BLAS might not contain xerbla, an error-handling routine for LAPACK and +@@ -176,7 +177,7 @@ + # -DNSUNPERF for Solaris only. If defined, do not use the Sun + # Performance Library + +-CHOLMOD_CONFIG = ++CHOLMOD_CONFIG = -DNPARTITION + + #------------------------------------------------------------------------------ + # Linux +@@ -193,7 +194,7 @@ + # CFLAGS = -O3 -fexceptions \ + -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ + -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi +-CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE ++# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + # CFLAGS = -O3 + + # consider: +diff -urN -x *.exe -x *.dll -x *.o -x *.a -x *.bak -x *.def suitesparse-orig/UMFPACK/Lib/GNUmakefile suitesparse/UMFPACK/Lib/GNUmakefile +--- suitesparse-orig/UMFPACK/Lib/GNUmakefile Sun May 6 12:31:22 2007 ++++ suitesparse/UMFPACK/Lib/GNUmakefile Thu Nov 8 09:59:54 2007 +@@ -2,7 +2,7 @@ + # UMFPACK Makefile for compiling on Unix systems (for GNU Make) + #------------------------------------------------------------------------------- + +-default: ../Lib/libumfpack.a ++default: ../Lib/libumfpack.a ../Lib/umfpack.dll + + include ../../UFconfig/UFconfig.mk + +@@ -246,6 +246,13 @@ + ../Lib/libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) + $(AR) ../Lib/libumfpack.a $^ + - $(RANLIB) ../Lib/libumfpack.a ++ ++../Lib/umfpack.dll : ../Lib/libumfpack.a ++ $(CC) -shared -o $@ -L../../AMD/Lib \ ++ -Wl,--whole-archive $< \ ++ -Wl,--out-implib,$(basename $<).dll.a \ ++ -Wl,--no-whole-archive -lamd $(BLAS) ++ $(STRIP) $(STRIP_FLAGS) $@ + + #------------------------------------------------------------------------------- + # Remove all but the files in the original distribution This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |