Skip to content

Commit 22c4342

Browse files
authored
Merge pull request #18 from rerun-io/andreas/pin-sysroot
Pin sysroot to glibc 2.17+
2 parents 8fa9de4 + 3c99b96 commit 22c4342

File tree

3 files changed

+37
-23
lines changed

3 files changed

+37
-23
lines changed

.github/workflows/cpp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v4
1212

13-
- uses: prefix-dev/setup-pixi@v0.5.2
13+
- uses: prefix-dev/setup-pixi@v0.8.1
1414
with:
15-
pixi-version: v0.19.0
15+
pixi-version: v0.26.1
1616
cache: true
1717

1818
- run: pixi run cpp-fmt-check

pixi.lock

Lines changed: 19 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ cwd = "humble_ws"
8585
cmd = "curl -L -C - -O https://storage.googleapis.com/rerun-example-datasets/go2_ros2.zip && unzip go2_ros2.zip"
8686
cwd = "humble_ws/install/rerun_bridge/share/rerun_bridge"
8787
outputs = ["humble_ws/install/rerun_bridge/share/rerun_bridge/go2_ros2"]
88-
depends_on=["build"]
88+
depends_on = ["build"]
8989

9090
# Get the go2_ros2_sdk package
9191
#
@@ -100,7 +100,14 @@ depends_on = ["ws"]
100100

101101
[tasks.go2_example]
102102
cmd = "bash -c 'source ./install/local_setup.bash && ros2 launch rerun_bridge go2_example.launch'"
103-
depends_on = ["build", "go2_example_data", "go2_ros2_sdk", "rosbag2_storage_mcap", "rerun_viewer", "rerun_urdf_loader"]
103+
depends_on = [
104+
"build",
105+
"go2_example_data",
106+
"go2_ros2_sdk",
107+
"rosbag2_storage_mcap",
108+
"rerun_viewer",
109+
"rerun_urdf_loader",
110+
]
104111
cwd = "humble_ws"
105112

106113
# Install Rerun and URDF loader manually via pip3, this should be replaced with direct pypi dependencies in the future.
@@ -111,7 +118,7 @@ cmd = "pip install rerun-sdk==0.18.2"
111118
cmd = "pip install git+https://github.com/rerun-io/rerun-loader-python-example-urdf.git"
112119

113120
[dependencies]
114-
pip = ">=24.0,<25" # To install rerun-sdk and rerun-loader-python-example-urdf
121+
pip = ">=24.0,<25" # To install rerun-sdk and rerun-loader-python-example-urdf
115122

116123
# C++ build-tools:
117124
cmake = "3.27.6"
@@ -133,3 +140,9 @@ opencv = ">=4.9.0,<4.10"
133140

134141
# Additional dependencies for mcap support
135142
ros-humble-rosbag2-test-common = ">=0.15.9,<0.16"
143+
144+
[target.linux-64.dependencies]
145+
sysroot_linux-64 = ">=2.17,<3" # rustc 1.64+ requires glibc 2.17+, see https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html
146+
147+
[target.linux-aarch64.dependencies]
148+
sysroot_linux-aarch64 = ">=2.17,<3" # rustc 1.64+ requires glibc 2.17+, see https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html

0 commit comments

Comments
 (0)