mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libcomps: upgrade 0.1.19 -> 0.1.20

Browse Source 
0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch
removed since it's included in 0.1.20

(From OE-Core rev: 12316f4746352495c89e2f9808a2180d582ba29e)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2023-10-13 16:58:56 +08:00
committed by Richard Purdie
parent b044cf8840
commit 2c6a1cd707
2 changed files with 1 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch
View File

@@ -1,66 +0,0 @@
From 26a9647c832de15248ee649e5b77075521f3d4f0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 3 Mar 2023 08:37:35 -0800
Subject: [PATCH] libcomps: Use Py_hash_t instead of long in PyCOMPS_hash()
This function is used as a hashfunc callback in
_typeobject defined python3.11/cpython/object.h
compilers detect the protype mismatch for function pointers
with clang16+
Fixes
libcomps/src/python/src/pycomps_sequence.c:667:5: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (*)(PyObject *)' (aka 'long (*)(struct _object *)') [-Wincompatible-function-pointer-types]
&PyCOMPS_hash, /*tp_hash */
Upstream-Status: Submitted [https://github.com/rpm-software-management/libcomps/pull/101]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libcomps/src/python/src/pycomps_hash.c | 4 ++--
libcomps/src/python/src/pycomps_hash.h | 2 +-
libcomps/src/python/src/pycomps_utils.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libcomps/src/python/src/pycomps_hash.c b/libcomps/src/python/src/pycomps_hash.c
index 474afd5..4577769 100644
--- a/libcomps/src/python/src/pycomps_hash.c
+++ b/libcomps/src/python/src/pycomps_hash.c
@@ -20,9 +20,9 @@
#include "pycomps_hash.h"
#include "pycomps_utils.h"
-long PyCOMPS_hash(PyObject *self) {
+Py_hash_t PyCOMPS_hash(PyObject *self) {
char *cstr = NULL;
- long crc;
+ Py_hash_t crc;
cstr = comps_object_tostr(((PyCompsObject*)self)->c_obj);
crc = crc32(0, cstr, strlen(cstr));
diff --git a/libcomps/src/python/src/pycomps_hash.h b/libcomps/src/python/src/pycomps_hash.h
index b664cae..54e08d9 100644
--- a/libcomps/src/python/src/pycomps_hash.h
+++ b/libcomps/src/python/src/pycomps_hash.h
@@ -26,6 +26,6 @@
#include "pycomps_utils.h"
-long PyCOMPS_hash(PyObject *self);
+Py_hash_t PyCOMPS_hash(PyObject *self);
#endif
diff --git a/libcomps/src/python/src/pycomps_utils.h b/libcomps/src/python/src/pycomps_utils.h
index ba9bc2f..b34e4dc 100644
--- a/libcomps/src/python/src/pycomps_utils.h
+++ b/libcomps/src/python/src/pycomps_utils.h
@@ -137,7 +137,7 @@ COMPS_Object* __pycomps_bytes_in(PyObject *pobj);
PyObject* __pycomps_str_out(COMPS_Object *obj);
PyObject *str_to_unicode(void* str);
-long PyCOMPS_hash(PyObject *self);
+Py_hash_t PyCOMPS_hash(PyObject *self);
PyObject* PyCOMPSSeq_extra_get(PyObject *self, PyObject *key);
--
2.39.2

3
meta/recipes-devtools/libcomps/libcomps_0.1.19.bb → meta/recipes-devtools/libcomps/libcomps_0.1.20.bb
View File

@@ -5,11 +5,10 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \
file://0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch \
file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
SRCREV = "9322bdcf06630cc094f094f944d7d0e2cb798b73"
SRCREV = "854fbb9fe733b774981e1ffcf825b2d2ce0f8072"
S = "${WORKDIR}/git"