From 88dd3fcd7277fdb61c911d7ae454df886e423377 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Fri, 5 Aug 2022 16:36:24 +0200 Subject: [PATCH] package/pkg-meson.mk: add support for fortran cross-compilation python-scipy is moving to a meson build infrastructure, and requires fortran cross-compilation. This commit extends the cross-compilation configuration file generated for use by meson to add the "fortran", "fortran_args" and "fortran_link_args" properties. Signed-off-by: Guillaume W. Bres Signed-off-by: Thomas Petazzoni --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 3 +++ 2 files changed, 5 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 156b005fdd..32d41170f3 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -76,10 +76,12 @@ 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" \ -e "s%@TARGET_ENDIAN@%$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN)))%g" \ + -e "s%@TARGET_FCFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ -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" \ 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'