From patchwork Sat Mar 21 19:02:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1051 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2A19F3F337 for ; Sat, 21 Mar 2020 20:03:15 +0100 (CET) Received: by mail-pj1-f72.google.com with SMTP id ne3sf6780412pjb.0 for ; Sat, 21 Mar 2020 12:03:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1584817394; cv=pass; d=google.com; s=arc-20160816; b=IdfhGZswWTcPE/+mxbRPHPHUucD0qrjOVsZRWBaF+I4TgKd/HXgdu1oP7ImUCXoamy jRayzlZ5We8N9YpByAcC99x//PihK+6VFqvQhUi6PegnNx6SFbDF0uY7jcmWne4qYTtv C5F69BU69MD433fGCQqhbIPSRSiGNT5dU8u0pb97W9Uf5Or38aq5xfJX2NJrhce/rHKc 9oeAJT4+wRYdK66DKTJWkYxHSBPEwzAM+V8p/026suDT1Lp8nHvF7QGp6nSVhNsJx78J qYEcFy44IiShplWvrmyEqgsixJJiZmP2CWUHNnnla5IJQ2Itp0oxcw+0YhinC63YBLht DqhA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=JBaPR6gMFiJlr/vAv/oJv1CMGnO4gRs1NBvTpwl8taI=; b=VraiLtHHFf3eE2p0xee5Ec5mIsbVuK02YDZIvVFfqAa2aCy9abE0rEcQgUyFoPIJZS iMI73q4RnJyYjwura6edQ7WE0hVBnc53QHnIemf1Lo3d/RjGzFPOw+vUe0j0TfPEyyQR rR79A/NwPQsdTM/VBsSuqFN0WcSnfk0Juheus4TEv6lJ8QMBRPEpPtcTNnRBuflh0w3E 2GFhbUkde6cszJa8nN+LrWaOE09uGtxxQo+l/iONlR9GorCo6IpA9lfzIAOy1e4dg0Me Y58T1Vs+Tc3AxSkPtMiG9gSa63gpomL+n9D8+IAJIb8wcsx2oUHuuBzxh00ZCIO/nEM/ FZIQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Rfr5M4oQ; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=JBaPR6gMFiJlr/vAv/oJv1CMGnO4gRs1NBvTpwl8taI=; b=FAOuoi9O5HyEXVLMpGFtqX14yCxfeDNxTAjT37TUjezv/a1d+zadZTYs9zGlvXLthG 3KmNwP5a6kbv1T29XKS5Lfz8a1jmFtdHexlnppDfXeZtk7hQaACMADdfY2FImJepUiNe LzUWoFw9y9Oqy+UkXc7/7vmlelq8q0MoGs4kI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=JBaPR6gMFiJlr/vAv/oJv1CMGnO4gRs1NBvTpwl8taI=; b=YkvqGIzcTNgOb8arR0f+bdjMY/7JXjgHjD7dOB0ltqSlExVR0KeKsqupE7B4II+Zhq Yt/hpB5+VaJ+eDyPSpLDB/fDXgOMYj7CwwzNq8z3rCvlr3qeQwyb8sbLaFJJ4CURgkXH OVRtS0PRDAavEhxUSSQS3g/OkgBXSXiwBG5KM8TzNAsHa+Nry3foPH5DEdLoud9GMtYe zraejswsqvfIP9APuYA3JUJtEjIQylEmvX5rT5KTUwZslDIQxRsPI6bSjcVj5Nl06sJA 7MTKb4Mg1ywDoZbUo/FrzxCgnrkZ0jVLKO15KCJ68LZDYW4YDEuntTKFxxM6odIbveQ7 Y17w== X-Gm-Message-State: ANhLgQ0N3dihPguxxpahwgrQ6pLj1G7OFlk0QAjCH/5J1Q4V4Su9SOxV Erp3dP47nplth/F9fUqVfcbd3hMW X-Google-Smtp-Source: ADFU+vsYnUXzOUyiskpMLLb5sIXNL0y4Kf6DGunvItrrCqxDaqHkP56AcTmy7sQl6FtoLzJHFciJPQ== X-Received: by 2002:aa7:8087:: with SMTP id v7mr15977463pff.96.1584817393750; Sat, 21 Mar 2020 12:03:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:63:: with SMTP id 90ls5450506pla.10.gmail; Sat, 21 Mar 2020 12:03:13 -0700 (PDT) X-Received: by 2002:a17:902:ba08:: with SMTP id j8mr4391841pls.70.1584817393096; Sat, 21 Mar 2020 12:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584817393; cv=none; d=google.com; s=arc-20160816; b=cySuqBjpvtFIih1sHPNkzu98Yl0ITVdK9EJhwa1kbKhLU1m/LBnATZEKE4nK7GQEZ1 OGKTYgf/57CaMEV+uUgrSD5gH5J28Fq+91VAK1cfcnpPrcyTogKDO8gn8ls0hKhA/d5s Re2k03ry4HEoGQXE4AHQ2+M38+vy1b+Drk8f3D5qojqymD6kbHc0zQPNTNABSlfUbIK5 Kk1gGiakMlxUeOQ8sww9AXtR5A9p7Vxl+NFuxn5i5DI2xxBNM9T8edtJLL8EWkTUFHU0 smx8FlUqsxpCkDR7HT9zoMjOTSUDAG8FZDvcHgjcWoMKJK2S/pTybF7ISqFdZrwA2FAm y00A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EDoMFHyHgvEiwvqe6msr5rUi7SAzlaAg8SXFwSID9yU=; b=p6l2PMMLq38O1RCqdPieXJLmijWNUB8OTMg8TMLB6LAQhA9AqIdMFTN3WO+J/XlnW2 FsAW33Mz/QZNcKB5tmrNsrecxOCtfrb4cItfLgPQlxB9n6cH4w4YivvCspT9dlQ/1GmN BZyNbuuHT+rSQqRKp+wgLIF2fhPgn7oQe+HbLeCxMmknHqb9kReL0s2aTyHDcI8nc5qE uG9VmrvAzs9IAHJytCEirkBT7vQGgSwtCd3YNSLcDANgYTYzrtFg+c19IBkIJoK66QNI LlfPcNiVjLV4ymCc/ToyWvYVlB6yQ9690a61ljl2vGSPAyx8IXjtbOviW9bNM9/8Othr YJVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Rfr5M4oQ; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j4sor11607768pjn.18.2020.03.21.12.03.13 for (Google Transport Security); Sat, 21 Mar 2020 12:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90b:300b:: with SMTP id hg11mr15925719pjb.181.1584817392706; Sat, 21 Mar 2020 12:03:12 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:4d9c:1ea0:b435:7b90]) by smtp.gmail.com with ESMTPSA id k3sm8113377pgr.40.2020.03.21.12.03.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 12:03:12 -0700 (PDT) From: Jagan Teki To: buildroot@buildroot.org Cc: Angelo Compagnucci , Suniel Mahesh , Esben Haabendal , Yegor Yefremov , linux-amarula@amarulasolutions.com, Jagan Teki , Samuel Martin , Gwenhael Goavec-Merou Subject: [PATCH v7 1/4] package/python-numpy: Bump to version 1.18.2 Date: Sun, 22 Mar 2020 00:32:38 +0530 Message-Id: <20200321190241.3590-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200321190241.3590-1-jagan@amarulasolutions.com> References: <20200321190241.3590-1-jagan@amarulasolutions.com> X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Rfr5M4oQ; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Bump the python-numpy version to 1.18.2, this version of python-numpy will support python3 only, not python2. Drop python2 dependency from opencv3, gnuadio packages since the python support on these are selecting python-numpy. Cc: Samuel Martin Cc: Gwenhael Goavec-Merou Cc: Esben Haabendal Signed-off-by: Jagan Teki --- Changes for v7: - bump 1.181.2 numpy - drop 'BR2_PACKAGE_HOST_PYTHON_CYTHON' selection from numpy - drop python2 dependency from gnuradio.mk - drop python2 dependency from opencv3.mk - update the commit message package/gnuradio/Config.in | 2 +- package/gnuradio/gnuradio.mk | 4 ++-- package/opencv3/Config.in | 2 +- package/opencv3/opencv3.mk | 14 -------------- package/python-numpy/Config.in | 1 + package/python-numpy/python-numpy.hash | 14 +++++++------- package/python-numpy/python-numpy.mk | 4 +++- 7 files changed, 15 insertions(+), 26 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 6d438bcd6f..bf69ed605b 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -63,7 +63,7 @@ config BR2_PACKAGE_GNURADIO_FEC config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 41d4619f72..ab5b79e3e5 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -13,7 +13,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ + host-python3 \ host-python-mako \ host-python-six \ host-swig \ @@ -108,7 +108,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +GNURADIO_DEPENDENCIES += python3 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index d4b17b6acf..18c390c515 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -156,7 +156,7 @@ config BR2_PACKAGE_OPENCV3_LIB_PHOTO config BR2_PACKAGE_OPENCV3_LIB_PYTHON bool "python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_NUMPY diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8a8257b387..fe41f6f382 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -312,19 +312,6 @@ OPENCV3_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON),y) -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=ON \ - -DBUILD_opencv_python3=OFF \ - -DPYTHON2_EXECUTABLE=$(HOST_DIR)/bin/python2 \ - -DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \ - -DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \ - -DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \ - -DPYTHON2_PACKAGES_PATH=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - -DPYTHON2_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) -OPENCV3_DEPENDENCIES += python -OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/cv2/config*.py -else OPENCV3_CONF_OPTS += \ -DBUILD_opencv_python2=OFF \ -DBUILD_opencv_python3=ON \ @@ -336,7 +323,6 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -endif OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) OPENCV3_DEPENDENCIES += python-numpy else diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 5b9ee5803b..507d52c4d8 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index eb4123e3f6..ff9d02643c 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,9 +1,9 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.16.4 -sha256 a3bccb70ad94091a5b9e2469fabd41ac877c140a6828c2022e35560a2ec0346c numpy-1.16.4.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.18.1 +sha256 da204ce460aa4247e595b7c7189d2fb2ed5f796bc03197055de01dac61d0125e numpy-1.18.2.tar.gz # License files, locally calculated -sha256 6b5086f61fe0c71564a79304ecbaa60f11fa3f3debf82f73d16a611cab102adc LICENSE.txt -sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt +sha256 ad81d0c21843ba6ce6fe5fa3eaacb61120be70cd798c52f63df3f4c12a843f0c LICENSE.txt +sha256 d3045980e80a6b39f98586c24bc7f39a7625b4b9f08ce72e367d12814743d047 numpy/core/src/multiarray/dragon4.c +sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt sha256 154a8706fa0fdeff1073bf6239c4ecf51f562ab107066eef839dade1a45c824c doc/scipy-sphinx-theme/LICENSE.txt -sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt -sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt -sha256 d37526b4a34c0aa859afe6f9b7e64ca7c306b7430df8113dd5ac6fcb246bd2d4 numpy/core/src/multiarray/dragon4.c +sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt +sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 3b474efa6e..3f0df7a640 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.16.4 +PYTHON_NUMPY_VERSION = 1.18.2 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause, BSD-2-Clause, PSF, Apache-2.0, MIT, Zlib @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \ tools/npy_tempita/license.txt \ numpy/core/src/multiarray/dragon4.c PYTHON_NUMPY_SETUP_TYPE = setuptools +PYTHON_NUMPY_DEPENDENCIES += host-python-cython +HOST_PYTHON_NUMPY_DEPENDENCIES += host-python-cython ifeq ($(BR2_PACKAGE_CLAPACK),y) PYTHON_NUMPY_DEPENDENCIES += clapack From patchwork Sat Mar 21 19:02:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1052 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D5FD73F337 for ; Sat, 21 Mar 2020 20:03:18 +0100 (CET) Received: by mail-pj1-f72.google.com with SMTP id np3sf6750082pjb.7 for ; Sat, 21 Mar 2020 12:03:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1584817397; cv=pass; d=google.com; s=arc-20160816; b=CTTW1yMNshlnh4zDT7BZ5E1AghoCPylVAf4peb83qRXVrOPwaQZuOcYGFSF97+Hf91 ogV0kdhwWJ2UxO3mErDE4S2r+3s1UNx8q71tj6kMmd7SKHlyyqwfjmLA3w5aoAV0FG+r UM58ILRlpnSPRXSehrtqbGIEUWys1EX6HQ2+FjmYq4lbg0MLnca94hvsQ4YT0cuZU9I/ JbUwnOsiUc7MeMGiOLBLF2qws3gEymO0TD3+AfJbmz7suB52fpCvLODaSNNA+gPtuGnb 8eDb61F55tddLifKAnW9vaW5fineoIl8fykMFDRmh/mf+1iURNH1PsHJcg6ssQrEdo4k ZfBw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=imNm8jmaiBoZH7SlExMRqWoI9uLqH3AUS9fKw9kMnKI=; b=q4oHdBP6KJm/Vn+lMTu/jKrXHcDCp4KeVtQtoVviFIuHQ23bEQo286hxBvzu9k/Kh6 LT72T41NpaYKBLhoyTOzlU2/FR97QpVM9R6PMDKgyzJ8JvBL3CH7bGjJzWsiaVq6984f X3zRCkKODCYqXERvU1cSBcFRm3iD4+dsIkAUQwWnXqpOu5fxyKUPsX024fCkIh5F/Msp a2r+qE3VU/YVZ8WElWvY6Ii9Ju1VXMM8QcDdLymv0JoX6R6YaYk77VRpl9X4kX7Dksij AkTqRc/yHveSQX0pd6XtxTXpZNJ/o5Ly6SrJPZwSzuizC/W923LxjrAsfLUoeR3PVuNv 3ezA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MhP6z5PI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=imNm8jmaiBoZH7SlExMRqWoI9uLqH3AUS9fKw9kMnKI=; b=AhTgWDSigecpcJfmrlkUc17F0ER5tkDzLlnVQIlX/SqItxwlXinYfPAso6S5ZxrBWr eE0CcGOeuGAZB+HqpPBf1o0+RDjEA7O+lBItFjYiJAMeF7lrN2cMCtz5wtUnyeaKHV9l rgOl5GxRQEQUd61BucsCYOp1jZUL0EaEuAJTw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=imNm8jmaiBoZH7SlExMRqWoI9uLqH3AUS9fKw9kMnKI=; b=mZjxl8KJU9EgormGIQPt/gsrH5np5pd7/J1NnmhtNTLJHL7LBcAF1sYIAUqzVjt/4W 6H79uilBQmkXeXl9mpmkqvoIDJ0WK2St0B4oODLALff3ZT21PUKrCzb95O0/uzgQ5AMs e5OYH0nHzdtrPqVnWO1LkhPMuOuPt1zPwTpck8Aibu0nEhz50DPmOvcnxNhBCL6GOpQW WjF+RjcoSwreZnh3lhP5mE4tMjNQfogCunFtkmlJq5fJGsT/uVkwnGi4gRAG5xQ7udL7 chE48s2gddcuiYVVOQ7YN35SwNWpx0/9lLumvl0sGzRn34kYxAZPvLjcniGYoxy1eE5L bceg== X-Gm-Message-State: ANhLgQ1BBkQlzB5cFUJcLMFFwjwMGcZcZCRP1euhz0TRhtucVmZ8pug6 NHvZlDIhFnc22xNtfau4pgGBDVc5 X-Google-Smtp-Source: ADFU+vvMfrYD8byt2o+VZD8Ukij4MyB7GnuXruJMQnImE4JzCW5NgFdww/1GdD3MbNqfSED6oq6qEA== X-Received: by 2002:a17:902:d202:: with SMTP id t2mr14847523ply.5.1584817397418; Sat, 21 Mar 2020 12:03:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:16d5:: with SMTP id 204ls5113430pfw.3.gmail; Sat, 21 Mar 2020 12:03:16 -0700 (PDT) X-Received: by 2002:a63:8042:: with SMTP id j63mr14192680pgd.224.1584817396679; Sat, 21 Mar 2020 12:03:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584817396; cv=none; d=google.com; s=arc-20160816; b=JjLVAhJ8dMtsr/1/Eoe8w2LNzJaCbvU2dg60lIDwME9o8r6YYyGZqlwP49VIr6El0L K+/eUIpZMI3IRwqkKx+EKBfHU4qQSdawiKV0gK2UhCJDpA8uqfeMtBJYk9MXMyz/Wolf P0KRaEgUDr+vEL7NplByzZbeXXgIOwctp7TQyXb5kzMTw4ZVS7oO4A2gbjbOummQlZpH HxRTUbOpi004n8yBF4wAJL8rfuJwwBnTC/IMfC/5BQGbZaLOVUB2PD1VZ4oR5S7PB/rq m4IiebYB4iOpB2bqKBx0MUgB7FlpZJy0jdJ+sVRHuMXrBCLgEkWiciXg8cnwxgD7DVTs UvRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VZbDcAHGmnnJtkwFZeCixFtNLqbaTK0aWJax8VBGlJ4=; b=KbsNWOSuc0l+pSeJk5s+X2iVgMRN7g1G1UJgFK8MqKlfBqGoK501cJzNcD/vWfppKq 9Tg2WmJWB99TEgM+v9oIwMSbHwL7yGd3aYWp1XdKxnAEqfBAEZGuT93/KceSyK5LY5OX upLf4t83Vy+17BE/ytcx/mmiyqJOeqV3xknikZbO63qCMXjuwS1gQyyPyepxLyyenTH4 ICzw7lgdJNtloPgQhiKpXYtEdrUJfsk2nQ6QIH+SWn0UE8UUWtje9Cd2rJpyFdHZzj68 l08Ki/n4wq8jE7GVJ+7kBMPqKyyrxtXEV/wnozgvt7HmkWlN0PYpWamVmecxv7QlJK4w NoIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MhP6z5PI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y67sor11716295pfg.60.2020.03.21.12.03.16 for (Google Transport Security); Sat, 21 Mar 2020 12:03:16 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a62:2f01:: with SMTP id v1mr16162222pfv.136.1584817396261; Sat, 21 Mar 2020 12:03:16 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:4d9c:1ea0:b435:7b90]) by smtp.gmail.com with ESMTPSA id k3sm8113377pgr.40.2020.03.21.12.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 12:03:15 -0700 (PDT) From: Jagan Teki To: buildroot@buildroot.org Cc: Angelo Compagnucci , Suniel Mahesh , Esben Haabendal , Yegor Yefremov , linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v7 2/4] package/python-numpy: fixup npymath.ini for numpy extensions Date: Sun, 22 Mar 2020 00:32:39 +0530 Message-Id: <20200321190241.3590-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200321190241.3590-1-jagan@amarulasolutions.com> References: <20200321190241.3590-1-jagan@amarulasolutions.com> X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MhP6z5PI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Esben Haabendal Inorder to build the numpy distutils extension packages like python-scipy, python-numba, it require an explicit pkg-config path fixup for npymath.ini. This pkg-config path fixup would update the prefix path of npymath.ini with actual target staging area where numpy core was built, so-that numpy distutils extension packages would explicitly link this config path for their package environment. Without this extension packages cannot find -lnpymath since it uses host libraries (like libnpymath.a). So, attach the post install staging hook with pkg-config path fixup for npymath.ini. Signed-off-by: Esben Haabendal Signed-off-by: Jagan Teki --- Changes for v7: - rephrase commit and comments of fixup npymath.ini package/python-numpy/python-numpy.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 3f0df7a640..4d2e852b43 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -32,6 +32,21 @@ define PYTHON_NUMPY_CONFIGURE_CMDS echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg endef +# Fixup the npymath.ini prefix path with actual target staging area where +# numpy core was built. Without this, target builds using numpy distutils +# extensions like python-scipy, python-numba cannot find -lnpymath since +# it uses host libraries (like libnpymath.a). +# So, the numpy distutils extension packages would explicitly link this +# config path for their package environment. +PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy +PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config +define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES + sed -e '/^pkgdir=/d' \ + -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ + -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini +endef +PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES + # Some package may include few headers from NumPy, so let's install it # in the staging area. PYTHON_NUMPY_INSTALL_STAGING = YES From patchwork Sat Mar 21 19:02:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1053 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id BB3FC3F337 for ; Sat, 21 Mar 2020 20:03:22 +0100 (CET) Received: by mail-pf1-f199.google.com with SMTP id h24sf7557366pfn.15 for ; Sat, 21 Mar 2020 12:03:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1584817401; cv=pass; d=google.com; s=arc-20160816; b=zQz9iq6vmzJE8QI4tc1+c4Hhsb5h1npRLToO46sJjHwN35QSPty7XmgmvxH4a4VNFg xBGRJFRYFoCCNHh0NfXFQI7o9LRPVa28MJCCApJPXdVuT/GlOYjq6sNaPDGWVJJ/RJel 00wuI+MIINHm+6wg+mXMx1D/Lwafy60sYXNx36NACNMdWmVEBCyxrgWL/I+vS6EdM9/Y qSTQ9Hs9J1RTJQuoTRxEa4qPgbKhOPWNW4J1/9C6q0CPfXKnD6Jj/0PszLazjW+G9b5G ob7uje6tYz5cL0ItOyCnj3/KG2kYtMelx/qsWCb/M0ISfVjIssNnUwU36yv3iXao86Ba 13AA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=Un0slxGn/PGNr86vahn+2RaQN9pvO2AjveCZ+KeutOo=; b=naIKofHUTFumLvke6Z7SD08CagUDrEhv+6jaBUaevWPX0246aPpFmhve9iTBJk8+5H 5sMaP4UV3+ZU07wW5vLgVv6z3ddHLpC6ByZJ6bpc0E/fO5+bsKhe6I4k2Br9u9ZPR6F0 ZyUG+wKfJFzjr+GoDZ4EpZgAkydsZRjtkuwJXyMBe6lSKTYmLvq1jTOz6uem4o0tkSHu P7lakBN6FFxDBeIyRHN2/grHMIkgGe+CqRQK8pOCoW5jEAftZEjMgyLY2qLnNNAoc2x9 i2azTPXskWp0kErjfbZzAS3sZVFWqMmkgzUQnrZrcpu0CtTLOkrusxxqueuLhjPfo4f1 3L6A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NzUsmv7C; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Un0slxGn/PGNr86vahn+2RaQN9pvO2AjveCZ+KeutOo=; b=U+L1HaMbQlCls7lxN0puzxT5nKfiQ0+w8Hlp4kgWKk/VwciPbXzbiSsReNYfIgykEP +nUsHRtHoN8AFk8+Q39Mm/uGFHVsCIu1/wg9DCSjtSHLzy3Qw+A756pxHiWf9FI97+IN 6g6xUAJdhlImRj2vtiYqjgwSZLgWJNKg6DMuE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=Un0slxGn/PGNr86vahn+2RaQN9pvO2AjveCZ+KeutOo=; b=jd563B+3IIjY1C3Lr13zOU2P6tHkJKg644daKTYb3wZxHZBx3LPaFmTZN8WcBhWFog yKq6cg8iQ2w6E+nMzOQohFb8GYG9WUi38PykeCmGyQZZZ01YYbL0TeMcyjtXV14tgsRq BVoHSZWZpc5AzAi1HYKobp+er5IBApeIe+EpYFqbuzxIAdDwy5Ok4dtgbVCRCDIW8kwO i6pCMuHUPeFqrxLm6gRI7CtDy1uV9OebloqsRUzSiHj7/bun6AWQQM9zdf5ROU1dQ3HK Q/babQ7EJEU2tvoovqn3B+ls49XZLWQ9wl9T81hiegdO1blZve6FTyG0vO3b5gIhrjzK 8NfQ== X-Gm-Message-State: ANhLgQ1jriBs3KlltB30jyG6a5qho/QwEsEXHXp2x9Ji+FJPxtJ3oydj WKL/8C0TOyJxEGrhI/COpKSZtNzc X-Google-Smtp-Source: ADFU+vuxYJUn1OtSvqYiAo/76SjxOuUbTcc4/MaBTLYeRiN3k/UVAOe69gjdIxGIQo2/sykC3TiUpw== X-Received: by 2002:a63:8ec9:: with SMTP id k192mr14579123pge.293.1584817400877; Sat, 21 Mar 2020 12:03:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:fb90:: with SMTP id cp16ls5584697pjb.3.canary-gmail; Sat, 21 Mar 2020 12:03:20 -0700 (PDT) X-Received: by 2002:a17:902:6945:: with SMTP id k5mr14206068plt.61.1584817399920; Sat, 21 Mar 2020 12:03:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584817399; cv=none; d=google.com; s=arc-20160816; b=LKVAlz2f2NlyY2l8s5maK1DVXRt5A/VpCGxemy+j8VzByYDSSPmjkhMliU9DR6TqHq 5mh225oLy1ZkKvsu6fkiMdNJoB5UfRrXkq8wsEpFxcPbZozeRKeqyVCrdIonvr7Zu9zp qJyJEYikXsgpLocVKjAdJIUipjINb+9lneCathFtLa8/QTlDklNHunb6yh6AMLLC0W+b 1QOJuErnBiwU9ssrEi3qzaXsEgHsLs/MvsI+kz9cDdbHOWAWdVsyNOqUGr3Z8DCT81Ci BEqtiuMIS64pI8eO3oeqDGbTsYSMn5XwgEycwo73Bv6vrXijrgxzFMJhKO0qGJMVE2tC 2qcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=c7IzBuUnukLTQbdQhKFA+Rwuw099L5K6k28/xP02LYk=; b=rH35ymHFMfauaghXU9bqHFYRBve5KfcOi6A1AWcjdom/UHNYogV2YIjGNj7budkCmg m19WaqXLVO0PnxgO2U9XlQxSf6As5qGRZ7TuHaAnePEjp6JknmyYSquQLY8av/TXNKwl vAaU+cIokcoG4BXZx7zvGNoBTFujX9yLdogOHaWmmHIROz+gG05nOHMu/TuZL/s9Rgvc oT+0I9+e8V7EkBYCsVeDrzOzf6Uah0vLykiyknucF3cbSeyBNrGziww4oMDSK9UzgajB /nYZfWFNADJ5sycxz/sNo1hAuzYtrAEY+Yv6pcyyJfnXoaGUWFb4J7kjtI8P5HUSDNhB eCZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NzUsmv7C; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id e11sor11441931pjj.22.2020.03.21.12.03.19 for (Google Transport Security); Sat, 21 Mar 2020 12:03:19 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:c244:: with SMTP id d4mr16487747pjx.136.1584817399550; Sat, 21 Mar 2020 12:03:19 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:4d9c:1ea0:b435:7b90]) by smtp.gmail.com with ESMTPSA id k3sm8113377pgr.40.2020.03.21.12.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 12:03:19 -0700 (PDT) From: Jagan Teki To: buildroot@buildroot.org Cc: Angelo Compagnucci , Suniel Mahesh , Esben Haabendal , Yegor Yefremov , linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v7 3/4] package/python-pybind11: new host package Date: Sun, 22 Mar 2020 00:32:40 +0530 Message-Id: <20200321190241.3590-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200321190241.3590-1-jagan@amarulasolutions.com> References: <20200321190241.3590-1-jagan@amarulasolutions.com> X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NzUsmv7C; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add python-pybind11 package with 2.4.3 release version. Cc: Esben Haabendal Signed-off-by: Jagan Teki --- Changes for v7: - update the commit message - fix sha256 value of pybind11 LICENCE DEVELOPERS | 1 + package/Config.in.host | 1 + package/python-pybind11/Config.in.host | 7 +++++++ package/python-pybind11/python-pybind11.hash | 5 +++++ package/python-pybind11/python-pybind11.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-pybind11/Config.in.host create mode 100644 package/python-pybind11/python-pybind11.hash create mode 100644 package/python-pybind11/python-pybind11.mk diff --git a/DEVELOPERS b/DEVELOPERS index a2c6da208b..308a59b264 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1151,6 +1151,7 @@ F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig +F: package/python-pybind11 N: James Hilliard F: package/gensio/ diff --git a/package/Config.in.host b/package/Config.in.host index dfea478868..d63bf54aa7 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -57,6 +57,7 @@ menu "Host utilities" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-lxml/Config.in.host" + source "package/python-pybind11/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" diff --git a/package/python-pybind11/Config.in.host b/package/python-pybind11/Config.in.host new file mode 100644 index 0000000000..e4164efd9d --- /dev/null +++ b/package/python-pybind11/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_PYBIND11 + bool "host python-pybind11" + help + Python module for Seamless operability between + C++11 and Python. + + https://github.com/pybind/pybind11 diff --git a/package/python-pybind11/python-pybind11.hash b/package/python-pybind11/python-pybind11.hash new file mode 100644 index 0000000000..880b678b94 --- /dev/null +++ b/package/python-pybind11/python-pybind11.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.python.org/pypi/pybind11/json +md5 23fdca8191b16ce3e7f38fb9e4252b2d pybind11-2.4.3.tar.gz +sha256 72e6def53fb491f7f4e92692029d2e7bb5a0783314f20d80222735ff10a75758 pybind11-2.4.3.tar.gz +# sha256 for LICENSE is locally computed +sha256 9a37ea54aa3cf12c7f3292799f20822ffd4b9b7142b36a7a9997b28c39264dc9 LICENSE diff --git a/package/python-pybind11/python-pybind11.mk b/package/python-pybind11/python-pybind11.mk new file mode 100644 index 0000000000..833ec92c86 --- /dev/null +++ b/package/python-pybind11/python-pybind11.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pybind11 +# +################################################################################ + +PYTHON_PYBIND11_VERSION = 2.4.3 +PYTHON_PYBIND11_SOURCE = pybind11-$(PYTHON_PYBIND11_VERSION).tar.gz +PYTHON_PYBIND11_SITE = https://pypi.python.org/packages/aa/91/deb6743e79e22ab01502296570b39b8404f10cc507a6692d612a7fee8d51 +PYTHON_PYBIND11_SETUP_TYPE = setuptools +PYTHON_PYBIND11_LICENSE = BSD +PYTHON_PYBIND11_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From patchwork Sat Mar 21 19:02:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1054 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C122B3F337 for ; Sat, 21 Mar 2020 20:03:25 +0100 (CET) Received: by mail-il1-f200.google.com with SMTP id a4sf8391820ili.14 for ; Sat, 21 Mar 2020 12:03:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1584817404; cv=pass; d=google.com; s=arc-20160816; b=aH7+3eP0wpnPqNlcBuR+NS7smyrC3IwTewYvFz5YPkj6NGMdIdUMCINaaU0/OZ+StY mAwxkbdvphvhUG5YqGWsd0o3OP093oGlT+cbBtWfSIPnpVKea0u3BZQ1BZ3U5+kA9OCL qBSOB/EIQrKy7BGN7z2krWb+aM9NeesLpqfNZPPQz4Pr/H2Y0QMrKrdNnO6AbhpJoyBb a3Kzm73lGK5qV/oadio6kxIAYuL6TWmFGBZElYu7fgleSIWs0IsCIygW0A2m6lmKobcR mpC+gIA4jmN/m8pqOqHpXvm9EPlQGz53qgOf6Lt6SH+19D1YSL0bAZU8VgucHcb/HMwx zvtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=wlKQHuxHO9CaMqnuy+UsLcslWPpIy2+yDSO350z/vGE=; b=gUaGPJLzZdptYuoPRIxPEOhkjQyTb/TLMQKnVefgYj/RhpKNCNFFwBgxlT5iZRzUOP 999bX2PJo41h7DpuCcy52dgVe2Pzc2/Jwog4HT0kiECoeb/Hgfqp40OiN6TAGIPrEU4Y bVwjGXXHat9E6w5lXOnzvj+heS9tU+l6nxCfIKMKgZnzt9C3uWsFYs0BtlSTrnb6p9fA RyYemgD0RMDzhFMDcv4pkdKIPO9tn8OJAjRtPOY0HBB/YMyGNidUYfGb3PU05hhNuQcR zaHhrP0Y/eNuXQVmFkyHSw81+Srsl/QPg058pcpb8JcYwo4miaJsP3bBpecJDYVt2D+V SULg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="VaYq+/Jb"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=wlKQHuxHO9CaMqnuy+UsLcslWPpIy2+yDSO350z/vGE=; b=QIE4qppWz7U2cxFRY8eaOQjuxqEBrbZachUNTBn7HS4ehQ9sTfWq3IlPL5AwxGo68K n1YiZFZhXvzp4GFlBiAgcTHAt0S9ji3+63XanoJEJvgh3NCT53cM3FAt0ZnWarfLxVSy lwklVAk8TaotmtduawjW/Pp30CVDDXm7zKTKQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=wlKQHuxHO9CaMqnuy+UsLcslWPpIy2+yDSO350z/vGE=; b=mN/C0kJp1/cVMY9OFUbGdn0MYJzklLSZ57LgjondZEEpr7wVlQ23UDNwJFdzq0vqrv myf+606OYOrpopDCQA+T031qpMHC+OsUj+3JYrRmp0HiSNp87GBPmQ914RTBTe1ZY3W+ FL4cBHgsfuInDOy+VhIblIM4IazoogvI+Zs7qrd7eAgL/wC2IqW3Vsnf6avlCWqv9W+Z VzSYA3OSKi3bzlpZMwrQzT07ecnvw9WBJcDBHuLu7GOV4hff1bwuBPqtuymNw7eShcYH 4QqMMW0JzMOnLnnQ9Skktz00bt13S3UqMy05LEp4rp7vMyqpW1+fDQdZ0hi0/sE7AAKJ TCyg== X-Gm-Message-State: ANhLgQ3AVuuq+so+khPqmowDCykuUgacmkMZ1ha87j3UHaCwVc8Qil5U YIR1vd6Oi34K86iIl5h6fuHC5Os2 X-Google-Smtp-Source: ADFU+vvgNTIsloaj66d41PmR81nkY9zwkxJOzFVy6sQcSjvKMwly2FksjHV1Ryt4DJ5o3uw1wM3GHg== X-Received: by 2002:a92:3c04:: with SMTP id j4mr14856038ila.108.1584817404220; Sat, 21 Mar 2020 12:03:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a5d:8787:: with SMTP id f7ls1547418ion.3.gmail; Sat, 21 Mar 2020 12:03:23 -0700 (PDT) X-Received: by 2002:a6b:8b07:: with SMTP id n7mr13034401iod.55.1584817403532; Sat, 21 Mar 2020 12:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584817403; cv=none; d=google.com; s=arc-20160816; b=Degh/n7ys5hZdqhtRvJn29QTEnrht9oWln7Vw+xVZ5tVLvf14HRaE23GwFXL3ALD43 E3MTyg6/vA9nPAkjhvg2pKNByYys9Sn20dvLx6oduqM5g3XdNDmdAGkORs2GAXJ5MdeH URqzn90SAJImE6YAlLJ7TywnndYxxu1odiPE1Xe2M4hCo//saPDWpT+3F4bkX+7Tv2rv k+0jAeLEsOyfxHtD9kEJ4Yi1CBNLB/MEhQ58ZLOqGLORwqqoe2PyHn2bi5A3v0VcrFC4 IUa5SGVONnlSwJqqRCAdpSQjgG7A/idhuk3e/Bc1rBzIdJ0GjGMaKjN5+DclrYWTC329 Gngg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VCG7P4OjUjEJUHvcAjsR2bpKw9ITJs7FaInb7yr5G2k=; b=RByTrY2C5PYDJJZXj/s0W4ENRM3z2QIHtc/neYsPApsQ8mgkEMmv7TkV4MXAvFXicv aLsmUTHWZuVrMZBZzt4CYJooWME2mgaP72p8DSl55nP4z9nSoa6TPfyjCYJoZTrNkjHP FUNCCudch6gA0KHD/szEnptioZO2IVM2vURRZiyn2JfgKwWrjS25TCjxneJHA4rWVe5I hx2wz9RI6ALEvNhpV1s4TYvMSsoeSbgA53HBNKspm/KYlFPnUTfn5u3Pb1UULAIL2HOP MHfHmEMeqQO60MBXnE0mBB/OMu+SnitEgMWd6Y5Uw1jZg273+UYvy/d5PoFAmXT8WRB/ uu4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="VaYq+/Jb"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j25sor8661477ili.135.2020.03.21.12.03.23 for (Google Transport Security); Sat, 21 Mar 2020 12:03:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:6945:: with SMTP id k5mr14206267plt.61.1584817403098; Sat, 21 Mar 2020 12:03:23 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:4d9c:1ea0:b435:7b90]) by smtp.gmail.com with ESMTPSA id k3sm8113377pgr.40.2020.03.21.12.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 12:03:22 -0700 (PDT) From: Jagan Teki To: buildroot@buildroot.org Cc: Angelo Compagnucci , Suniel Mahesh , Esben Haabendal , Yegor Yefremov , linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v7 4/4] package/python-scipy: new package Date: Sun, 22 Mar 2020 00:32:41 +0530 Message-Id: <20200321190241.3590-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200321190241.3590-1-jagan@amarulasolutions.com> References: <20200321190241.3590-1-jagan@amarulasolutions.com> X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="VaYq+/Jb"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add python-scipy with 1.4.1 release version. Signed-off-by: Jagan Teki --- Changes for v7: - update the commit message - drop 'BR2_PACKAGE_HOST_PYTHON_PYBIND11' selection from scipy DEVELOPERS | 1 + package/Config.in | 1 + package/python-scipy/Config.in | 22 ++++++++++++ package/python-scipy/python-scipy.hash | 9 +++++ package/python-scipy/python-scipy.mk | 46 ++++++++++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 package/python-scipy/Config.in create mode 100644 package/python-scipy/python-scipy.hash create mode 100644 package/python-scipy/python-scipy.mk diff --git a/DEVELOPERS b/DEVELOPERS index 308a59b264..9340ae2815 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1152,6 +1152,7 @@ F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig F: package/python-pybind11 +F: package/python-scipy N: James Hilliard F: package/gensio/ diff --git a/package/Config.in b/package/Config.in index afe32f52b4..f5af9b07ea 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1120,6 +1120,7 @@ menu "External python modules" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" + source "package/python-scipy/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in new file mode 100644 index 0000000000..4d8227c31a --- /dev/null +++ b/package/python-scipy/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_PYTHON_SCIPY + bool "python-scipy" + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_HAS_FORTRAN + depends on BR2_TOOLCHAIN_BUILDROOT_CXX + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_NUMPY + select BR2_PACKAGE_LAPACK + select BR2_PACKAGE_OPENBLAS + help + The SciPy library is one of the core packages that make up the SciPy + stack. It provides many user-friendly and efficient numerical + routines such as routines for numerical integration, interpolation, + optimization, linear algebra and statistics. + + https://www.scipy.org/scipylib/ + +comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ + !BR2_TOOLCHAIN_BUILDROOT_CXX || \ + (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash new file mode 100644 index 0000000000..c9d295ef6b --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59 scipy-1.4.1.tar.gz +sha256 5cbdbe33385779958be8b9310497e32d2eec144d82ef425780d3e19f8af6de76 LICENSE.txt +sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE +sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt +sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE +sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt +sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk new file mode 100644 index 0000000000..1d66b146ec --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# python-scipy +# +################################################################################ + +PYTHON_SCIPY_VERSION = 1.4.1 +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz +PYTHON_SCIPY_SITE = https://pypi.python.org/packages/04/ab/e2eb3e3f90b9363040a3d885ccc5c79fe20c5b8a3caa8fe3bf47ff653260 +PYTHON_SCIPY_LICENSE = BSD-3-Clause, BSD-2-Clause, BSD, BSD-Style, \ + Apache-2.0, MIT +PYTHON_SCIPY_LICENSE_FILES = \ + LICENSE.txt \ + scipy/linalg/src/lapack_deprecations/LICENSE \ + scipy/ndimage/LICENSE.txt \ + scipy/optimize/tnc/LICENSE \ + scipy/sparse/linalg/dsolve/SuperLU/License.txt \ + scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \ + scipy/spatial/qhull_src/COPYING.txt +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_DEPENDENCIES += \ + host-python-numpy \ + host-python-pybind11 \ + lapack \ + openblas \ + python-numpy + +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 +PYTHON_SCIPY_ENV += F90=$(TARGET_CROSS)gfortran F77=$(TARGET_CROSS)gfortran + +# Provide system configuration options to numpy distutils extenions, 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 + +# Use the target numpy pkg-config configuration files modified for target +# cross-compilation. Without this, numpy distutils will cause the linker to +# link with host libnpymath.a. +PYTHON_SCIPY_ENV += NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH) +PYTHON_SCIPY_INSTALL_STAGING = YES + +$(eval $(python-package))