Skip to contentSkip to conversation

avro-c: update to 1.9.1

PATCH In review Oleksandr Kravchuk 2 participants 2 messages Sep 13, 2019 – Sep 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 avro-c: update to 1.9.1

Removed patch was upstreamed.

License checksum changed since http links were replaced with https ones (see b83441d5d5a88c3ea6e9f7df9746e3060beb4512).

---
 ...avro-c-Fix-build-with-clang-compiler.patch | 37 -------------------
 .../avro/{avro-c_1.8.1.bb => avro-c_1.9.1.bb} |  8 ++--
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch
 rename meta-oe/recipes-support/avro/{avro-c_1.8.1.bb => avro-c_1.9.1.bb} (50%)
meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch deleted +0 -37
deleted file mode 100644
index 01235d8ef..000000000
@@ -1,37 +0,0 @@
-From 518bb8ccfb3f3fc143fbd571782f3e40573d01b5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 10 Apr 2017 09:15:04 -0700
-Subject: [PATCH] avro-c: Fix build with clang compiler
-
-Clang advertizes itself to be compatible with gcc 4.2.1
-while that was true several years ago, it now supports
-a lot more newer features, the test to just check gcc
-version should be supplanted with clang check as well
-so atomic support in clang can be asserted as well
-
-Fixes
-
-lang/c/src/avro/refcount.h:301:2: error: "No atomic implementation!"
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lang/c/src/avro/refcount.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lang/c/src/avro/refcount.h b/lang/c/src/avro/refcount.h
-index 69afa4fc..d76ba057 100644
---- a/lang/c/src/avro/refcount.h
-+++ b/lang/c/src/avro/refcount.h
-@@ -118,7 +118,8 @@ avro_refcount_dec(volatile int *refcount)
-  * GCC intrinsics
-  */
- 
--#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500
-+#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 \
-+|| defined(__clang__)
- 
- static inline void
- avro_refcount_set(volatile int *refcount, int value)
--- 
-2.12.2
-
meta-oe/recipes-support/avro/avro-c_1.9.1.bb renamed from meta-oe/recipes-support/avro/avro-c_1.8.1.bb +3 -5
similarity index 50%
rename from meta-oe/recipes-support/avro/avro-c_1.8.1.bb
rename to meta-oe/recipes-support/avro/avro-c_1.9.1.bb
index 276fe2b5a..05cb46e0f 100644
@@ -3,15 +3,13 @@ HOMEPAGE = "http://apr.apache.org/"
 SECTION = "libs"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=73bdf70f268f0b3b9c5a83dd7a6f3324"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae"
 
 DEPENDS = "jansson zlib xz"
 PV .= "+git${SRCPV}"
 
-SRCREV = "4b3677c32b879e0e7f717eb95f9135ac654da760"
-SRC_URI = "git://github.com/apache/avro \
-           file://0001-avro-c-Fix-build-with-clang-compiler.patch;patchdir=../../ \
-"
+SRCREV = "89218262cde62e98fcb3778b86cd3f03056c54f3"
+SRC_URI = "git://github.com/apache/avro;branch=branch-1.9"
 
 S = "${WORKDIR}/git/lang/c"
 
Signature · 1 line
2.17.1
#1 lore raw

Fails with musl still

lang/c/src/avro_generic_internal.h:63:39: error: 'ssize_t' undeclared (first use in this function); did you mean 'size_t'?
01:28:42 | 63 | ((gcls)->instance_size == NULL ? (ssize_t)-1 :
(ssize_t)(gcls)->instance_size(&(gcls)->parent))

I think it needs to pass -D_GNU_SOURCE via compiler cmdline

Quoted 91 lines · Oleksandr Kravchuk

Removed patch was upstreamed.

License checksum changed since http links were replaced with https ones (see b83441d5d5a88c3ea6e9f7df9746e3060beb4512).

---
 ...avro-c-Fix-build-with-clang-compiler.patch | 37 -------------------
 .../avro/{avro-c_1.8.1.bb => avro-c_1.9.1.bb} |  8 ++--
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch
 rename meta-oe/recipes-support/avro/{avro-c_1.8.1.bb => avro-c_1.9.1.bb} (50%)
meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch deleted +0 -37
deleted file mode 100644
index 01235d8ef..000000000
@@ -1,37 +0,0 @@
-From 518bb8ccfb3f3fc143fbd571782f3e40573d01b5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 10 Apr 2017 09:15:04 -0700
-Subject: [PATCH] avro-c: Fix build with clang compiler
-
-Clang advertizes itself to be compatible with gcc 4.2.1
-while that was true several years ago, it now supports
-a lot more newer features, the test to just check gcc
-version should be supplanted with clang check as well
-so atomic support in clang can be asserted as well
-
-Fixes
-
-lang/c/src/avro/refcount.h:301:2: error: "No atomic implementation!"
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lang/c/src/avro/refcount.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lang/c/src/avro/refcount.h b/lang/c/src/avro/refcount.h
-index 69afa4fc..d76ba057 100644
---- a/lang/c/src/avro/refcount.h
-+++ b/lang/c/src/avro/refcount.h
-@@ -118,7 +118,8 @@ avro_refcount_dec(volatile int *refcount)
-  * GCC intrinsics
-  */
-
--#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500
-+#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 \
-+|| defined(__clang__)
-
- static inline void
- avro_refcount_set(volatile int *refcount, int value)
---
-2.12.2
-
meta-oe/recipes-support/avro/avro-c_1.9.1.bb renamed from meta-oe/recipes-support/avro/avro-c_1.8.1.bb +3 -6
similarity index 50%
rename from meta-oe/recipes-support/avro/avro-c_1.8.1.bb
rename to meta-oe/recipes-support/avro/avro-c_1.9.1.bb
index 276fe2b5a..05cb46e0f 100644
@@ -3,15 +3,13 @@ HOMEPAGE = "http://apr.apache.org/"
 SECTION = "libs"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=73bdf70f268f0b3b9c5a83dd7a6f3324"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae"
 
 DEPENDS = "jansson zlib xz"
 PV .= "+git${SRCPV}"
 
-SRCREV = "4b3677c32b879e0e7f717eb95f9135ac654da760"
-SRC_URI = "git://github.com/apache/avro \
-           file://0001-avro-c-Fix-build-with-clang-compiler.patch;patchdir=../../ \
-"
+SRCREV = "89218262cde62e98fcb3778b86cd3f03056c54f3"
+SRC_URI = "git://github.com/apache/avro;branch=branch-1.9"
 
 S = "${WORKDIR}/git/lang/c"
 
--

2.17.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel