mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
rpm: Fix hdr_hash function prototype
(From OE-Core rev: 9af6c9a375efbdd039ec8a76eae4cb59fe1f40e5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 0e812b4c22ac077f2defd6842f82b5c993db24c2) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
+35
@@ -0,0 +1,35 @@
|
|||||||
|
From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Fri, 3 Mar 2023 09:54:48 -0800
|
||||||
|
Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
python/header-py.c:744:2: 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]
|
||||||
|
| hdr_hash, /* tp_hash */
|
||||||
|
| ^~~~~~~~
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
python/header-py.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/python/header-py.c b/python/header-py.c
|
||||||
|
index 0aed0c9267..c15503f359 100644
|
||||||
|
--- a/python/header-py.c
|
||||||
|
+++ b/python/header-py.c
|
||||||
|
@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s)
|
||||||
|
"(Oi)", s, RPMTAG_NEVR);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static long hdr_hash(PyObject * h)
|
||||||
|
+static Py_hash_t hdr_hash(PyObject * h)
|
||||||
|
{
|
||||||
|
- return (long) h;
|
||||||
|
+ return (Py_hash_t) h;
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject * hdr_reduce(hdrObject *s)
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
||||||
@@ -40,6 +40,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc
|
|||||||
file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \
|
file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \
|
||||||
file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \
|
file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \
|
||||||
file://fifofix.patch \
|
file://fifofix.patch \
|
||||||
|
file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|||||||
Reference in New Issue
Block a user