From fd0980f74f0b34363cf4282667c918f1925db0f9 Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Fri, 26 Jan 2024 14:57:46 +0100 Subject: python3-numpy: Use Large File Support version of fallocate This was supposed to always be the case from upstream but was exposed by the 64-bit-time QA checker when file function scanning was enabled. (From OE-Core rev: 3d556e59f658ac29615fb7a14b6ea48533122ff6) Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie --- ...ge-file-fallocate-on-32-bit-linux-platfor.patch | 51 ++++++++++++++++++++++ .../python/python3-numpy_1.26.3.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch b/meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch new file mode 100644 index 0000000000..0702b8499a --- /dev/null +++ b/meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch @@ -0,0 +1,51 @@ +From 43b9b2626a59e8764f3bfb1d6b0d73b2d665584e Mon Sep 17 00:00:00 2001 +From: Ola x Nilsson +Date: Fri, 19 Jan 2024 10:26:41 +0100 +Subject: [PATCH] BUG: Use large file fallocate on 32 bit linux platforms + +Using a local prototype for fallocate instead of the fcntl.h header +meant that the redirect triggered by -D_FILE_OFFSET_BITS=64 was not +triggered. + +The prototypes in feature_detection_stdio.h should only be used by +functions in setup_common.py. If they are used by the feature +discovery code they might trigger false positives. + +Upstream-Status: Backport [https://github.com/numpy/numpy/commit/f49c6f9ea735cd7f718e74f8d637ffbbd3a7a03b] +Signed-off-by: Ola x Nilsson + +--- + numpy/core/feature_detection_stdio.h | 3 +++ + numpy/core/src/multiarray/convert.c | 5 +++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/numpy/core/feature_detection_stdio.h b/numpy/core/feature_detection_stdio.h +index bc14d16..d8bbfbd 100644 +--- a/numpy/core/feature_detection_stdio.h ++++ b/numpy/core/feature_detection_stdio.h +@@ -1,6 +1,9 @@ ++#define _GNU_SOURCE + #include + #include + ++#if 0 /* Only for setup_common.py, not the C compiler */ + off_t ftello(FILE *stream); + int fseeko(FILE *stream, off_t offset, int whence); + int fallocate(int, int, off_t, off_t); ++#endif +diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c +index 60c1a1b..8ec0aee 100644 +--- a/numpy/core/src/multiarray/convert.c ++++ b/numpy/core/src/multiarray/convert.c +@@ -23,8 +23,9 @@ + #include "array_coercion.h" + #include "refcount.h" + +-int +-fallocate(int fd, int mode, off_t offset, off_t len); ++#if defined(HAVE_FALLOCATE) && defined(__linux__) ++#include ++#endif + + /* + * allocate nbytes of diskspace for file fp diff --git a/meta/recipes-devtools/python/python3-numpy_1.26.3.bb b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb index 023d40a9b2..326e2c3591 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.26.3.bb +++ b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb @@ -12,6 +12,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-numpy-core-Define-RISCV-32-support.patch \ file://fix_reproducibility.patch \ file://run-ptest \ + file://0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch \ " SRC_URI[sha256sum] = "697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4" -- cgit v1.2.3-54-g00ecf