Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add capnproto/0.9.1 #7429

Merged
merged 4 commits into from
Sep 28, 2021
Merged

Add capnproto/0.9.1 #7429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06578f3
Add capnproto/0.9.1
tuxu Sep 27, 2021
ab88ef2
capnproto: fix rpath of installed libraries
tuxu Sep 27, 2021
010cee9
capnproto: fix minimum cmake version for tests
tuxu Sep 27, 2021
f1eecb1
capnproto: add fixme comment to test package
tuxu Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions recipes/capnproto/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
sources:
"0.9.1":
url: "https://github.com/capnproto/capnproto/archive/v0.9.1.tar.gz"
sha256: "daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535"
"0.8.0":
url: "https://github.com/capnproto/capnproto/archive/v0.8.0.tar.gz"
sha256: "6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820"
"0.7.0":
url: "https://github.com/capnproto/capnproto/archive/v0.7.0.tar.gz"
sha256: 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28
patches:
"0.9.1":
- patch_file: patches/0010-disable-tests-for-0.9.1.patch
base_path: source_subfolder
"0.8.0":
- patch_file: patches/0001-disable-tests.patch
base_path: source_subfolder
Expand Down
11 changes: 10 additions & 1 deletion recipes/capnproto/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,17 @@ def _configure_autotools(self):
]
if tools.Version(self.version) >= "0.8.0":
args.append("--with-zlib" if self.options.with_zlib else "--without-zlib")

self._autotools = AutoToolsBuildEnvironment(self)
self._autotools.configure(args=args, configure_dir=os.path.join(self._source_subfolder, "c++"))

# Fix rpath on macOS
configure_dir = os.path.join(self._source_subfolder, "c++")
configure_path = os.path.join(configure_dir, "configure")
if self.settings.os == "Macos":
tools.replace_in_file(configure_path, r"-install_name \$rpath/", "-install_name @rpath/")
self._autotools.link_flags.append("-Wl,-rpath,@loader_path/../lib")

self._autotools.configure(args=args, configure_dir=configure_dir)
return self._autotools

def build(self):
Expand Down
185 changes: 185 additions & 0 deletions recipes/capnproto/all/patches/0010-disable-tests-for-0.9.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
Disable tests for 0.9.1

---
c++/Makefile.am | 168 ------------------------------------------------
1 file changed, 168 deletions(-)

diff --git a/c++/Makefile.am b/c++/Makefile.am
index 1e3fd8e9..488e54d5 100644
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -444,171 +444,3 @@ endif LITE_MODE
# src/capnp/serialize-snappy*
# src/capnp/benchmark/...
# src/capnp/compiler/...
-
-# Tests ==============================================================
-
-test_capnpc_inputs = \
- src/capnp/test.capnp \
- src/capnp/test-import.capnp \
- src/capnp/test-import2.capnp \
- src/capnp/compat/json-test.capnp
-
-test_capnpc_outputs = \
- src/capnp/test.capnp.c++ \
- src/capnp/test.capnp.h \
- src/capnp/test-import.capnp.c++ \
- src/capnp/test-import.capnp.h \
- src/capnp/test-import2.capnp.c++ \
- src/capnp/test-import2.capnp.h \
- src/capnp/compat/json-test.capnp.c++ \
- src/capnp/compat/json-test.capnp.h
-
-if USE_EXTERNAL_CAPNP
-
-test_capnpc_middleman: $(test_capnpc_inputs)
- @$(MKDIR_P) src
- $(CAPNP) compile --src-prefix=$(srcdir)/src -o$(CAPNPC_CXX):src -I$(srcdir)/src $$(for FILE in $(test_capnpc_inputs); do echo $(srcdir)/$$FILE; done)
- touch test_capnpc_middleman
-
-else
-
-test_capnpc_middleman: capnp$(EXEEXT) capnpc-c++$(EXEEXT) $(test_capnpc_inputs)
- @$(MKDIR_P) src
- ./capnp$(EXEEXT) compile --src-prefix=$(srcdir)/src -o./capnpc-c++$(EXEEXT):src -I$(srcdir)/src $$(for FILE in $(test_capnpc_inputs); do echo $(srcdir)/$$FILE; done)
- touch test_capnpc_middleman
-
-endif
-
-$(test_capnpc_outputs): test_capnpc_middleman
-
-BUILT_SOURCES = $(test_capnpc_outputs)
-
-check_LIBRARIES = libcapnp-test.a
-libcapnp_test_a_SOURCES = \
- src/capnp/test-util.c++ \
- src/capnp/test-util.h
-nodist_libcapnp_test_a_SOURCES = $(test_capnpc_outputs)
-
-if LITE_MODE
-
-check_PROGRAMS = capnp-test
-compiler_tests =
-capnp_test_LDADD = libcapnp-test.a libcapnp.la libkj-test.la libkj.la
-
-else !LITE_MODE
-
-check_PROGRAMS = capnp-test capnp-evolution-test capnp-afl-testcase
-if HAS_FUZZING_ENGINE
- check_PROGRAMS += capnp-llvm-fuzzer-testcase
-endif
-heavy_tests = \
- src/kj/async-test.c++ \
- src/kj/async-xthread-test.c++ \
- src/kj/async-unix-test.c++ \
- src/kj/async-unix-xthread-test.c++ \
- src/kj/async-win32-test.c++ \
- src/kj/async-win32-xthread-test.c++ \
- src/kj/async-io-test.c++ \
- src/kj/async-queue-test.c++ \
- src/kj/parse/common-test.c++ \
- src/kj/parse/char-test.c++ \
- src/kj/std/iostream-test.c++ \
- src/kj/compat/url-test.c++ \
- src/kj/compat/http-test.c++ \
- $(MAYBE_KJ_GZIP_TESTS) \
- $(MAYBE_KJ_TLS_TESTS) \
- src/capnp/canonicalize-test.c++ \
- src/capnp/capability-test.c++ \
- src/capnp/membrane-test.c++ \
- src/capnp/schema-test.c++ \
- src/capnp/schema-loader-test.c++ \
- src/capnp/schema-parser-test.c++ \
- src/capnp/dynamic-test.c++ \
- src/capnp/stringify-test.c++ \
- src/capnp/serialize-async-test.c++ \
- src/capnp/serialize-text-test.c++ \
- src/capnp/rpc-test.c++ \
- src/capnp/rpc-twoparty-test.c++ \
- src/capnp/ez-rpc-test.c++ \
- src/capnp/compat/json-test.c++ \
- src/capnp/compat/websocket-rpc-test.c++ \
- src/capnp/compiler/lexer-test.c++ \
- src/capnp/compiler/type-id-test.c++
-capnp_test_LDADD = \
- libcapnp-test.a \
- libcapnpc.la \
- libcapnp-rpc.la \
- libcapnp-websocket.la \
- libcapnp-json.la \
- libcapnp.la \
- libkj-http.la \
- $(MAYBE_KJ_GZIP_LA) \
- $(MAYBE_KJ_TLS_LA) \
- libkj-async.la \
- libkj-test.la \
- libkj.la \
- $(ASYNC_LIBS) \
- $(PTHREAD_LIBS)
-
-endif !LITE_MODE
-
-capnp_test_CPPFLAGS = -Wno-deprecated-declarations
-capnp_test_SOURCES = \
- src/kj/common-test.c++ \
- src/kj/memory-test.c++ \
- src/kj/refcount-test.c++ \
- src/kj/array-test.c++ \
- src/kj/list-test.c++ \
- src/kj/string-test.c++ \
- src/kj/string-tree-test.c++ \
- src/kj/table-test.c++ \
- src/kj/map-test.c++ \
- src/kj/encoding-test.c++ \
- src/kj/exception-test.c++ \
- src/kj/debug-test.c++ \
- src/kj/arena-test.c++ \
- src/kj/units-test.c++ \
- src/kj/tuple-test.c++ \
- src/kj/one-of-test.c++ \
- src/kj/function-test.c++ \
- src/kj/io-test.c++ \
- src/kj/mutex-test.c++ \
- src/kj/time-test.c++ \
- src/kj/threadlocal-test.c++ \
- src/kj/filesystem-test.c++ \
- src/kj/filesystem-disk-test.c++ \
- src/kj/test-test.c++ \
- src/capnp/common-test.c++ \
- src/capnp/blob-test.c++ \
- src/capnp/endian-test.c++ \
- src/capnp/endian-fallback-test.c++ \
- src/capnp/endian-reverse-test.c++ \
- src/capnp/layout-test.c++ \
- src/capnp/any-test.c++ \
- src/capnp/message-test.c++ \
- src/capnp/encoding-test.c++ \
- src/capnp/orphan-test.c++ \
- src/capnp/serialize-test.c++ \
- src/capnp/serialize-packed-test.c++ \
- src/capnp/fuzz-test.c++ \
- $(heavy_tests)
-
-if !LITE_MODE
-capnp_evolution_test_LDADD = libcapnpc.la libcapnp.la libkj.la
-capnp_evolution_test_SOURCES = src/capnp/compiler/evolution-test.c++
-
-capnp_afl_testcase_LDADD = libcapnp-test.a libcapnp-rpc.la libcapnp.la libkj.la libkj-async.la
-capnp_afl_testcase_SOURCES = src/capnp/afl-testcase.c++
-
-if HAS_FUZZING_ENGINE
- capnp_llvm_fuzzer_testcase_LDADD = libcapnp-test.a libcapnp-rpc.la libcapnp.la libkj.la libkj-async.la
- capnp_llvm_fuzzer_testcase_SOURCES = src/capnp/llvm-fuzzer-testcase.c++
- capnp_llvm_fuzzer_testcase_LDFLAGS = $(LIB_FUZZING_ENGINE)
-endif
-endif !LITE_MODE
-
-if LITE_MODE
-TESTS = capnp-test
-else !LITE_MODE
-TESTS = capnp-test capnp-evolution-test src/capnp/compiler/capnp-test.sh
-endif !LITE_MODE
--
2.31.1

7 changes: 7 additions & 0 deletions recipes/capnproto/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ class TestPackageConan(ConanFile):
def build_requirements(self):
if tools.cross_building(self.settings):
self.build_requires(str(self.requires["capnproto"]))
if self.settings.os == "Macos" and self.settings.arch == "armv8":
# Workaround for CMake bug with error message:
# Attempting to use @rpath without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being
# set. This could be because you are using a Mac OS X version less than 10.5
# or because CMake's platform configuration is corrupt.
# FIXME: Remove once CMake on macOS/M1 CI runners is upgraded.
self.build_requires("cmake/3.20.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 2 additions & 0 deletions recipes/capnproto/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ versions:
folder: all
"0.8.0":
folder: all
"0.9.1":
folder: all