From: <lin...@us...> - 2009-10-30 20:07:40
|
Revision: 6415 http://octave.svn.sourceforge.net/octave/?rev=6415&view=rev Author: lindnerb Date: 2009-10-30 20:07:31 +0000 (Fri, 30 Oct 2009) Log Message: ----------- mingw32: bugfix in suitesparse-3.2.0-4.patch causing test executable to segfault Empirical fix of removing the .def specifications when generating shared libraries. Using it causes segfaults. Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-4.patch Modified: trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-4.patch =================================================================== --- trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-4.patch 2009-10-30 19:15:28 UTC (rev 6414) +++ trunk/octave-forge/admin/Windows/mingw32/suitesparse/suitesparse-3.2.0-4.patch 2009-10-30 20:07:31 UTC (rev 6415) @@ -1,6 +1,6 @@ diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/AMD/Lib/GNUmakefile suitesparse-HG/AMD/Lib/GNUmakefile --- suitesparse-3-2-0/AMD/Lib/GNUmakefile 2009-10-03 18:48:54 +0200 -+++ suitesparse-HG/AMD/Lib/GNUmakefile 2009-10-03 19:08:20 +0200 ++++ suitesparse-HG/AMD/Lib/GNUmakefile 2009-10-30 19:01:05 +0100 @@ -2,11 +2,15 @@ # AMD Makefile for compiling on Unix systems (for GNU make only) #------------------------------------------------------------------------------- @@ -48,7 +48,7 @@ $(C) -DDLONG -c $< -o $@ #------------------------------------------------------------------------------- -@@ -44,9 +48,17 @@ +@@ -44,9 +48,16 @@ #------------------------------------------------------------------------------- ../Lib/libamd.a: amd_global.o $(AMDI) $(AMDL) @@ -58,7 +58,6 @@ +../Lib/amd.dll : ../Lib/libamd.a + $(CC) -shared $(LDFLAGS) -o $@ \ -+ $(SRCDIR)/Lib/libamd.def \ + -Wl,--whole-archive $< \ + -Wl,--out-implib,$(basename $<).dll.a \ + -Wl,--output-def=$@.exp \ @@ -67,7 +66,7 @@ #------------------------------------------------------------------------------- # compile the Fortran versions and the libamdf77.a library #------------------------------------------------------------------------------- -@@ -55,14 +67,14 @@ +@@ -55,14 +66,14 @@ AMDF77 = amd.o amdbar.o @@ -87,7 +86,7 @@ - $(RANLIB) ../Lib/libamdf77.a #------------------------------------------------------------------------------- -@@ -75,4 +87,4 @@ +@@ -75,4 +86,4 @@ purge: distclean distclean: clean @@ -95,7 +94,7 @@ + - $(RM) ../Lib/libamd.a ../Lib/libamdf77.a ../Lib/amd.dll ../Lib/libamd.dll.a diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/AMD/Lib/libamd.def suitesparse-HG/AMD/Lib/libamd.def --- suitesparse-3-2-0/AMD/Lib/libamd.def 2009-10-03 18:48:54 +0200 -+++ suitesparse-HG/AMD/Lib/libamd.def 2009-10-03 19:40:53 +0200 ++++ suitesparse-HG/AMD/Lib/libamd.def 2009-10-30 19:00:47 +0100 @@ -1,12 +1,24 @@ -LIBRARY libamd.dll EXPORTS @@ -124,7 +123,7 @@ +amd_printf diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/CAMD/Lib/GNUmakefile suitesparse-HG/CAMD/Lib/GNUmakefile --- suitesparse-3-2-0/CAMD/Lib/GNUmakefile 2009-10-03 18:48:54 +0200 -+++ suitesparse-HG/CAMD/Lib/GNUmakefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/CAMD/Lib/GNUmakefile 2009-10-30 19:01:39 +0100 @@ -2,11 +2,15 @@ # CAMD Makefile for compiling on Unix systems (for GNU make only) #------------------------------------------------------------------------------- @@ -172,7 +171,7 @@ $(C) -DDLONG -c $< -o $@ #------------------------------------------------------------------------------- -@@ -44,9 +48,17 @@ +@@ -44,9 +48,16 @@ #------------------------------------------------------------------------------- libcamd.a: camd_global.o $(CAMDI) $(CAMDL) @@ -182,7 +181,6 @@ +camd.dll : libcamd.a + $(CC) -shared $(LDFLAGS) -o $@ \ -+ $(SRCDIR)/Lib/libcamd.def \ + -Wl,--whole-archive $< \ + -Wl,--out-implib,$(basename $<).dll.a \ + -Wl,--output-def=$@.exp \ @@ -191,7 +189,7 @@ #------------------------------------------------------------------------------- # Remove all but the files in the original distribution #------------------------------------------------------------------------------- -@@ -57,4 +69,4 @@ +@@ -57,4 +68,4 @@ purge: distclean distclean: clean @@ -199,7 +197,7 @@ + - $(RM) libcamd.a camd.dll libcamd.dll.a diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/CAMD/Lib/libcamd.def suitesparse-HG/CAMD/Lib/libcamd.def --- suitesparse-3-2-0/CAMD/Lib/libcamd.def 2009-10-03 18:48:54 +0200 -+++ suitesparse-HG/CAMD/Lib/libcamd.def 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/CAMD/Lib/libcamd.def 2009-10-30 19:01:12 +0100 @@ -1,12 +1,23 @@ -LIBRARY libcamd.dll EXPORTS @@ -229,7 +227,7 @@ +camd_printf diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/CCOLAMD/Lib/Makefile suitesparse-HG/CCOLAMD/Lib/Makefile --- suitesparse-3-2-0/CCOLAMD/Lib/Makefile 2009-10-03 18:48:54 +0200 -+++ suitesparse-HG/CCOLAMD/Lib/Makefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/CCOLAMD/Lib/Makefile 2009-10-30 19:01:46 +0100 @@ -2,22 +2,33 @@ # CCOLAMD Makefile #------------------------------------------------------------------------------- @@ -280,7 +278,7 @@ + - $(RM) libccolamd.a ccolamd.dll libccolamd.dll.a diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/CHOLMOD/Lib/Makefile suitesparse-HG/CHOLMOD/Lib/Makefile --- suitesparse-3-2-0/CHOLMOD/Lib/Makefile 2009-10-03 18:48:55 +0200 -+++ suitesparse-HG/CHOLMOD/Lib/Makefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/CHOLMOD/Lib/Makefile 2009-10-30 19:02:03 +0100 @@ -4,20 +4,24 @@ default: all @@ -829,7 +827,7 @@ $(C) -DDLONG -c $(I) $< -o $@ diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/COLAMD/Lib/Makefile suitesparse-HG/COLAMD/Lib/Makefile --- suitesparse-3-2-0/COLAMD/Lib/Makefile 2009-10-03 18:48:54 +0200 -+++ suitesparse-HG/COLAMD/Lib/Makefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/COLAMD/Lib/Makefile 2009-10-30 19:02:19 +0100 @@ -2,23 +2,34 @@ # COLAMD Makefile #------------------------------------------------------------------------------- @@ -885,7 +883,7 @@ + - $(RM) libcolamd.a colamd.dll libcolamd.dll.a diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/CSparse/Lib/Makefile suitesparse-HG/CSparse/Lib/Makefile --- suitesparse-3-2-0/CSparse/Lib/Makefile 2009-10-03 18:48:55 +0200 -+++ suitesparse-HG/CSparse/Lib/Makefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/CSparse/Lib/Makefile 2009-10-30 19:02:32 +0100 @@ -1,11 +1,13 @@ # Modify the "-O" optimization option for best performance (-O3 on Linux): -CC = cc @@ -940,7 +938,7 @@ + rm -f *.a csparse.dll libcsparse.dll.a diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/CXSparse/Lib/Makefile suitesparse-HG/CXSparse/Lib/Makefile --- suitesparse-3-2-0/CXSparse/Lib/Makefile 2009-10-03 18:48:55 +0200 -+++ suitesparse-HG/CXSparse/Lib/Makefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/CXSparse/Lib/Makefile 2009-10-30 19:02:46 +0100 @@ -5,12 +5,16 @@ include ../../UFconfig/UFconfig.mk @@ -1009,7 +1007,7 @@ + rm -f *.a cxsparse.dll cxsparse.dll.a diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/UFconfig/UFconfig.mk suitesparse-HG/UFconfig/UFconfig.mk --- suitesparse-3-2-0/UFconfig/UFconfig.mk 2009-10-03 18:48:58 +0200 -+++ suitesparse-HG/UFconfig/UFconfig.mk 2009-10-03 19:42:03 +0200 ++++ suitesparse-HG/UFconfig/UFconfig.mk 2009-10-30 19:03:18 +0100 @@ -30,25 +30,28 @@ # Generic configuration #------------------------------------------------------------------------------ @@ -1091,7 +1089,7 @@ # CFLAGS = -g -fexceptions \ diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/UMFPACK/Lib/GNUmakefile suitesparse-HG/UMFPACK/Lib/GNUmakefile --- suitesparse-3-2-0/UMFPACK/Lib/GNUmakefile 2009-10-03 18:48:58 +0200 -+++ suitesparse-HG/UMFPACK/Lib/GNUmakefile 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/UMFPACK/Lib/GNUmakefile 2009-10-30 19:03:10 +0100 @@ -2,12 +2,16 @@ # UMFPACK Makefile for compiling on Unix systems (for GNU Make) #------------------------------------------------------------------------------- @@ -1331,7 +1329,7 @@ $(C) -c $< -o $@ #------------------------------------------------------------------------------- -@@ -244,15 +248,23 @@ +@@ -244,15 +248,22 @@ #------------------------------------------------------------------------------- ../Lib/libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) @@ -1341,7 +1339,6 @@ +../Lib/umfpack.dll : ../Lib/libumfpack.a + $(CC) -shared $(LDFLAGS) -o $@ -L../../AMD/Lib \ -+ $(SRCDIR)/Lib/libumfpack.def \ + -Wl,--whole-archive $< \ + -Wl,--out-implib,$(basename $<).dll.a \ + -Wl,--output-def=$@.exp \ @@ -1359,7 +1356,7 @@ - $(RM) $(CLEAN) diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' suitesparse-3-2-0/UMFPACK/Lib/libumfpack.def suitesparse-HG/UMFPACK/Lib/libumfpack.def --- suitesparse-3-2-0/UMFPACK/Lib/libumfpack.def 2009-10-03 18:48:58 +0200 -+++ suitesparse-HG/UMFPACK/Lib/libumfpack.def 2009-10-03 19:40:58 +0200 ++++ suitesparse-HG/UMFPACK/Lib/libumfpack.def 2009-10-30 19:02:56 +0100 @@ -1,4 +1,3 @@ -LIBRARY libumfpack.dll EXPORTS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |