diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk deleted file mode 100644 index 158f57b3c68..00000000000 --- a/depends/packages/libmultiprocess.mk +++ /dev/null @@ -1,30 +0,0 @@ -package=libmultiprocess -$(package)_version=$(native_$(package)_version) -$(package)_local_dir=$(native_$(package)_local_dir) -$(package)_download_path=$(native_$(package)_download_path) -$(package)_file_name=$(native_$(package)_file_name) -$(package)_sha256_hash=$(native_$(package)_sha256_hash) -$(package)_dependencies=native_$(package) capnp -ifneq ($(host),$(build)) -$(package)_dependencies += native_capnp -endif - -define $(package)_set_vars -ifneq ($(host),$(build)) -$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp" -$(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++" -endif -$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr -endef - -define $(package)_config_cmds - $($(package)_cmake) . -endef - -define $(package)_build_cmds - $(MAKE) multiprocess -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install-lib -endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 7a3699fedb3..dddf8339638 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -20,7 +20,7 @@ sqlite_packages=sqlite zmq_packages=zeromq -multiprocess_packages = libmultiprocess capnp +multiprocess_packages = capnp multiprocess_native_packages = native_libmultiprocess native_capnp usdt_linux_packages=systemtap diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in index 0a68a35fee0..d247a80c9cc 100644 --- a/depends/toolchain.cmake.in +++ b/depends/toolchain.cmake.in @@ -160,10 +160,9 @@ endif() if("@multiprocess@" STREQUAL "1") set(ENABLE_IPC ON CACHE BOOL "") - set(WITH_EXTERNAL_LIBMULTIPROCESS ON CACHE BOOL "") - set(Libmultiprocess_ROOT "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "") - set(LibmultiprocessNative_ROOT "${CMAKE_CURRENT_LIST_DIR}/native" CACHE PATH "") + set(MPGEN_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/native/bin/mpgen" CACHE FILEPATH "") + set(CAPNP_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/native/bin/capnp" CACHE FILEPATH "") + set(CAPNPC_CXX_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/native/bin/capnpc-c++" CACHE FILEPATH "") else() set(ENABLE_IPC OFF CACHE BOOL "") - set(WITH_EXTERNAL_LIBMULTIPROCESS OFF CACHE BOOL "") endif()