Mercurial > octave-nkf

changeset 9615:ee3a5e9a381c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed SPARSE_LIBS order to respect dependency
author Marco Atzeri <marco_atzeri@yahoo.it>
date Fri, 04 Sep 2009 11:34:57 -0400
parents d4557fd08323
children 2093499ec9f4
files ChangeLog Makeconf.in
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 04 11:30:46 2009 -0400
+++ b/ChangeLog	Fri Sep 04 11:34:57 2009 -0400
@@ -1,3 +1,7 @@
+2009-09-02  Marco Atzeri  <marco_atzeri@yahoo.it>
+
+	* Makeconf.in: Order SPARSE_LIBS so linking succeeds on Cygwin.
+
 2009-09-04  Marco Atzeri  <marco_atzeri@yahoo.it>
 
 	*  README.Cygwin: Update version info.
--- a/Makeconf.in	Fri Sep 04 11:30:46 2009 -0400
+++ b/Makeconf.in	Fri Sep 04 11:34:57 2009 -0400
@@ -320,11 +320,11 @@
     $(CCOLAMD_LDFLAGS) $(CHOLMOD_LDFLAGS) $(CXSPARSE_LDFLAGS) \
     $(UMFPACK_LDFLAGS))
 
-## FIXME -- does order matter here?
+## Order matters, at least on some systems (Cygwin, for example).
 SPARSE_LIBS = \
-  $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \
-    $(CCOLAMD_LIBS) $(CHOLMOD_LIBS) $(CXSPARSE_LIBS) \
-    $(UMFPACK_LIBS)
+    $(CHOLMOD_LIBS) $(UMFPACK_LIBS) \
+    $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \
+    $(CCOLAMD_LIBS) $(CXSPARSE_LIBS)
 
 ## Use sort to remove duplicates.
 FFTW_CPPFLAGS = $(sort $(FFTW3_CPPFLAGS) $(FFTW3F_CPPFLAGS))