mirror of https://git.wownero.com/dsc/mxe.git
armadillo: update 7.960.1 --> 8.200.2 and enable hdf5 + openblas
This commit is contained in:
parent
2194eb9855
commit
c864d52468
|
@ -1,18 +1,19 @@
|
|||
From f33262c29c253608f57e91af0e96bdb7bfa3cc00 Mon Sep 17 00:00:00 2001
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Sun, 19 Oct 2014 12:09:55 -0400
|
||||
Subject: [PATCH] Don't export package
|
||||
Subject: [PATCH 1/1] Don't export package
|
||||
|
||||
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d0f2180..5ecba48 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -402,7 +402,9 @@ install(TARGETS armadillo EXPORT ArmadilloLibraryDepends
|
||||
@@ -444,7 +444,9 @@ install(TARGETS armadillo EXPORT ArmadilloLibraryDepends
|
||||
|
||||
# Export the package for use from the build-tree
|
||||
# (this registers the build-tree with a global CMake-registry)
|
||||
|
@ -23,6 +24,3 @@ index d0f2180..5ecba48 100644
|
|||
|
||||
## LOCAL FILES
|
||||
# Create ArmadilloConfig.cmake file for the use from the build tree
|
||||
--
|
||||
1.9.1
|
||||
|
|
@ -4,12 +4,12 @@ PKG := armadillo
|
|||
$(PKG)_WEBSITE := https://arma.sourceforge.io/
|
||||
$(PKG)_DESCR := Armadillo C++ linear algebra library
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 7.960.1
|
||||
$(PKG)_CHECKSUM := 57de6b9eb547f168e5dd2d2736c75b609bb2d1761120f608ff6530d7247082ff
|
||||
$(PKG)_VERSION := 8.200.2
|
||||
$(PKG)_CHECKSUM := 63845e36235f2bd78b4f6890fe5013b6ce51a4e92e3176b20bbc6631b340050a
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc blas lapack
|
||||
$(PKG)_DEPS := gcc hdf5 openblas
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- 'https://sourceforge.net/projects/arma/files/' | \
|
||||
|
@ -18,13 +18,25 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
mkdir '$(1)/build'
|
||||
cd '$(1)/build' && '$(TARGET)-cmake' .. \
|
||||
-DARMA_USE_WRAPPER=false
|
||||
$(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1
|
||||
# build and install the library
|
||||
cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
|
||||
-DDETECT_HDF5=ON \
|
||||
-DARMA_USE_WRAPPER=ON
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
|
||||
|
||||
# create pkg-config file
|
||||
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
|
||||
(echo 'Name: $(PKG)'; \
|
||||
echo 'Version: $($(PKG)_VERSION)'; \
|
||||
echo 'Description: $($(PKG)_DESCR)'; \
|
||||
echo 'Requires: hdf5 openblas'; \
|
||||
echo 'Libs: -larmadillo'; \
|
||||
) > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
|
||||
|
||||
# compile test
|
||||
'$(TARGET)-g++' \
|
||||
-W -Wall -Werror \
|
||||
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-armadillo.exe' \
|
||||
-larmadillo -llapack -lblas -lgfortran -lquadmath
|
||||
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
|
||||
`'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
|
||||
endef
|
||||
|
|
Loading…
Reference in New Issue