pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
syncstorage-rs: add some patches for subprojects, progress
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Sun May 1 00:42:52 2022 +0200
Changeset: 998ede888e3128418999b6729da9637eb84cdf19
Modified Files:
syncstorage-rs/Makefile
syncstorage-rs/TODO
syncstorage-rs/distinfo
Added Files:
syncstorage-rs/patches/patch-aa
syncstorage-rs/patches/patch-ab
syncstorage-rs/patches/patch-ac
syncstorage-rs/patches/patch-ad
syncstorage-rs/patches/patch-ba
syncstorage-rs/patches/patch-bb
Log Message:
syncstorage-rs: add some patches for subprojects, progress
Still doesn't build
= note: ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::UnrefSynchEvent(absl::lts_20210324::SynchEvent*) [clone .part.0]':
/scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/mutex.cc:361: undefined reference to `absl::lts_20210324::base_internal::LowLevelAlloc::Free(void*)'
ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::ForgetSynchEvent(std::atomic<long>*, long, long)':
/scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/mutex.cc:361: undefined reference to `absl::lts_20210324::base_internal::LowLevelAlloc::Free(void*)'
ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::PerThreadSem::Post(absl::lts_20210324::base_internal::ThreadIdentity*)':
/scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h:107: undefined reference to `AbslInternalPerThreadSemPost_lts_20210324'
ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::PerThreadSem::Wait(absl::lts_20210324::synchronization_internal::KernelTimeout)':
/scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h:112: undefined reference to `AbslInternalPerThreadSemWait_lts_20210324'
ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::GetOrCreateCurrentThreadIdentity()':
/scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h:51: undefined reference to `absl::lts_20210324::synchronization_internal::CreateThreadIdentity()'
ld: /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h:51: undefined reference to `absl::lts_20210324::synchronization_internal::CreateThreadIdentity()'
= help: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
= note: use the `-l` flag to specify native libraries to link
= note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorustc-link-libkindname)
error: build failed
*** Error code 101
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=998ede888e3128418999b6729da9637eb84cdf19
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
syncstorage-rs/Makefile | 4 +
syncstorage-rs/TODO | 181 ++++------------------------------------
syncstorage-rs/distinfo | 6 ++
syncstorage-rs/patches/patch-aa | 13 +++
syncstorage-rs/patches/patch-ab | 35 ++++++++
syncstorage-rs/patches/patch-ac | 16 ++++
syncstorage-rs/patches/patch-ad | 29 +++++++
syncstorage-rs/patches/patch-ba | 16 ++++
syncstorage-rs/patches/patch-bb | 18 ++++
9 files changed, 152 insertions(+), 166 deletions(-)
diffs:
diff --git a/syncstorage-rs/Makefile b/syncstorage-rs/Makefile
index d6fbf44464..669deb7de1 100644
--- a/syncstorage-rs/Makefile
+++ b/syncstorage-rs/Makefile
@@ -27,6 +27,7 @@ SITES.curl-sys-${CURL_SYS_REV}.crate+= -${MASTER_SITE_CRATESIO}curl-sys/0.4.52+c
USE_LANGUAGES= c c++ # rust, but needs toolchain
USE_TOOLS+= pkg-config
#RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.abseil}/lib
PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -34,8 +35,11 @@ post-extract:
mv ${WRKDIR}/deadpool* ${WRKDIR}/deadpool
.include "../../lang/rust/cargo.mk"
+.include "../../lang/clang/buildlink3.mk"
#.include "../../security/openssl/buildlink3.mk"
.include "../../lang/python/pyversion.mk"
.include "../../lang/python/tool.mk"
+#.include "../../net/grpc/buildlink3.mk"
+#.include "../../devel/abseil/buildlink3.mk"
.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/syncstorage-rs/TODO b/syncstorage-rs/TODO
index fa0265e254..de87c676d6 100644
--- a/syncstorage-rs/TODO
+++ b/syncstorage-rs/TODO
@@ -1,169 +1,18 @@
- [ 24%] Building CXX object CMakeFiles/gpr.dir/src/core/lib/gpr/cpu_iphone.cc.o
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/alloc.cc:19:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:398:2: error: #error "Could not auto-detect platform"
- 398 | #error "Could not auto-detect platform"
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:421:2: warning: #warning "GPR_PLATFORM_STRING not auto-detected" [-Wcpp]
- 421 | #warning "GPR_PLATFORM_STRING not auto-detected"
- | ^~~~~~~
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/alloc.cc:19:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:488:2: error: #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- 488 | #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:492:2: error: #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- 492 | #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:498:2: error: #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- 498 | #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:504:2: error: #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- 504 | #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- | ^~~~~
- --- CMakeFiles/gpr.dir/src/core/lib/gpr/alloc.cc.o ---
- *** [CMakeFiles/gpr.dir/src/core/lib/gpr/alloc.cc.o] Error code 1
+ = note: ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::UnrefSynchEvent(absl::lts_20210324::SynchEvent*) [clone .part.0]':
+ /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/mutex.cc:361: undefined reference to `absl::lts_20210324::base_internal::LowLevelAlloc::Free(void*)'
+ ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::ForgetSynchEvent(std::atomic<long>*, long, long)':
+ /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/mutex.cc:361: undefined reference to `absl::lts_20210324::base_internal::LowLevelAlloc::Free(void*)'
+ ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::PerThreadSem::Post(absl::lts_20210324::base_internal::ThreadIdentity*)':
+ /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h:107: undefined reference to `AbslInternalPerThreadSemPost_lts_20210324'
+ ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::PerThreadSem::Wait(absl::lts_20210324::synchronization_internal::KernelTimeout)':
+ /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h:112: undefined reference to `AbslInternalPerThreadSemWait_lts_20210324'
+ ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::GetOrCreateCurrentThreadIdentity()':
+ /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h:51: undefined reference to `absl::lts_20210324::synchronization_internal::CreateThreadIdentity()'
+ ld: /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h:51: undefined reference to `absl::lts_20210324::synchronization_internal::CreateThreadIdentity()'
+
+ = help: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
+ = note: use the `-l` flag to specify native libraries to link
+ = note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorustc-link-libkindname)
- make[3]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/cpu_iphone.cc:19:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:398:2: error: #error "Could not auto-detect platform"
- 398 | #error "Could not auto-detect platform"
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:421:2: warning: #warning "GPR_PLATFORM_STRING not auto-detected" [-Wcpp]
- 421 | #warning "GPR_PLATFORM_STRING not auto-detected"
- | ^~~~~~~
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/cpu_iphone.cc:19:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:488:2: error: #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- 488 | #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:492:2: error: #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- 492 | #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:498:2: error: #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- 498 | #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:504:2: error: #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- 504 | #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- | ^~~~~
- --- CMakeFiles/gpr.dir/src/core/lib/gpr/cpu_iphone.cc.o ---
- *** [CMakeFiles/gpr.dir/src/core/lib/gpr/cpu_iphone.cc.o] Error code 1
-
- make[3]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- [ 24%] Building CXX object CMakeFiles/gpr.dir/src/core/lib/gpr/cpu_linux.cc.o
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/atm.cc:19:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:398:2: error: #error "Could not auto-detect platform"
- 398 | #error "Could not auto-detect platform"
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:421:2: warning: #warning "GPR_PLATFORM_STRING not auto-detected" [-Wcpp]
- 421 | #warning "GPR_PLATFORM_STRING not auto-detected"
- | ^~~~~~~
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/atm.cc:19:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:488:2: error: #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- 488 | #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:492:2: error: #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- 492 | #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:498:2: error: #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- 498 | #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:504:2: error: #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- 504 | #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- | ^~~~~
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/atm.h:24,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/atm.cc:21:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/atm.h:79:2: error: #error could not determine platform for atm
- 79 | #error could not determine platform for atm
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/atm.h:88:1: error: 'gpr_atm' does not name a type
- 88 | gpr_atm gpr_atm_no_barrier_clamped_add(gpr_atm* value, gpr_atm delta,
- | ^~~~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/atm.cc:25:1: error: 'gpr_atm' does not name a type
- 25 | gpr_atm gpr_atm_no_barrier_clamped_add(gpr_atm* value, gpr_atm delta,
- | ^~~~~~~
- --- CMakeFiles/gpr.dir/src/core/lib/gpr/atm.cc.o ---
- *** [CMakeFiles/gpr.dir/src/core/lib/gpr/atm.cc.o] Error code 1
-
- make[3]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/cpu_linux.cc:23:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:398:2: error: #error "Could not auto-detect platform"
- 398 | #error "Could not auto-detect platform"
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:421:2: warning: #warning "GPR_PLATFORM_STRING not auto-detected" [-Wcpp]
- 421 | #warning "GPR_PLATFORM_STRING not auto-detected"
- | ^~~~~~~
- In file included from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/support/port_platform.h:22,
- from /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/gpr/cpu_linux.cc:23:
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:488:2: error: #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- 488 | #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:492:2: error: #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- 492 | #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:498:2: error: #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- 498 | #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
- | ^~~~~
- /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h:504:2: error: #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- 504 | #error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS, GPR_STDCPP_TLS, GPR_CUSTOM_TLS
- | ^~~~~
- --- CMakeFiles/gpr.dir/src/core/lib/gpr/cpu_linux.cc.o ---
- *** [CMakeFiles/gpr.dir/src/core/lib/gpr/cpu_linux.cc.o] Error code 1
-
- make[3]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- 4 errors
-
- make[3]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- --- CMakeFiles/gpr.dir/all ---
- *** [CMakeFiles/gpr.dir/all] Error code 2
-
- make[2]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- --- third_party/abseil-cpp/absl/status/CMakeFiles/absl_statusor.dir/all ---
- *** [third_party/abseil-cpp/absl/status/CMakeFiles/absl_statusor.dir/all] Error code 6
-
- make[2]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- 2 errors
-
- make[2]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- --- CMakeFiles/grpc.dir/rule ---
- *** [CMakeFiles/grpc.dir/rule] Error code 2
-
- make[1]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- 1 error
-
- make[1]: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
- *** [grpc] Error code 2
-
- make: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
-
- make: stopped in /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/build/grpcio-sys-da3498ed341bdd75/out/build
-
- --- stderr
- CMake Warning at cmake/protobuf.cmake:51 (message):
- gRPC_PROTOBUF_PROVIDER is "module" but PROTOBUF_ROOT_DIR is wrong
- Call Stack (most recent call first):
- CMakeLists.txt:255 (include)
-
-
- CMake Warning:
- Manually-specified variables were not used by the project:
-
- CMAKE_ASM_COMPILER
- CMAKE_ASM_FLAGS
-
-
- 1 error
- thread 'main' panicked at '
- command did not execute successfully, got: exit status: 2
-
- build script failed, must exit now', /scratch/wip/syncstorage-rs/work/vendor/cmake-0.1.45/src/lib.rs:894:5
- note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-warning: build failed, waiting for other jobs to finish...
error: build failed
*** Error code 101
-
-S
diff --git a/syncstorage-rs/distinfo b/syncstorage-rs/distinfo
index 9f3bd6d175..06993c10a9 100644
--- a/syncstorage-rs/distinfo
+++ b/syncstorage-rs/distinfo
@@ -1109,3 +1109,9 @@ SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f23
Size (yaml-rust-0.4.5.crate) = 47783 bytes
SHA1 (patch-.._vendor_boringssl-src-0.3.0+688fc5c_boringssl_src_include_openssl_thread.h) = 743c169f65c6911f23fe9b936e3978c0b82e6243
SHA1 (patch-Cargo.toml) = ca403bb992ab1fa499268c089e19a0709676dd6e
+SHA1 (patch-aa) = 4fc1bf16f1b604aa754fea099c640d418a278bd1
+SHA1 (patch-ab) = 20b8f4ffd4c36a8cad24b9f1c28672027f8db943
+SHA1 (patch-ac) = 1f04dc44972a4f9d4aaff719341d91843ef379d1
+SHA1 (patch-ad) = c55d065053adeb8a716e2e4db91bcc4c393e1269
+SHA1 (patch-ba) = a00e0ed12537b39dea5a0aa059e0627761dc8974
+SHA1 (patch-bb) = d29e8f357ae17ee0ee1aa715ba2de663cf4ccfcb
diff --git a/syncstorage-rs/patches/patch-aa b/syncstorage-rs/patches/patch-aa
new file mode 100644
index 0000000000..2c9a4bb6cb
--- /dev/null
+++ b/syncstorage-rs/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/event_engine/port.h.orig 1970-01-01 00:00:00.000000000 +0000
++++ ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/event_engine/port.h
+@@ -22,7 +22,7 @@
+ #elif defined(GPR_ANDROID) || defined(GPR_LINUX) || defined(GPR_APPLE) || \
+ defined(GPR_FREEBSD) || defined(GPR_OPENBSD) || defined(GPR_SOLARIS) || \
+ defined(GPR_AIX) || defined(GPR_NACL) || defined(GPR_FUCHSIA) || \
+- defined(GRPC_POSIX_SOCKET)
++ defined(GRPC_POSIX_SOCKET) || defined(GPR_NETBSD)
+ #define GRPC_EVENT_ENGINE_POSIX
+ #include <netdb.h>
+ #include <netinet/in.h>
diff --git a/syncstorage-rs/patches/patch-ab b/syncstorage-rs/patches/patch-ab
new file mode 100644
index 0000000000..c20117c568
--- /dev/null
+++ b/syncstorage-rs/patches/patch-ab
@@ -0,0 +1,35 @@
+$NetBSD$
+
+--- ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h.orig 1970-01-01 00:00:00.000000000 +0000
++++ ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/include/grpc/impl/codegen/port_platform.h
+@@ -340,6 +340,30 @@
+ #else /* _LP64 */
+ #define GPR_ARCH_32 1
+ #endif /* _LP64 */
++#elif defined(__NetBSD__)
++#define GPR_PLATFORM_STRING "netbsd"
++#ifndef _BSD_SOURCE
++#define _BSD_SOURCE
++#endif
++#define GPR_NETBSD 1
++#define GPR_CPU_POSIX 1
++#define GPR_GCC_ATOMIC 1
++#define GPR_GCC_TLS 1
++#define GPR_POSIX_LOG 1
++#define GPR_POSIX_ENV 1
++#define GPR_POSIX_TMPFILE 1
++#define GPR_POSIX_STAT 1
++#define GPR_POSIX_STRING 1
++#define GPR_POSIX_SUBPROCESS 1
++#define GPR_POSIX_SYNC 1
++#define GPR_POSIX_TIME 1
++#define GPR_GETPID_IN_UNISTD_H 1
++#define GPR_SUPPORT_CHANNELS_FROM_FD 1
++#ifdef _LP64
++#define GPR_ARCH_64 1
++#else /* _LP64 */
++#define GPR_ARCH_32 1
++#endif /* _LP64 */
+ #elif defined(__native_client__)
+ #define GPR_PLATFORM_STRING "nacl"
+ #ifndef _BSD_SOURCE
diff --git a/syncstorage-rs/patches/patch-ac b/syncstorage-rs/patches/patch-ac
new file mode 100644
index 0000000000..9b90882f00
--- /dev/null
+++ b/syncstorage-rs/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc.orig 1970-01-01 00:00:00.000000000 +0000
++++ ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+@@ -23,6 +23,11 @@
+ #include <ares.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef __sun
++#include <sys/filio.h>
++#include <unistd.h>
++#include <stropts.h>
++#endif
+
+ #include "absl/strings/str_cat.h"
+
diff --git a/syncstorage-rs/patches/patch-ad b/syncstorage-rs/patches/patch-ad
new file mode 100644
index 0000000000..114636f3d4
--- /dev/null
+++ b/syncstorage-rs/patches/patch-ad
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/iomgr/port.h.orig 1970-01-01 00:00:00.000000000 +0000
++++ ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/src/core/lib/iomgr/port.h
+@@ -162,6 +162,24 @@
+ #define GRPC_POSIX_SOCKET 1
+ #define GRPC_POSIX_SOCKETUTILS 1
+ #define GRPC_POSIX_WAKEUP_FD 1
++#elif defined(GPR_NETBSD)
++#define GRPC_HAVE_ARPA_NAMESER 1
++#define GRPC_HAVE_IFADDRS 1
++#define GRPC_HAVE_IPV6_RECVPKTINFO 1
++#define GRPC_HAVE_SO_NOSIGPIPE 1
++#define GRPC_HAVE_UNIX_SOCKET 1
++#define GRPC_POSIX_FORK 1
++#define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
++#define GRPC_POSIX_SOCKET 1
++#define GRPC_POSIX_SOCKETUTILS 1
++#define GRPC_POSIX_WAKEUP_FD 1
++#elif defined(GPR_SUNOS)
++#define GRPC_HAVE_UNIX_SOCKET 1
++#define GRPC_POSIX_FORK 1
++#define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
++#define GRPC_POSIX_SOCKET 1
++#define GRPC_POSIX_SOCKETUTILS 1
++#define GRPC_POSIX_WAKEUP_FD 1
+ #elif defined(GPR_NACL)
+ #define GRPC_HAVE_ARPA_NAMESER 1
+ #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
diff --git a/syncstorage-rs/patches/patch-ba b/syncstorage-rs/patches/patch-ba
new file mode 100644
index 0000000000..2aca61af21
--- /dev/null
+++ b/syncstorage-rs/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig 1970-01-01 00:00:00.000000000 +0000
++++ ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
+@@ -350,7 +350,11 @@ void ElfMemImage::SymbolIterator::Update
+ const ElfW(Versym) *version_symbol = image->GetVersym(index_);
+ ABSL_RAW_CHECK(symbol && version_symbol, "");
+ const char *const symbol_name = image->GetDynstr(symbol->st_name);
++#if defined(__NetBSD__)
++ int version_index = version_symbol->vs_vers & VERSYM_VERSION;
++#else
+ const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION;
++#endif
+ const ElfW(Verdef) *version_definition = nullptr;
+ const char *version_name = "";
+ if (symbol->st_shndx == SHN_UNDEF) {
diff --git a/syncstorage-rs/patches/patch-bb b/syncstorage-rs/patches/patch-bb
new file mode 100644
index 0000000000..9dc024697a
--- /dev/null
+++ b/syncstorage-rs/patches/patch-bb
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc.orig 1970-01-01 00:00:00.000000000 +0000
++++ ../vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc
+@@ -86,8 +86,13 @@ const void *VDSOSupport::Init() {
+ ElfW(auxv_t) aux;
+ while (read(fd, &aux, sizeof(aux)) == sizeof(aux)) {
+ if (aux.a_type == AT_SYSINFO_EHDR) {
++#if defined(__NetBSD__)
++ vdso_base_.store(reinterpret_cast<void *>(aux.a_v),
++ std::memory_order_relaxed);
++#else
+ vdso_base_.store(reinterpret_cast<void *>(aux.a_un.a_val),
+ std::memory_order_relaxed);
++#endif
+ break;
+ }
+ }
Home |
Main Index |
Thread Index |
Old Index