diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-03-24 23:47:15 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-03-25 06:52:29 -0700 |
commit | 2db5ae1a0cb980028f55e5bb46c1b4ea660945ce (patch) | |
tree | 059359e83a8fbd4339616bde728980dfd9fa6f48 /meta-oe/recipes-support/avro | |
parent | b51dcf7d0452037ee4898f0a3de94c24fb61ab8e (diff) | |
download | meta-openembedded-2db5ae1a0cb980028f55e5bb46c1b4ea660945ce.tar.gz |
avro-c: upgrade 1.9.1 -> 1.9.2
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 <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/avro')
-rw-r--r-- | meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch | 42 | ||||
-rw-r--r-- | meta-oe/recipes-support/avro/avro-c_1.9.2.bb (renamed from meta-oe/recipes-support/avro/avro-c_1.9.1.bb) | 3 |
2 files changed, 1 insertions, 44 deletions
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 8964d6b72f..0000000000 --- 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 @@ | |||
1 | From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001 | ||
2 | From: Titouan Christophe <titouan.christophe@railnova.eu> | ||
3 | Date: Sun, 8 Dec 2019 01:55:59 +0100 | ||
4 | Subject: [PATCH] Allow avro C to be built on musl based systems. | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The type `ssize_t` is defined in sys/types.h, and nowhere else | ||
10 | in the musl standard C library, so it should be included for the | ||
11 | compilation to succeed. | ||
12 | |||
13 | This fixes several errors like: | ||
14 | |||
15 | In file included from src/generic.c:29:0: | ||
16 | src/generic.c: In function ‘avro_generic_value_new’: | ||
17 | src/avro_generic_internal.h:63:39: | ||
18 | error: ‘ssize_t’ undeclared (first use in this function); | ||
19 | did you mean ‘size_t’? | ||
20 | |||
21 | Upstream-Status: Backport | ||
22 | Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu> | ||
23 | --- | ||
24 | lang/c/src/avro_generic_internal.h | 2 ++ | ||
25 | 1 file changed, 2 insertions(+) | ||
26 | |||
27 | diff --git a/lang/c/src/avro_generic_internal.h b/lang/c/src/avro_generic_internal.h | ||
28 | index 709403c03..9843ed652 100644 | ||
29 | --- a/lang/c/src/avro_generic_internal.h | ||
30 | +++ b/lang/c/src/avro_generic_internal.h | ||
31 | @@ -24,6 +24,8 @@ extern "C" { | ||
32 | #define CLOSE_EXTERN | ||
33 | #endif | ||
34 | |||
35 | +#include <sys/types.h> | ||
36 | + | ||
37 | #include "avro/generic.h" | ||
38 | #include "avro/schema.h" | ||
39 | #include "avro/value.h" | ||
40 | -- | ||
41 | 2.24.1 | ||
42 | |||
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 index 8954c9802f..0642179fb3 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" | |||
8 | DEPENDS = "jansson zlib xz" | 8 | DEPENDS = "jansson zlib xz" |
9 | 9 | ||
10 | BRANCH = "branch-1.9" | 10 | BRANCH = "branch-1.9" |
11 | SRCREV = "89218262cde62e98fcb3778b86cd3f03056c54f3" | 11 | SRCREV = "bf20128ca6138a830b2ea13e0490f3df6b035639" |
12 | SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ | 12 | SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ |
13 | file://0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch;patchdir=../../ \ | ||
14 | file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ | 13 | file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ |
15 | " | 14 | " |
16 | 15 | ||