@@ -2,16 +2,18 @@ comment "armadillo needs a toolchain w/ C++"
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP
-comment "armadillo needs a toolchain w/ fortran, C++"
+comment "armadillo needs a toolchain w/ fortran, C++, gcc >= 4.9"
depends on !BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # otherwise, see comment above
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_FORTRAN || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
config BR2_PACKAGE_ARMADILLO
bool "armadillo"
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS || \
(BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN)
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
help
Armadillo: An Open Source C++ Linear Algebra Library for
Fast Prototyping and Computationally Intensive Experiments.
@@ -1,4 +1,4 @@
# Locally computed:
-sha256 d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 armadillo-9.900.2.tar.xz.RETIRED
+sha256 248e2535fc092add6cb7dea94fc86ae1c463bda39e46fd82d2a7165c1c197dff armadillo-14.0.2.tar.xz
# License files, locally calculated
sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt
@@ -4,14 +4,14 @@
#
################################################################################
-ARMADILLO_VERSION = 9.900.2
-ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz.RETIRED
-ARMADILLO_SITE = https://sourceforge.net/projects/arma/files/retired
+ARMADILLO_VERSION = 14.0.2
+ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz
+ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma
ARMADILLO_INSTALL_STAGING = YES
ARMADILLO_LICENSE = Apache-2.0
ARMADILLO_LICENSE_FILES = LICENSE.txt
-ARMADILLO_CONF_OPTS = -DDETECT_HDF5=false
+ARMADILLO_CONF_OPTS = -DDETECT_HDF5=false -DBUILD_SMOKE_TEST=false
# blas support may be provided by lapack (libblas.a) or openblas (libopenblas.a)
ARMADILLO_CONF_OPTS += -DBLAS_FOUND=ON
@@ -30,8 +30,4 @@ ARMADILLO_CONF_OPTS += -DLAPACK_FOUND=ON
ARMADILLO_DEPENDENCIES += lapack
endif
-define ARMADILLO_EXTRACT_CMDS
- $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) $($(PKG)_DL_DIR)/$(ARMADILLO_SOURCE)
-endef
-
$(eval $(cmake-package))
The commit f69fe48404eda ("package/armadillo: temporarily update the site URL") changed the download URL only to continue to build the 9.900.2 version. This is an outdated and no longer supported version and as suggested by Conrad Sand, the project maintainer, it is recommended upgrading to the latest version, which is currently 14.0.2, and it's downloadable from the URL containing the most recent versions. - Drop ARMADILLO_EXTRACT_CMDS added to fix an issue only related to the previous version building. - C++14 is now mandatory. Release notes: https://arma.sourceforge.net/docs.html#changelog Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- package/armadillo/Config.in | 4 +++- package/armadillo/armadillo.hash | 2 +- package/armadillo/armadillo.mk | 12 ++++-------- 3 files changed, 8 insertions(+), 10 deletions(-)