Mercurial > mxe-octave
diff src/lapack.mk @ 4734:80461a9e516c
override default xerbla with version from Octave
* mingw-blas-1-xerbla.patch, blas.mk: Build default libxerbla lib.
* mingw-lapack-1-xerbla.patch, lapack.mk: Use external libxerbla.
* mingw-openblas-1-xerbla.patch, openblas.mk: Likewise.
* src/qrupdate-1-fixes.patch: Likewise.
* default-octave.mk: Also install libxerbla.dll as libxerbla-octave.dll.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 21 Jun 2018 01:32:10 -0400 |
| parents | 4fcca3aafbd4 |
| children | d40cc91c2355 |
line wrap: on
line diff
--- a/src/lapack.mk Sat Jun 09 10:13:46 2018 -0400 +++ b/src/lapack.mk Thu Jun 21 01:32:10 2018 -0400 @@ -11,9 +11,15 @@ $(PKG)_DEPS := blas ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=$(HOST_BINDIR)/libblas.dll + $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="$(HOST_BINDIR)/libblas.dll $(HOST_BINDIR)/libxerbla.dll" else - $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas" +ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas -lxerbla" -DBLAS_LINKER_FLAGS="-L$(HOST_PREFIX)/lib -lblas -lxerbla" + $(PKG)_BLAS_LIBS := -lblas -lxerbla +else + $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas" -DBLAS_LINKER_FLAGS="-L$(HOST_PREFIX)/lib -lblas" + $(PKG)_BLAS_LIBS := -lblas +endif endif ifeq ($(ENABLE_FORTRAN_INT64),yes) @@ -38,7 +44,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 lapacklib if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/liblapack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -lblas; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/liblapack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' $($(PKG)_BLAS_LIBS); \ fi $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig'