capnproto: new package
PATCH v4 1/1 capnproto: new package
Adds the capnproto package. This also builds a host variant to generate the capnp compiler that can be used to compile message definitions into C++ code. Includes a patch from upstream to fix an issue with uclibc.
---
Changes v3->v4:
- added my SoB to package patch (suggested by Arnout)
(also now able to use patch from upstream without modification)
- added hash of license file (Arnout)
- added comment in .mk for use of AUTORECONF (Arnout)
- added dependency on BR2_TOOLCHAIN_HAS_ATOMIC (Arnout)
- switched to use *_SUBDIR instead of custom extraction commands (Arnout) (I missed the existence of *_SUBDIR in the manual when reading!)
Retested v4 with test-pkg (but not -a like v3):
6 builds, 1 skipped, 0 build failed, 0 legal-info failed
--- DEVELOPERS | 2 ++ package/Config.in | 1 + .../0001-Do-not-use-execinfo-h-with-uclibc.patch | 30 ++++++++++++++++++++++ package/capnproto/Config.in | 24 +++++++++++++++++ package/capnproto/capnproto.hash | 3 +++ package/capnproto/capnproto.mk | 23 +++++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch create mode 100644 package/capnproto/Config.in create mode 100644 package/capnproto/capnproto.hash create mode 100644 package/capnproto/capnproto.mk
DEVELOPERS +2 -0
@@ -983,6 +983,7 @@ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Joel Carlson <[email protected]> +F: package/capnproto/ F: package/cmocka/ F: package/flatcc/
@@ -1117,6 +1118,7 @@ N: Kevin Joly <[email protected]> F: package/libgphoto2/ N: Koen Martens <[email protected]> +F: package/capnproto/ F: package/linuxconsoletools/ N: Kurt Van Dijck <[email protected]>
package/Config.in +1 -0
@@ -1504,6 +1504,7 @@ menu "Other" source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" source "package/boost/Config.in" + source "package/capnproto/Config.in" source "package/clang/Config.in" source "package/clapack/Config.in" source "package/classpath/Config.in"
package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch new file +30 -0
@@ -0,0 +1,30 @@ +From e651ac5febc59e3e2b5d3365ededbe5362756da2 Mon Sep 17 00:00:00 2001 +From: Koen Martens <[email protected]> +Date: Wed, 12 Jul 2017 18:49:32 +0200 +Subject: [PATCH] Do not use execinfo.h with uclibc (#511) + +Upstream commit: https://github.com/capnproto/capnproto/commit/e651ac5febc59e3e2b5d3365ededbe5362756da2 + +Signed-off-by: Koen Martens <[email protected]> +Signed-off-by: Joel Carlson <[email protected]> + +--- + c++/src/kj/exception.c++ | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c++/src/kj/exception.c++ b/c++/src/kj/exception.c++ +index 218f1db..339601a 100644 +--- a/c++/src/kj/exception.c++ ++++ b/c++/src/kj/exception.c++ +@@ -33,7 +33,7 @@ + #endif + #include "io.h" + +-#if (__linux__ && __GLIBC__) || __APPLE__ ++#if (__linux__ && __GLIBC__ && !__UCLIBC__) || __APPLE__ + #define KJ_HAS_BACKTRACE 1 + #include <execinfo.h> + #endif +-- +2.7.4 +
package/capnproto/Config.in new file +24 -0
@@ -0,0 +1,24 @@ +config BR2_PACKAGE_CAPNPROTO + bool "capnproto" + depends on BR2_USE_MMU + depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + help + Cap'n Proto is an insanely fast data interchange format + and capability-based RPC system. Think JSON, except + binary. Or think Protocol Buffers, except faster. In + fact, in benchmarks, Cap?n Proto is INFINITY TIMES + faster than Protocol Buffers. + + https://capnproto.org/index.html + +comment "capnproto needs host and target gcc >= 4.8 w/ C++, threads, atomic" + depends on BR2_USE_MMU + depends on !BR2_HOST_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_ATOMIC
package/capnproto/capnproto.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 85210424c09693d8fe158c1970a2bca37af3a0424f02b263f566a1b8a5451a2d capnproto-v0.6.1.tar.gz +sha256 16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6 LICENSE
package/capnproto/capnproto.mk new file +23 -0
@@ -0,0 +1,23 @@ +################################################################################ +# +# capnproto +# +################################################################################ + +CAPNPROTO_VERSION = v0.6.1 +CAPNPROTO_SITE = $(call github,capnproto,capnproto,$(CAPNPROTO_VERSION)) +CAPNPROTO_LICENSE = MIT +CAPNPROTO_LICENSE_FILES = LICENSE +CAPNPROTO_INSTALL_STAGING = YES +# Fetched from Github with no configure script +CAPNPROTO_AUTORECONF = YES +CAPNPROTO_CONF_OPTS = --with-external-capnp +# Needs the capnproto compiler on the host to generate C++ code from message +# definitions +CAPNPROTO_DEPENDENCIES = host-autoconf host-capnproto +CAPNPROTO_CONF_ENV += LIBS=-latomic +# The actual source to be compiled is within a 'c++' subdirectory +CAPNPROTO_SUBDIR = c++ + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
2.7.4
PATCH v4 1/1 capnproto: new package
Hello,
Quoted 6 lines · Joel Carlson
Adds the capnproto package. This also builds a host variant to generate the capnp compiler that can be used to compile message definitions into C++ code. Includes a patch from upstream to fix an issue with uclibc.
Signed-off-by Koen Martens <[email protected]>Signed-off-by Joel Carlson <[email protected]>
Thanks, I've applied, after doing one more change.
Quoted 1 line
+CAPNPROTO_CONF_ENV += LIBS=-latomic
You can't do that unconditionally, because libatomic doesn't always exists. This needs to be enclosed in a BR2_TOOLCHAIN_HAS_LIBATOMIC condition.
For example, some architectures provide __atomic built-ins with gcc 4.7 (so BR2_TOOLCHAIN_HAS_ATOMIC is true), and there was no libatomic at the time (so BR2_TOOLCHAIN_HAS_LIBATOMIC is false).
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com