helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3-h5py: backport fixes for incompatible-pointer-types issues

Browse Source 
Needed in scarthgap for native build on hosts with gcc-14 and newer.

It was in master since:
https://git.openembedded.org/meta-openembedded/diff/meta-python/recipes-devtools/python/python3-h5py_3.11.0.bb?id=f0c767407d033e3f39ceeccc2f7e03a1ca7a6443
and then removed as fixed in 3.11.0 by:
https://git.openembedded.org/meta-openembedded/commit/?id=4b990b6dbabaeb65df5bf46546a873c69032a040
but scarthgap has older 3.10.0, backport necessary changes.

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Martin Jansa 2025-07-08 18:09:09 +02:00 committed by Armin Kuster
parent 3d03058fe2
commit bf0a439694
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta-python/recipes-devtools/python/python3-h5py/0001-Properly-cast-arguments-to-H5Lunpack_elink_val.patch Normal file
View File

@ -0,0 +1,25 @@
From 30a59c233fbe149109f378837642dc02b2caf3f5 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 15 Feb 2024 20:47:50 -0700
Subject: [PATCH] Properly cast arguments to H5Lunpack_elink_val
Upstream-Status: Backport [https://github.com/h5py/h5py/pull/2380/commits/704e13ac83b42898514610c4df9f32f367e767e4]
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
h5py/h5l.pyx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/h5py/h5l.pyx b/h5py/h5l.pyx
index 60b252f..af725bd 100644
--- a/h5py/h5l.pyx
+++ b/h5py/h5l.pyx
@@ -184,7 +184,7 @@ cdef class LinkProxy:
if info.type == H5L_TYPE_SOFT:
py_retval = buf
else:
- H5Lunpack_elink_val(buf, buf_size, &wtf, &ext_file_name, &ext_obj_name)
+ H5Lunpack_elink_val(buf, buf_size, &wtf, <const char **>&ext_file_name, <const char **>&ext_obj_name)
py_retval = (bytes(ext_file_name), bytes(ext_obj_name))
finally:
efree(buf)

25
meta-python/recipes-devtools/python/python3-h5py/0002-Use-libc.stdint-instead-of-numpy.patch Normal file
View File

@ -0,0 +1,25 @@
From 8b4de2f6946b1c1f68279ecadc05c2817ae82189 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 22 Feb 2024 08:41:17 -0700
Subject: [PATCH] Use libc.stdint instead of numpy
Upstream-Status: Backport [https://github.com/h5py/h5py/pull/2382/commits/387a22b8c1513800c0401f496b4ed512c1639798]
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
h5py/api_types_ext.pxd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/h5py/api_types_ext.pxd b/h5py/api_types_ext.pxd
index 91acb12..55a239f 100644
--- a/h5py/api_types_ext.pxd
+++ b/h5py/api_types_ext.pxd
@@ -20,7 +20,7 @@ from libc.string cimport strlen, strchr, strcpy, strncpy, strcmp,\
ctypedef long size_t
from libc.time cimport time_t
-from numpy cimport int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t
+from libc.stdint cimport int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t
IF UNAME_SYSNAME != "Windows":
cdef extern from "unistd.h":

8
meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb
View File

@ -6,8 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c"
SRC_URI[sha256sum] = "d93adc48ceeb33347eb24a634fb787efc7ae4644e6ea4ba733d099605045c049"
SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch \
file://0001-Fix-Cython-3-compatibility.patch"
SRC_URI += " \
file://0001-setup_build.py-avoid-absolute-path.patch \
file://0001-Fix-Cython-3-compatibility.patch \
file://0001-Properly-cast-arguments-to-H5Lunpack_elink_val.patch \
file://0002-Use-libc.stdint-instead-of-numpy.patch \
"
inherit pkgconfig pypi setuptools3