Re: [Buildroot] [RFC 1/1] package/python-scipy: bump version to 1.9.0

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello,

On Wed,  3 Aug 2022 11:37:54 +0200
"Guillaume W. Bres" <guillaume.bressaix@gmail.com> wrote:

> My current setup has pretty much everything figured out, but meson
> does not locate the fortran cross-compiler. Could anyone help me?
> 
> output/build/python-scipy-v1.9.0/meson.build:41:0: ERROR: 'fortran' compiler binary not defined in cross or native file

Try this:

diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk
index 156b005fdd..a9bbb130a0 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -76,6 +76,7 @@ define PKG_MESON_CROSSCONFIG_SED
         -e "s%@TARGET_CC@%$(TARGET_CC)%g" \
         -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \
         -e "s%@TARGET_AR@%$(TARGET_AR)%g" \
+        -e "s%@TARGET_FC@%$(TARGET_FC)%g" \
         -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \
         -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \
         -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \
@@ -83,6 +84,7 @@ define PKG_MESON_CROSSCONFIG_SED
         -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \
         -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \
         -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \
+        -e "s%@TARGET_FCFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \
         -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \
         -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \
         -e "s%@HOST_DIR@%$(HOST_DIR)%g" \
diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in
index 235e5a8495..7053df472b 100644
--- a/support/misc/cross-compilation.conf.in
+++ b/support/misc/cross-compilation.conf.in
@@ -9,6 +9,7 @@ cpp = '@TARGET_CXX@'
 ar = '@TARGET_AR@'
 strip = '@TARGET_STRIP@'
 cmake = '@BR2_CMAKE@'
+fortran = '@TARGET_FC@'
 pkgconfig = '@PKGCONF_HOST_BINARY@'
 g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler'
 g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner'
@@ -18,6 +19,8 @@ c_args = [@TARGET_CFLAGS@]
 c_link_args = [@TARGET_LDFLAGS@]
 cpp_args = [@TARGET_CXXFLAGS@]
 cpp_link_args = [@TARGET_LDFLAGS@]
+fortran_args = [@TARGET_FCFLAGS@]
+fortran_link_args = [@TARGET_LDFLAGS@]
 wrap_mode = 'nodownload'
 cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake'
 
It solves the fortran not found issue, and it now finds the Fortran
compiler:

Fortran compiler for the host machine: /home/thomas/buildroot/buildroot/output/host/bin/aarch64-linux-gfortran (gcc 10.3.0 "GNU Fortran (Buildroot toolchains.bootlin.com-2021.11-1) 10.3.0")
Fortran linker for the host machine: /home/thomas/buildroot/buildroot/output/host/bin/aarch64-linux-gfortran ld.bfd 2.36.1

However, it still fails later with:

output/build/python-scipy-v1.9.0/scipy/meson.build:70:0: ERROR: Include dir /home/thomas/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/include does not exist.

An error that I have not investigated.

> -PYTHON_SCIPY_VERSION = 1.8.1
> -PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz
> -PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION)
> +PYTHON_SCIPY_VERSION = v1.9.0
> +PYTHON_SCIPY_SITE_METHOD = git
> +PYTHON_SCIPY_SITE = https://github.com/scipy/scipy.git
> +PYTHON_SCIPY_GIT_SUBMODULES = YES

Why not keep the tarball download? They have a tarball of the 1.9.0
release at
https://github.com/scipy/scipy/releases/download/v1.9.0/scipy-1.9.0.tar.gz

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot