Skip to content

Downrev urcu to match that of 1.3 #283

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Downrev urcu to match that of 1.3 #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions 3rd_party/userspace-rcu/conandata.yml
View file
Open in desktop

This file was deleted.

86 changes: 0 additions & 86 deletions 3rd_party/userspace-rcu/conanfile.py
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class SISLConan(ConanFile):
name = "sisl"
version = "13.0.4"
version = "13.0.5"

homepage = "https://github.com/eBay/sisl"
description = "Library for fast data structures, utilities"
Expand Down Expand Up @@ -93,7 +93,7 @@ def requirements(self):
self.requires("folly/nu2.2023.12.18.00", transitive_headers=True)
self.requires("prometheus-cpp/1.1.0", transitive_headers=True)
self.requires("snappy/[^1.2]", transitive_headers=True)
self.requires("userspace-rcu/nu2.0.14.0", transitive_headers=True)
self.requires("userspace-rcu/0.11.4", transitive_headers=True)

if self.options.grpc:
self.requires("grpc/1.54.3", transitive_headers=True)
Expand Down Expand Up @@ -232,7 +232,7 @@ def package_info(self):
self.cpp_info.components["settings"].requires.extend([
"logging",
"flatbuffers::flatbuffers",
"userspace-rcu::userspace-rcu",
"userspace-rcu::urcu-memb",
])
self.cpp_info.components["metrics"].requires.extend([
"logging",
Expand All @@ -243,7 +243,7 @@ def package_info(self):
"metrics",
"folly::folly",
"snappy::snappy",
"userspace-rcu::userspace-rcu",
"userspace-rcu::urcu-memb",
])
self.cpp_info.components["cache"].requires.extend([
"buffer",
Expand Down
2 changes: 0 additions & 2 deletions prepare_v2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ set -eu
echo -n "Exporting custom recipes..."
echo -n "folly."
conan export 3rd_party/folly --name folly --version nu2.2023.12.18.00 >/dev/null
echo -n "userspace rcu."
conan export 3rd_party/userspace-rcu --name userspace-rcu --version nu2.0.14.0 >/dev/null
echo "done."
2 changes: 1 addition & 1 deletion src/metrics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target_link_libraries(sisl_metrics PUBLIC
sisl_logging
folly::folly
prometheus-cpp::prometheus-cpp
userspace-rcu::userspace-rcu
userspace-rcu::urcu-memb
)

include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
Expand Down
2 changes: 1 addition & 1 deletion src/settings/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ target_sources(sisl_settings PRIVATE
target_link_libraries(sisl_settings PUBLIC
sisl_logging
flatbuffers::flatbuffers
userspace-rcu::userspace-rcu
userspace-rcu::urcu-memb
)

add_executable(test_settings)
Expand Down