From ee140ec9e13315e999c57f4b2bd6ebf39f8928df Mon Sep 17 00:00:00 2001 From: eater Date: Wed, 2 Nov 2016 22:16:35 +0100 Subject: [PATCH] New package: capnproto-0.5.3 Closes #5108 and cleans up the subpackages there --- common/shlibs | 5 ++++ srcpkgs/capnproto-devel | 1 + srcpkgs/capnproto/patches/musl_fix.patch | 20 +++++++++++++++ srcpkgs/capnproto/template | 32 ++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 120000 srcpkgs/capnproto-devel create mode 100644 srcpkgs/capnproto/patches/musl_fix.patch create mode 100644 srcpkgs/capnproto/template diff --git a/common/shlibs b/common/shlibs index 90d91729b80..2bb692c51ef 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2714,3 +2714,8 @@ libgnome-autoar-gtk-0.so.0 gnome-autoar-0.1.1_1 libxapp.so.1 xapps-1.0.2_1 libite.so.3 libite-1.8.2_1 liblog4cplus-1.2.so.5 log4cplus-1.2.0_1 +libcapnp-0.5.3.so capnproto-0.5.3_1 +libcapnp-rpc-0.5.3.so capnproto-0.5.3_1 +libcapnpc-0.5.3.so capnproto-0.5.3_1 +libkj-0.5.3.so capnproto-0.5.3_1 +libkj-async-0.5.3.so capnproto-0.5.3_1 diff --git a/srcpkgs/capnproto-devel b/srcpkgs/capnproto-devel new file mode 120000 index 00000000000..4a4db1c69a2 --- /dev/null +++ b/srcpkgs/capnproto-devel @@ -0,0 +1 @@ +capnproto \ No newline at end of file diff --git a/srcpkgs/capnproto/patches/musl_fix.patch b/srcpkgs/capnproto/patches/musl_fix.patch new file mode 100644 index 00000000000..a2213b6ec76 --- /dev/null +++ b/srcpkgs/capnproto/patches/musl_fix.patch @@ -0,0 +1,20 @@ +--- src/kj/exception.c++.fix 2016-11-10 10:30:39.182645852 +0100 ++++ src/kj/exception.c++ 2016-11-10 10:30:26.848646578 +0100 +@@ -28,7 +28,7 @@ + #include + #include + +-#if (__linux__ && !__ANDROID__) || __APPLE__ ++#if (__GLIBC__) || __APPLE__ + #define KJ_HAS_BACKTRACE 1 + #include + #endif +@@ -43,7 +43,7 @@ + namespace { + + String getStackSymbols(ArrayPtr trace) { +-#if (__linux__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG) ++#if (__GLIBC__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG) + // We want to generate a human-readable stack trace. + + // TODO(someday): It would be really great if we could avoid farming out to another process diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template new file mode 100644 index 00000000000..9d82e887839 --- /dev/null +++ b/srcpkgs/capnproto/template @@ -0,0 +1,32 @@ +# Template file for 'capnproto' +pkgname=capnproto +version=0.5.3 +revision=1 +wrksrc="${pkgname}-c++-${version}" +build_style=gnu-configure +short_desc="Cap'n Proto serialization/RPC system" +maintainer="eater " +license="MIT" +homepage="https://capnproto.org" +distfiles="${homepage}/capnproto-c++-${version}.tar.gz" +checksum="cdb17c792493bdcd4a24bcd196eb09f70ee64c83a3eccb0bc6534ff560536afb" +nocross="Tries to execute compiled code during build" + +post_install() { + vlicense LICENSE.txt +} + +capnproto-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/*.la + vmove usr/lib/libcapnp-rpc.so + vmove usr/lib/libcapnp.so + vmove usr/lib/libcapnpc.so + vmove usr/lib/libkj-async.so + vmove usr/lib/libkj.so + vmove usr/lib/pkgconfig + } +}