# HG changeset patch # User Markus Mützel # Date 1650215632 -7200 # Node ID e61f3c72384020a0c8a862cc06c6bcab4b79f070 # Parent 5c8920eacf6a214eb5efabbe872c5747d81d4d59 LAPACK: Fix native build. * src/lapack.mk: Expand AR and RANLIB to full path. Use cmake to build and install. diff -r 5c8920eacf6a -r e61f3c723840 src/lapack.mk --- a/src/lapack.mk Sun Apr 17 17:15:37 2022 +0200 +++ b/src/lapack.mk Sun Apr 17 19:13:52 2022 +0200 @@ -39,8 +39,7 @@ define $(PKG)_BUILD cd '$(1)' && \ cp INSTALL/make.inc.gfortran make.inc && \ - sed -i -e 's/\(FORTRAN[ ]*\)=.*/\1= $(MXE_F77)/' \ - -e 's/\(LOADER[ ]*\)=.*/\1= $(MXE_F77)/' \ + sed -i -e 's/\(FC[ ]*\)=.*/\1= $(MXE_F77)/' \ -e 's/\(CC[ ]*\)=.*/\1= $(MXE_CC)/' \ -e 's/\(CFLAGS[ ]*\)=.*/\1= -O2/' make.inc @@ -64,13 +63,15 @@ $(CMAKE_CCACHE_FLAGS) \ $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_AR='$(MXE_AR)' \ - -DCMAKE_RANLIB='$(MXE_RANLIB)' \ + -DCMAKE_AR='$(shell which $(MXE_AR))' \ + -DCMAKE_RANLIB='$(shell which $(MXE_RANLIB))' \ -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \ -DBUILD_DEPRECATED=ON \ -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \ $($(PKG)_BLAS_CONFIG_OPTS) \ $(1) - $(MAKE) -C '$(1)/build/SRC' -j '$(JOBS)' VERBOSE=1 install DESTDIR='$(3)' + + cmake --build '$(1)/build' + DESTDIR='$(3)' cmake --install '$(1)/build' endef endif