Mercurial > mxe-octave

changeset 3972:40b0b14d7eef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lapack: combine native mingw, msvc rules * src/lapack.mk: remove native mingw rule an use msvc rule
author John Donoghue
date Tue, 16 Jun 2015 12:05:52 -0400
parents e1e6cb9b8b44
children 4f586cfb8438
files src/lapack.mk
diffstat 1 files changed, 3 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/lapack.mk	Tue Jun 16 11:56:34 2015 -0400
+++ b/src/lapack.mk	Tue Jun 16 12:05:52 2015 -0400
@@ -27,7 +27,6 @@
 endef
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
-ifeq ($(MXE_SYSTEM),msvc)
 define $(PKG)_BUILD
     cd '$(1)' && \
         cp INSTALL/make.inc.gfortran make.inc && \
@@ -39,43 +38,19 @@
     $(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 '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)' -lblas; \
+        $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/liblapack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -lblas; \
     fi
 
-    $(INSTALL) -d '$(3)$(HOST_LIBDIR)/pkgconfig' 
+    $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' 
     $(SED) -e 's/@LAPACK_VERSION@/$($(PKG)_VERSION)/' \
            -e 's,@prefix@,$(HOST_PREFIX),' \
 	   -e 's,@libdir@,$${prefix}/lib,' '$(1)/lapack.pc.in' > '$(1)/lapack.pc'
-    $(INSTALL) '$(1)/lapack.pc' '$(3)$(HOST_LIBDIR)/pkgconfig/'
+    $(INSTALL) '$(1)/lapack.pc' '$(HOST_LIBDIR)/pkgconfig/'
 
 endef
 else
 define $(PKG)_BUILD
     cd '$(1)' && cmake \
-        -G 'MSYS Makefiles' \
-        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \
-        $($(PKG)_BLAS_CONFIG_OPTS) \
-        .
-    $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install DESTDIR='$(3)'
-
-    if [ $(BUILD_SHARED) = yes ]; then \
-      $(INSTALL) '$(1)/lib/liblapack.dll.a' '$(3)$(HOST_LIBDIR)/'; \
-      $(INSTALL) '$(1)/lib/liblapack.lib' '$(3)$(HOST_LIBDIR)/'; \
-      $(INSTALL) '$(1)/bin/liblapack.dll' '$(3)$(HOST_BINDIR)/'; \
-    fi
-    if [ $(BUILD_STATIC) = yes ]; then \
-      $(INSTALL) '$(1)/lib/liblapack.a' '$(3)$(HOST_LIBDIR)/'; \
-    fi
-
-    $(INSTALL) -d '$(3)$(HOST_LIBDIR)/pkgconfig' 
-    $(INSTALL) '$(1)/lapack.pc' '$(3)$(HOST_LIBDIR)/pkgconfig/'
-
-endef
-endif
-else
-define $(PKG)_BUILD
-    cd '$(1)' && cmake \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_AR='$(MXE_AR)' \
         -DCMAKE_RANLIB='$(MXE_RANLIB)' \