diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-01-18 14:56:59 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-01-21 10:02:02 -0800 |
| commit | 8699170d3a8a8e8decaecce78e65fd6d904b491d (patch) | |
| tree | 16c3f81f15dc2a8d3dfbff56257b825705bf175f /meta-oe/recipes-support | |
| parent | ee0de616df82937191613c85f9df7e872b99ed6f (diff) | |
| download | meta-openembedded-8699170d3a8a8e8decaecce78e65fd6d904b491d.tar.gz | |
xmlstarlet: Fix build with clang16
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb | 4 |
2 files changed, 35 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 18 Jan 2023 14:50:08 -0800 | ||
| 4 | Subject: [PATCH] Fix hash_key_put() signature | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | |||
| 8 | ../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] | ||
| 9 | xmlHashScan(uniq, hash_key_put, &lines); | ||
| 10 | ^~~~~~~~~~~~ | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | src/xml_elem.c | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/xml_elem.c b/src/xml_elem.c | ||
| 19 | index 024e62a..a73038a 100644 | ||
| 20 | --- a/src/xml_elem.c | ||
| 21 | +++ b/src/xml_elem.c | ||
| 22 | @@ -186,7 +186,7 @@ typedef struct { | ||
| 23 | * put @name into @data->array[@data->offset] | ||
| 24 | */ | ||
| 25 | static void | ||
| 26 | -hash_key_put(void *payload, void *data, xmlChar *name) | ||
| 27 | +hash_key_put(void *payload, void *data, const xmlChar *name) | ||
| 28 | { | ||
| 29 | ArrayDest *dest = data; | ||
| 30 | dest->array[dest->offset++] = name; | ||
| 31 | -- | ||
| 32 | 2.39.1 | ||
| 33 | |||
diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e28fd61a03..930fbdd6c7 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb | |||
| @@ -14,8 +14,8 @@ DEPENDS = "libxml2 libxslt" | |||
| 14 | 14 | ||
| 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ | 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ |
| 16 | file://configure.ac.patch \ | 16 | file://configure.ac.patch \ |
| 17 | file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" | 17 | file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ |
| 18 | SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" | 18 | file://0001-Fix-hash_key_put-signature.patch" |
| 19 | SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" | 19 | SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" |
| 20 | 20 | ||
| 21 | inherit autotools | 21 | inherit autotools |
