Mercurial > mxe-octave
changeset 4749:ad711297712a
stable-octave.mk: handle libxerbla
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 29 Jun 2018 10:41:56 -0400 |
| parents | a6b4355efbd6 |
| children | a65bf962f556 |
| files | src/stable-octave.mk |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/stable-octave.mk Thu Jun 28 13:39:45 2018 -0400 +++ b/src/stable-octave.mk Fri Jun 29 10:41:56 2018 -0400 @@ -29,7 +29,9 @@ $(PKG)_DEPS += qt endif -ifeq ($(MXE_WINDOWS_BUILD),no) +ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_WITH_BLAS_CONFIGURE_OPTIONS := --with-blas="-lblas -lxerbla" +else ifeq ($(USE_SYSTEM_X11_LIBS),no) $(PKG)_DEPS += x11 xext endif @@ -173,6 +175,7 @@ --disable-silent-rules \ --enable-install-build-logs \ $($(PKG)_CROSS_CONFIG_OPTIONS) \ + $($(PKG)_WITH_BLAS_CONFIGURE_OPTIONS) \ $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ $($(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS) \ $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ @@ -192,6 +195,7 @@ $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ + $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \ cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \