changeset 4281:d3d22f217ad0

* src/arpack.mk: update to 3.4.0
author John D
date Sun, 18 Dec 2016 13:17:36 -0500
parents 503eebae5f78
children e35307c8102e
files src/arpack.mk
diffstat 1 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/arpack.mk	Sat Dec 17 18:56:49 2016 -0500
+++ b/src/arpack.mk	Sun Dec 18 13:17:36 2016 -0500
@@ -3,8 +3,8 @@
 
 PKG             := arpack
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.3.0
-$(PKG)_CHECKSUM := b62bb47126fac75d659b2e9622ce8f7b52bef122
+$(PKG)_VERSION  := 3.4.0
+$(PKG)_CHECKSUM := c6ea9ea1712c27ec45fbf33c3f064fdba7e9c89b
 $(PKG)_SUBDIR   := $(PKG)-ng-$($(PKG)_VERSION)
 $(PKG)_FILE     := arpack-ng_$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/opencollab/arpack-ng/archive/$($(PKG)_VERSION).tar.gz
@@ -39,17 +39,11 @@
         F77=$(MXE_F77) \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --enable-static --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
 	$($(PKG)_CONFIGURE_PIC_OPTION) \
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) && $(CONFIGURE_POST_HOOK)
+
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
-
-    if [ $(BUILD_STATIC) = yes ]; then \
-      $(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 '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' --bindir '$($(PKG)_DESTDIR)$(HOST_BINDIR)' -llapack -lblas; \
-    fi
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$($(PKG)_DESTDIR)'
 endef