Hi Michael, El lun., 25 nov. 2019 a las 7:33, Michael Olbrich (<m.olbr...@pengutronix.de>) escribió: > > On Tue, Nov 19, 2019 at 01:39:05PM +0100, Guillermo Rodríguez wrote: > > NumPy is the fundamental package for scientific computing with Python. > > > > Signed-off-by: Guillermo Rodriguez <guille.rodrig...@gmail.com> > > --- > > v2: Switch to PyPi URL; this removes the dependency on Cython. > > v3: Update LICENSE, add LICENSE_FILES > > v4: Update LICENSE and LICENSE_FILES with additional licenses > > v5: Removed "unknown" from LICENSE > > v6: Updated to 1.17.4, added patch to fix cross compilation > > v7: Removed SETUPTOOLS dependency, reformatted sse2 patch header > > > > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 27 +++++++++ > > patches/numpy-1.17.4/series | 1 + > > rules/python3-numpy.in | 9 +++ > > rules/python3-numpy.make | 57 +++++++++++++++++++ > > 4 files changed, 94 insertions(+) > > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch > > create mode 100644 patches/numpy-1.17.4/series > > create mode 100644 rules/python3-numpy.in > > create mode 100644 rules/python3-numpy.make > > > > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch > > b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch > > new file mode 100644 > > index 000000000..2c88b429b > > --- /dev/null > > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch > > @@ -0,0 +1,27 @@ > > +From 4708211dc86d396f30c54bf71bc7194338272637 Mon Sep 17 00:00:00 2001 > > +From: mattip <matti.pi...@gmail.com> > > +Date: Mon, 11 Nov 2019 12:48:00 -0700 > > +Subject: [PATCH] BUILD: remove SSE2 flag from numpy.random builds > > + > > +This is a backport of https://github.com/numpy/numpy/pull/14878 > > + > > +--- > > + numpy/random/setup.py | 5 ----- > > + 1 file changed, 5 deletions(-) > > + > > +diff --git a/numpy/random/setup.py b/numpy/random/setup.py > > +index ca01250f437..f9059d7d76a 100644 > > +--- a/numpy/random/setup.py > > ++++ b/numpy/random/setup.py > > +@@ -49,11 +49,6 @@ > > + elif not is_msvc: > > + # Some bit generators require c99 > > + EXTRA_COMPILE_ARGS += ['-std=c99'] > > +- INTEL_LIKE = any(arch in platform.machine() > > +- for arch in ('x86', 'i686', 'i386', 'amd64')) > > +- if INTEL_LIKE: > > +- # Assumes GCC or GCC-like compiler > > +- EXTRA_COMPILE_ARGS += ['-msse2'] > > + > > + # Use legacy integer variable sizes > > + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')] > > diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series > > new file mode 100644 > > index 000000000..64785c945 > > --- /dev/null > > +++ b/patches/numpy-1.17.4/series > > @@ -0,0 +1 @@ > > +0001-remove-sse2-flag.patch > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in > > new file mode 100644 > > index 000000000..174a2bae1 > > --- /dev/null > > +++ b/rules/python3-numpy.in > > @@ -0,0 +1,9 @@ > > +## SECTION=python3 > > + > > +config PYTHON3_NUMPY > > + tristate > > + select PYTHON3 > > + prompt "python3-numpy" > > + help > > + NumPy is the fundamental package for scientific computing with > > + Python. > > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make > > new file mode 100644 > > index 000000000..6b161856b > > --- /dev/null > > +++ b/rules/python3-numpy.make > > @@ -0,0 +1,57 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodrig...@gmail.com> > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy > > + > > +# > > +# Paths and names > > +# > > +PYTHON3_NUMPY_VERSION := 1.17.4 > > +PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe > > +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION) > > +PYTHON3_NUMPY_SUFFIX := zip > > +PYTHON3_NUMPY_URL := > > https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY) > > +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT > > BSD is not a valid SPDX identifier. Which license does this refer to? > No need to resent it, I can do a fixup, but I need to know what to change.
Not sure anymore, perhaps that's a leftover from a previous version of the patch (since I switched from 1.16.1 to 1.17.4, and some licenses have changed). I rechecked everything from scratch and I see the following: - Main numpy license is BSD-3-Clause. License text is here: https://github.com/numpy/numpy/blob/master/LICENSE.txt - According to https://github.com/numpy/numpy/blob/master/LICENSES_bundled.txt, the following additional licenses apply to certain bundled components: Name: lapack-lite Files: numpy/linalg/lapack_lite/* License: 3-clause BSD For details, see numpy/linalg/lapack_lite/LICENSE.txt -> So 3-clause BSD again Name: tempita Files: tools/npy_tempita/* License: BSD derived For details, see tools/npy_tempita/license.txt -> Despite the comment, this is actually the MIT license; see: https://github.com/numpy/numpy/blob/master/tools/npy_tempita/license.txt Name: dragon4 Files: numpy/core/src/multiarray/dragon4.c License: MIT For license text, see numpy/core/src/multiarray/dragon4.c -> MIT license again So I'd say that PYTHON3_NUMPY_LICENSE can be just "BSD-3-Clause AND MIT" Guillermo > > Michael > > > +PYTHON3_NUMPY_LICENSE_FILES := \ > > + file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \ > > + > > file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ > > + > > file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720 > > + > > + > > +# > > ---------------------------------------------------------------------------- > > +# Prepare > > +# > > ---------------------------------------------------------------------------- > > + > > +PYTHON3_NUMPY_CONF_TOOL := python3 > > + > > +# > > ---------------------------------------------------------------------------- > > +# Target-Install > > +# > > ---------------------------------------------------------------------------- > > + > > +$(STATEDIR)/python3-numpy.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, python3-numpy) > > + @$(call install_fixup, python3-numpy, PRIORITY, optional) > > + @$(call install_fixup, python3-numpy, SECTION, base) > > + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez > > <guille.rodrig...@gmail.com>") > > + @$(call install_fixup, python3-numpy, DESCRIPTION, missing) > > + > > + @$(call install_glob, python3-numpy, 0, 0, -, \ > > + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, > > *.py) > > + > > + @$(call install_finish, python3-numpy) > > + > > + @$(call touch) > > + > > +# vim: syntax=make > > -- > > 2.21.0 > > > > > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
