0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch removed since it is included in 1.9.2 Signed-off-by: Wang Mingyu --- ...-C-to-be-built-on-musl-based-systems.patch | 42 ------------------- .../avro/{avro-c_1.9.1.bb => avro-c_1.9.2.bb} | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch rename meta-oe/recipes-support/avro/{avro-c_1.9.1.bb => avro-c_1.9.2.bb} (76%) diff --git a/meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch b/meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch deleted file mode 100644 index 8964d6b72..000000000 --- a/meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Sun, 8 Dec 2019 01:55:59 +0100 -Subject: [PATCH] Allow avro C to be built on musl based systems. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The type `ssize_t` is defined in sys/types.h, and nowhere else -in the musl standard C library, so it should be included for the -compilation to succeed. - -This fixes several errors like: - - In file included from src/generic.c:29:0: - src/generic.c: In function ‘avro_generic_value_new’: - src/avro_generic_internal.h:63:39: - error: ‘ssize_t’ undeclared (first use in this function); - did you mean ‘size_t’? - -Upstream-Status: Backport -Signed-off-by: Titouan Christophe ---- - lang/c/src/avro_generic_internal.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lang/c/src/avro_generic_internal.h b/lang/c/src/avro_generic_internal.h -index 709403c03..9843ed652 100644 ---- a/lang/c/src/avro_generic_internal.h -+++ b/lang/c/src/avro_generic_internal.h -@@ -24,6 +24,8 @@ extern "C" { - #define CLOSE_EXTERN - #endif - -+#include -+ - #include "avro/generic.h" - #include "avro/schema.h" - #include "avro/value.h" --- -2.24.1 - diff --git a/meta-oe/recipes-support/avro/avro-c_1.9.1.bb b/meta-oe/recipes-support/avro/avro-c_1.9.2.bb similarity index 76% rename from meta-oe/recipes-support/avro/avro-c_1.9.1.bb rename to meta-oe/recipes-support/avro/avro-c_1.9.2.bb index 8954c9802..0642179fb 100644 --- a/meta-oe/recipes-support/avro/avro-c_1.9.1.bb +++ b/meta-oe/recipes-support/avro/avro-c_1.9.2.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" DEPENDS = "jansson zlib xz" BRANCH = "branch-1.9" -SRCREV = "89218262cde62e98fcb3778b86cd3f03056c54f3" +SRCREV = "bf20128ca6138a830b2ea13e0490f3df6b035639" SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ - file://0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch;patchdir=../../ \ file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ " -- 2.17.1