Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/eigen: bump to version 3.4.0
@ 2022-05-03 18:59 Julien Olivain
  2022-05-03 19:25 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Julien Olivain @ 2022-05-03 18:59 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain, Matt Weber

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>
---
Tested with:

    make check-package
    ...
    0 warnings generated

    ./utils/test-pkg -a -p eigen
    ...
    45 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
---
 package/eigen/eigen.hash | 4 ++--
 package/eigen/eigen.mk   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package/eigen/eigen.hash b/package/eigen/eigen.hash
index 5ec561ad10..ad7d6da9dc 100644
--- a/package/eigen/eigen.hash
+++ b/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
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
index 98e6c61e38..9df286e11f 100644
--- a/package/eigen/eigen.mk
+++ b/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))
-- 
2.36.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/eigen: bump to version 3.4.0
  2022-05-03 18:59 [Buildroot] [PATCH 1/1] package/eigen: bump to version 3.4.0 Julien Olivain
@ 2022-05-03 19:25 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-05-03 19:25 UTC (permalink / raw)
  To: Julien Olivain; +Cc: Matt Weber, buildroot

Julien, All,

On 2022-05-03 20:59 +0200, Julien Olivain spake thusly:
> 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.

Thanks for the heads-up.

> Signed-off-by: Julien Olivain <ju.o@free.fr>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Tested with:
> 
>     make check-package
>     ...
>     0 warnings generated
> 
>     ./utils/test-pkg -a -p eigen
>     ...
>     45 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
> ---
>  package/eigen/eigen.hash | 4 ++--
>  package/eigen/eigen.mk   | 9 ++++++---
>  2 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/package/eigen/eigen.hash b/package/eigen/eigen.hash
> index 5ec561ad10..ad7d6da9dc 100644
> --- a/package/eigen/eigen.hash
> +++ b/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
> diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
> index 98e6c61e38..9df286e11f 100644
> --- a/package/eigen/eigen.mk
> +++ b/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))
> -- 
> 2.36.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-03 19:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-03 18:59 [Buildroot] [PATCH 1/1] package/eigen: bump to version 3.4.0 Julien Olivain
2022-05-03 19:25 ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox