Mercurial > mxe-octave
changeset 3664:ec301e1de20f
arpack: dont use destdir in native mingw mode
* src/arpack.mk: set DESTDIR to "" in native mingw mode
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 24 Jul 2014 19:01:06 -0400 |
| parents | 16615236ec37 |
| children | d28dcb8df4eb |
| files | src/arpack.mk |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/arpack.mk Sat Jul 12 07:55:32 2014 -0400 +++ b/src/arpack.mk Thu Jul 24 19:01:06 2014 -0400 @@ -9,11 +9,16 @@ $(PKG)_FILE := arpack-ng_$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/$($(PKG)_FILE) $(PKG)_DEPS := blas lapack +$(PKG)_DESTDIR := '$(3)' ifeq ($(MXE_NATIVE_BUILD),yes) $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) endif +ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) + $(PKG)_DESTDIR := +endif + ifeq ($(USE_PIC_FLAG),yes) $(PKG)_CONFIGURE_PIC_OPTION := --with-pic endif @@ -22,8 +27,6 @@ $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := FFLAGS="-g -O2 -fdefault-integer-8" endif -$(PKG)_BLAS_LIB := blas - define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package arpack.' >&2; echo $(arpack_VERSION) @@ -42,10 +45,10 @@ $(MAKE) -C '$(1)/.build' -j '$(JOBS)' if [ $(BUILD_STATIC) = yes ]; then \ - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'; \ + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$($(PKG)_DESTDIR)'; \ fi if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)' -llapack -l$($(PKG)_BLAS_LIB); \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' --bindir '$($(PKG)_DESTDIR)$(HOST_BINDIR)' -llapack -lblas; \ fi endef