From patchwork Thu Aug 4 07:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Bres X-Patchwork-Id: 1663584 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lz0PF02m5z9sGV for ; Thu, 4 Aug 2022 17:15:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0069C41732; Thu, 4 Aug 2022 07:15:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0069C41732 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AJCiznEYzYnx; Thu, 4 Aug 2022 07:15:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id B4C2041514; Thu, 4 Aug 2022 07:15:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B4C2041514 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A3E111BF2C1 for ; Thu, 4 Aug 2022 07:15:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8BC3081750 for ; Thu, 4 Aug 2022 07:15:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8BC3081750 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZfF2tNueRfZK for ; Thu, 4 Aug 2022 07:15:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B55B081656 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by smtp1.osuosl.org (Postfix) with ESMTPS id B55B081656 for ; Thu, 4 Aug 2022 07:15:20 +0000 (UTC) Received: by mail-wm1-x333.google.com with SMTP id m41-20020a05600c3b2900b003a4e094256eso1915311wms.0 for ; Thu, 04 Aug 2022 00:15:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nthm/ObH0BnOP8nq71ln3GMgnlbfawGk1KN2pBVTpyo=; b=g7T0sPyRLKprLuOys6pdFswKDsoXvkfxOPZNFUJ/PXrwCbbN/ItCjJBKx7M5b3HoXL JWahzKObUiygUwZjSqyTd8lAtOOYkKYDXPu9h7JgSdiRX78nUx1TD3JbAoQqu1X0JcBY rVhs8vs9PRGdIPuRC67O281twLelRzb6Ycd8gT3LyNiYvm/w2f1WB8cmMREn/mD5yTHX DkzAc4p0BgDA6MGxgwmFpc963aSqIgI75BUJ18solYMNBRxBIKljqwtnb7jb+1fyL0BL cJ8Js3FZ8k76pYP79rJy28yWD7H+QmPInFBeyyppuXPETGM21OBXSI1ZS0v6F3Q3+CAa h+/Q== X-Gm-Message-State: ACgBeo2Irwfs9WCcVxmIXxHylZXsyZ17AkPd9sFFtgeQrrKaONRqRqv+ WtQHJqSr3q7Gr6tAN2RAd4uZdZ29MG4= X-Google-Smtp-Source: AA6agR6HwKsS+on5+RUbuSnhuA5oA4xwvEA8ZcRn6ODp7AeoTY1jN8VzC/dJNFyQSi2vAdUx3P+63Q== X-Received: by 2002:a05:600c:4f8e:b0:3a3:30b7:4901 with SMTP id n14-20020a05600c4f8e00b003a330b74901mr370209wmq.17.1659597318475; Thu, 04 Aug 2022 00:15:18 -0700 (PDT) Received: from pc-140.home ([2a01:cb1c:794:2300:d109:33e7:bc94:49e5]) by smtp.gmail.com with ESMTPSA id e5-20020a056000120500b002207a0b93b4sm248905wrx.49.2022.08.04.00.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:15:18 -0700 (PDT) From: "Guillaume W. Bres" To: buildroot@busybox.net Date: Thu, 4 Aug 2022 09:15:03 +0200 Message-Id: <20220804071504.4062-1-guillaume.bressaix@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nthm/ObH0BnOP8nq71ln3GMgnlbfawGk1KN2pBVTpyo=; b=HG4DqDUwFAbZLVMr2AYkPcW07fBuKh8EXlj6nfrJnq1EKR80DyMD/tHk9GxlYjtVw8 0ScgQLqT8QgNAm9PpMavtgmIczdAK2RMe1eypfP3AKoh6XGw31+IMeVCOtA1uQ3TUbPk g1uPoysroYdfr9mMWmS4gZNNg+24mwEo+8ByLni1lXQAFCVVPcPNF0ksAI/ZhB+eojLv 4kxxtg4m0JJJANtLmu2lgexpcu2i8dJ9g/EHHNKEy+AmqGvNV7fwQz+ifU3uME9sltsh RmT+NNRLPA+5vtHHG0FgX+WUezcssOvmmUVkL2B2bClZDJsLu9RJ2pY/GH33PmjCPbQT JhmQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=HG4DqDUw Subject: [Buildroot] [RFC v2 1/2] package/pkg-meson: scipy needs fortran cross compilation X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , "Guillaume W. Bres" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" --- 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' From patchwork Thu Aug 4 07:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Bres X-Patchwork-Id: 1663585 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lz0PT5Fs8z9sGZ for ; Thu, 4 Aug 2022 17:15:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A70FA4136C; Thu, 4 Aug 2022 07:15:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A70FA4136C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CnZ5EcKDbtui; Thu, 4 Aug 2022 07:15:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 5566541610; Thu, 4 Aug 2022 07:15:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5566541610 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7563C1BF2C1 for ; Thu, 4 Aug 2022 07:15:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5099B81750 for ; Thu, 4 Aug 2022 07:15:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5099B81750 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UOmeJJ_y7XBf for ; Thu, 4 Aug 2022 07:15:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DD65781656 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp1.osuosl.org (Postfix) with ESMTPS id DD65781656 for ; Thu, 4 Aug 2022 07:15:28 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id p10so19934925wru.8 for ; Thu, 04 Aug 2022 00:15:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PwsP/C6roxXPfFq4PpXttaaImr6uH93Qb+0Xak86ux4=; b=0gcR6M2wTyH7QAzlVFqshqVqnUFQtEGVJ9dCxvYdCkWaJmh3JPuINt74AEWJLn+yMH OOA/wpW+xbCNu3vJbg/70V8Aym9HXVdYnoCSopkQVQk5fEUqWYWvFKbDkoBnmCto1g0Z LziaOSU43jcLb6bX5g7n7qpHYxtTtUhOhrRV3cYMeiHK0UjUZoO2WE+MFvomnL5Ntm+v gE8dVc3ykE2BeSHESDZiXt4z0epevKmWdUXy1nFzZTCUEtxVm2xOwJcPaT90Rs5QHXZr ZTiZDUsC7TYxbOgjz9KzBw6mpO5DLhdWCw0qALyPT0XO8LE94yhXBnQquzN/j67J7NT8 zLBA== X-Gm-Message-State: ACgBeo0mXx+uUm5PWBnDtlhpMGuG3k9WGp37IvIZumVMjscMYjApLUkn pCumGTiT3xQEtRXsfFeeOvuUKI/uF7w= X-Google-Smtp-Source: AA6agR7DQkYxCrSDuGWiCat3Q016O4VHKpqylNu1r33LUjkzFjsAvfC8qd4Cgb0NkdWYVHP1EmkM7g== X-Received: by 2002:a5d:4912:0:b0:220:6633:104f with SMTP id x18-20020a5d4912000000b002206633104fmr394162wrq.625.1659597326626; Thu, 04 Aug 2022 00:15:26 -0700 (PDT) Received: from pc-140.home ([2a01:cb1c:794:2300:d109:33e7:bc94:49e5]) by smtp.gmail.com with ESMTPSA id e5-20020a056000120500b002207a0b93b4sm248905wrx.49.2022.08.04.00.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:15:26 -0700 (PDT) From: "Guillaume W. Bres" To: buildroot@busybox.net Date: Thu, 4 Aug 2022 09:15:04 +0200 Message-Id: <20220804071504.4062-2-guillaume.bressaix@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220804071504.4062-1-guillaume.bressaix@gmail.com> References: <20220804071504.4062-1-guillaume.bressaix@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PwsP/C6roxXPfFq4PpXttaaImr6uH93Qb+0Xak86ux4=; b=ia2yPTXcjWXGhxcIEGuFIbQvlyXfwKjNca2/zpJNL7SHXQpH4FMDQJwMmgbk6z8JHZ 1vpUIQXE6K7DgbO93V4MwoDau0sqd+lTK6EkUGJM8MMPzZubO/muTcioKt5QuQvihkAg nD3HmbCVA4V3bb8naGW3XfFAm6mv0MhIZKIfAw9GurVWARo7gUlc1jj0PBmgNGtc0hjU 9D0zMwjSJe7eq9AmhlSB7TbUTYfnxV7AWihghfjbQYNw8ZKKvOrEvqxCg0TvDDijwGzg o7FyjDGsYFBxZMo+8mt29DBO9vk7Fv55DpNjkwT9HAKm9e3lMHQeJ44hY7R/WQs0iCWd GpEA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ia2yPTXc Subject: [Buildroot] [RFC v2 2/2] package/python-scipy: bump version to 1.9.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , "Guillaume W. Bres" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" python-scipy is moving to a meson build infrastructure. Signed-off-by: Guillaume W. Bres --- thank you guys for the valuable help already, this is significant progress and we're almost there. Here's a V2 for those willing to test, I dediced to make it available although i'm just starting investigating. It terminates in a -lnpymath cross/host mix up "file format not recognized", that I've had with previous scipy versions (distutils). I think I solved it with some LDFLAGS, but I need to search my notes. v1 -> v2 - patch pkg/meson to become knowledgeable of "fortran" compiler - keep using tarball like before (but .tar.xz was not released this time) - correct blas = lapack definition - investigating new error --- package/python-scipy/python-scipy.hash | 2 +- package/python-scipy/python-scipy.mk | 34 +++++++++----------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash index 0274679c43..6637faf5b4 100644 --- a/package/python-scipy/python-scipy.hash +++ b/package/python-scipy/python-scipy.hash @@ -1,5 +1,5 @@ # Locally generated -sha256 0140dd24d14ce194fdb3df496c2190f0896ca84ac98bf5d69c3b3fb7bde1a1e9 scipy-1.8.1.tar.xz +sha256 c0dfd7d2429452e7e94904c6a3af63cbaa3cf51b348bd9d35b42db7e9ad42791 scipy-1.9.0.tar.gz sha256 96599f8ec69a2cc609265eed13fc75090aacb28742260e55ce623788a33da19c LICENSE.txt sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk index b5006a2e15..6faa147ba2 100644 --- a/package/python-scipy/python-scipy.mk +++ b/package/python-scipy/python-scipy.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SCIPY_VERSION = 1.8.1 -PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz +PYTHON_SCIPY_VERSION = 1.9.0 +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION) PYTHON_SCIPY_LICENSE = \ BSD-3-Clause, \ @@ -23,6 +23,7 @@ PYTHON_SCIPY_LICENSE_FILES = \ scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING \ scipy/spatial/qhull_src/COPYING.txt PYTHON_SCIPY_DEPENDENCIES += \ + host-pkgconf \ host-python-numpy \ host-python-pythran \ zlib \ @@ -31,26 +32,15 @@ PYTHON_SCIPY_DEPENDENCIES += \ python-pybind PYTHON_SCIPY_INSTALL_STAGING = YES -PYTHON_SCIPY_SETUP_TYPE = setuptools -PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 +#PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ +# -L$(PYTHON3_PATH)/site-packages/numpy/core/lib -PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ - -L$(PYTHON3_PATH)/site-packages/numpy/core/lib -# -lnpyrandom localization -PYTHON_SCIPY_LDFLAGS += \ - -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib +#PYTHON_SCIPY_CONF_ENV += \ +# PYTHONPATH=$(PYTHON3_PATH) \ +# LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" -PYTHON_SCIPY_ENV = \ - F90=$(TARGET_FC) \ - LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" +PYTHON_SCIPY_CONF_OPTS = \ + -Dblas=lapack \ + -Dlapack=lapack -# Provide system configuration options to numpy distutils extensions, telling -# to find all include files and libraries in staging directory. -define PYTHON_SCIPY_CONFIGURE_CMDS - -rm -f $(@D)/site.cfg - echo "[DEFAULT]" >> $(@D)/site.cfg - echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg - echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg -endef - -$(eval $(python-package)) +$(eval $(meson-package))