[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Build fixes
From: |
David Grundberg |
Subject: |
Build fixes |
Date: |
Wed, 21 Oct 2009 10:25:39 +0200 |
User-agent: |
Thunderbird 2.0.0.21 (X11/20090302) |
Hi,
I had to make some changes to build Octave. The changes regard ARPACK,
UMFPACK, SparseCX and QHULL.
David
# HG changeset patch
# User David Grundberg <address@hidden>
# Date 1256113050 -7200
# Node ID 21678508551c1ffce7daf68bf6579197b26103dd
# Parent 7bda650b691a21434cddb2452a0fbc77c558a9ca
Miscellaneous build fixes
diff -r 7bda650b691a -r 21678508551c ChangeLog
--- a/ChangeLog Tue Oct 20 15:45:09 2009 +0200
+++ b/ChangeLog Wed Oct 21 10:17:30 2009 +0200
@@ -1,3 +1,7 @@
+2009-10-21 David Grundberg <address@hidden>
+
+ * configure.ac: Use AMD_CPPFLAGS while checking for UMFPACK.
+
2009-10-20 Jaroslav Hajek <address@hidden>
* NEWS: Update.
diff -r 7bda650b691a -r 21678508551c configure.ac
--- a/configure.ac Tue Oct 20 15:45:09 2009 +0200
+++ b/configure.ac Wed Oct 21 10:17:30 2009 +0200
@@ -976,12 +976,15 @@
# Check for UMFPACK library.
save_LIBS="$LIBS"
+save_CPPFLAGS="$CPPFLAGS"
LIBS="$AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
+CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS"
OCTAVE_CHECK_LIBRARY(umfpack, UMFPACK,
[UMFPACK not found. This will result in some lack of functionality for
sparse matrices.],
[suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h],
[umfpack_zi_get_determinant],
[], [don't use UMFPACK, disable some sparse functionality])
+CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
if test -z "$UMFPACK_LIBS"; then
diff -r 7bda650b691a -r 21678508551c liboctave/ChangeLog
--- a/liboctave/ChangeLog Tue Oct 20 15:45:09 2009 +0200
+++ b/liboctave/ChangeLog Wed Oct 21 10:17:30 2009 +0200
@@ -1,3 +1,9 @@
+2009-10-21 David Grundberg <address@hidden>
+
+ * Makefile.in (LINK_DEPS): Use ARPACK_LDFLAGS and
+ QRUPDATE_LDFLAGS.
+ (SparseQR.d, SparseQR.df, pic/SparseQR.o, SparseQR.o): New rule.
+
2009-10-20 Jaroslav Hajek <address@hidden>
* bsxfun-decl.h, bsxfun-defs.cc: New sources.
diff -r 7bda650b691a -r 21678508551c liboctave/Makefile.in
--- a/liboctave/Makefile.in Tue Oct 20 15:45:09 2009 +0200
+++ b/liboctave/Makefile.in Wed Oct 21 10:17:30 2009 +0200
@@ -38,8 +38,8 @@
$(RLD_FLAG) \
-L../libcruft $(LIBCRUFT) \
$(SPARSE_LDFLAGS) $(SPARSE_LIBS) \
- $(ARPACK_LIBS) \
- $(QRUPDATE_LIBS) \
+ $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \
+ $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \
$(FFTW_LDFLAGS) $(FFTW_LIBS) \
$(BLAS_LIBS) \
$(READLINE_LIBS) $(TERM_LIBS) \
@@ -404,6 +404,9 @@
SparseCmplxQR.d SparseCmplxQR.df pic/SparseCmplxQR.o SparseCmplxQR.o: \
CPPFLAGS += $(SPARSE_CPPFLAGS)
+SparseQR.d SparseQR.df pic/SparseQR.o SparseQR.o: \
+ CPPFLAGS += $(SPARSE_CPPFLAGS)
+
SparsedbleQR.d SparsedbleQR.df pic/SparsedbleQR.o SparsedbleQR.o: \
CPPFLAGS += $(SPARSE_CPPFLAGS)
diff -r 7bda650b691a -r 21678508551c src/ChangeLog
--- a/src/ChangeLog Tue Oct 20 15:45:09 2009 +0200
+++ b/src/ChangeLog Wed Oct 21 10:17:30 2009 +0200
@@ -1,3 +1,7 @@
+2009-10-21 David Grundberg <address@hidden>
+
+ * Makefile.in: Spell convhulln correctly.
+
2009-10-20 Jaroslav Hajek <address@hidden>
* ov-base.h (builtin_type_t): Declare also btyp_num_types.
diff -r 7bda650b691a -r 21678508551c src/Makefile.in
--- a/src/Makefile.in Tue Oct 20 15:45:09 2009 +0200
+++ b/src/Makefile.in Wed Oct 21 10:17:30 2009 +0200
@@ -688,7 +688,7 @@
CPPFLAGS += $(MAGICK_CPPFLAGS)
__magick_read__.oct: OCT_LINK_DEPS += $(MAGICK_LDFLAGS) $(MAGICK_LIBS)
-convhull.d convhull.df convhull.o pic/convhull.o: CPPFLAGS += $(QHULL_CPPFLAGS)
+convhulln.d convhulln.df convhulln.o pic/convhulln.o: CPPFLAGS +=
$(QHULL_CPPFLAGS)
convhulln.oct: OCT_LINK_DEPS += $(QHULL_LDFLAGS) $(QHULL_LIBS)
__delaunayn__.d __delaunayn__.df __delaunayn__.o pic/__delaunayn__.o: \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Build fixes,
David Grundberg <=