Mercurial > mxe-octave

changeset 4741:35464f52609a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow qrupdate to build without separate xerbla lib
author John W. Eaton <jwe@octave.org>
date Tue, 26 Jun 2018 15:33:39 -0400
parents 9942a9c37ffe
children f54322738d5f
files src/qrupdate-1-fixes.patch src/qrupdate.mk
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qrupdate-1-fixes.patch	Tue Jun 26 13:22:51 2018 -0400
+++ b/src/qrupdate-1-fixes.patch	Tue Jun 26 15:33:39 2018 -0400
@@ -44477,7 +44477,7 @@
 +
 +libqrupdate_la_LIBADD = \
 + $(LAPACK_LIBS) \
-+ $(BLAS_LIBS) -lxerbla
++ $(BLAS_LIBS) $(XERBLA_LIB)
 +
 +libqrupdate_la_SOURCES = \
 +caxcpy.f cch1dn.f cch1up.f cchdex.f cchinx.f cchshx.f cgqvec.f   \
--- a/src/qrupdate.mk	Tue Jun 26 13:22:51 2018 -0400
+++ b/src/qrupdate.mk	Tue Jun 26 15:33:39 2018 -0400
@@ -14,6 +14,10 @@
   $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := FFLAGS="-g -O2 -fdefault-integer-8"
 endif
 
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  $(PKG)_XERBLA_LIB_MAKE_OPTION := XERBLA_LIB="-lxerbla"
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package qrupdate.' >&2;
     echo $(qrupdate_VERSION)
@@ -33,5 +37,6 @@
         $($(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS) \
           && $(CONFIGURE_POST_HOOK)
 
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' \
+        $($(PKG)_XERBLA_LIB_MAKE_OPTION) install DESTDIR='$(3)'
 endef