Sfoglia il codice sorgente

package/eigen: bump to version 3.4.0

For change log since 3.3.7:
- https://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.8
- https://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.9
- https://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.4.0

This commit slightly change the logic defining CMAKE_Fortran_COMPILER in
CONF_OPTS to set it only if BR2_TOOLCHAIN_HAS_FORTRAN=y. This is because
eigen cmake file fails if CMAKE_Fortran_COMPILER is set to a
non-existing fortran compiler.

Note: COPYING.BSD hash changed due to the addition of a new-line at the
end of the file. The content of the file did not changed.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Julien Olivain 3 anni fa
parent
commit
d9ac60d52a
2 ha cambiato i file con 8 aggiunte e 5 eliminazioni
  1. 2 2
      package/eigen/eigen.hash
  2. 6 3
      package/eigen/eigen.mk

+ 2 - 2
package/eigen/eigen.hash

@@ -1,6 +1,6 @@
 # Locally computed
-sha256  685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11  eigen-3.3.7.tar.bz2
-sha256  4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1  COPYING.BSD
+sha256  b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626  eigen-3.4.0.tar.bz2
+sha256  51928dce36213c5333ba3172e847d735d4c6e9b7ff2722a326c49067155b82eb  COPYING.BSD
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING.GPL
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
 sha256  f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9  COPYING.MINPACK

+ 6 - 3
package/eigen/eigen.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EIGEN_VERSION = 3.3.7
+EIGEN_VERSION = 3.4.0
 EIGEN_SOURCE = eigen-$(EIGEN_VERSION).tar.bz2
 EIGEN_SITE = $(call gitlab,libeigen,eigen,$(EIGEN_VERSION))
 EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1
@@ -15,7 +15,10 @@ EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO
 
 # Default Eigen CMake installs .pc file in /usr/share/pkgconfig
 # change it to /usr/lib/pkgconfig, to be consistent with other packages.
-EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig \
-	-DCMAKE_Fortran_COMPILER=$(TARGET_FC)
+EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig
+
+ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y)
+EIGEN_CONF_OPTS += -DCMAKE_Fortran_COMPILER=$(TARGET_FC)
+endif
 
 $(eval $(cmake-package))