From 1d79b368594e09e2cec1a251c609e020c0f3ace9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Apr 2017 09:21:38 -0700 Subject: avro-c: Fix build with clang Update SRC_URI to point to github mirror Add a patch to fix build with clang Signed-off-by: Khem Raj --- ...0001-avro-c-Fix-build-with-clang-compiler.patch | 37 ++++++++++++++++++++++ meta-oe/recipes-support/avro/avro-c_1.8.1.bb | 10 +++--- 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch b/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch new file mode 100644 index 0000000000..01235d8ef3 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch @@ -0,0 +1,37 @@ +From 518bb8ccfb3f3fc143fbd571782f3e40573d01b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + diff --git a/meta-oe/recipes-support/avro/avro-c_1.8.1.bb b/meta-oe/recipes-support/avro/avro-c_1.8.1.bb index 8deee4b23d..276fe2b5ae 100644 --- a/meta-oe/recipes-support/avro/avro-c_1.8.1.bb +++ b/meta-oe/recipes-support/avro/avro-c_1.8.1.bb @@ -2,16 +2,18 @@ SUMMARY = "Apache Avro data serialization system." HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=73bdf70f268f0b3b9c5a83dd7a6f3324" DEPENDS = "jansson zlib xz" +PV .= "+git${SRCPV}" -SRC_URI = "${APACHE_MIRROR}/avro/avro-${PV}/c/avro-c-${PV}.tar.gz" +SRCREV = "4b3677c32b879e0e7f717eb95f9135ac654da760" +SRC_URI = "git://github.com/apache/avro \ + file://0001-avro-c-Fix-build-with-clang-compiler.patch;patchdir=../../ \ +" -SRC_URI[md5sum] = "b268348536714541e10411823a1b59b0" -SRC_URI[sha256sum] = "e5042088fa47e1aa2860c5cfed0bd061d81f9e96628f8b4d87a24d9b8c5e4ecc" +S = "${WORKDIR}/git/lang/c" LDFLAGS_append_libc-uclibc = " -lm" -- cgit 1.2.3-korg