Skip to content

Fix Linux ARM64 legacy CMake resolution #35

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

Merged
tctco merged 2 commits into from
Jul 23, 2026
Merged

Fix Linux ARM64 legacy CMake resolution #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf68b0
Fix legacy ARM64 CMake tool resolution
tctco Jul 22, 2026
0439d0c
Preserve macOS hint paths across platforms
tctco Jul 22, 2026
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: 4 additions & 2 deletions docker/Dockerfile.core.legacy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ RUN perl -MIPC::Cmd -MTime::Piece -e 1 \
&& autoreconf --version

RUN python -m pip install --no-cache-dir --default-timeout=120 --retries=10 \
"cmake>=3.27,<4" \
"cmake==3.31.10" \
"conan>=2.0,<3" \
ninja \
pandas \
pytest
pytest \
&& cmake --version \
&& cmake -E capabilities >/dev/null

RUN groupadd --gid ${USER_GID} ${USERNAME} \
&& useradd --uid ${USER_UID} --gid ${USER_GID} -m ${USERNAME} -s /bin/bash \
Expand Down
10 changes: 10 additions & 0 deletions docker/conan/legacy-system-tools
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
include(default)

# Conan Center recipes request several CMake versions as transitive build
# requirements. Use the manylinux2014-compatible CMake already installed in
# the container instead of upstream binaries that require a newer glibc.
[replace_tool_requires]
cmake/*: cmake/3.31.10

[platform_tool_requires]
cmake/3.31.10
5 changes: 2 additions & 3 deletions localizer/lib/macos_security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import os
import shlex
import sys
from pathlib import Path


_SECURITY_MARKERS = (
Expand All @@ -27,8 +26,8 @@ def is_macos() -> bool:


def macos_security_hint(executable_path: str | os.PathLike[str]) -> str:
path = Path(executable_path).expanduser()
quoted_path = shlex.quote(os.fspath(path))
path = os.path.expanduser(os.fspath(executable_path))
quoted_path = shlex.quote(path)
return (
"macOS may have blocked DCCCcore because it was downloaded from the internet.\n"
"Open System Settings > Privacy & Security and allow DCCCcore, or run this "
Expand Down
2 changes: 2 additions & 0 deletions scripts/docker-build-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ BUILD_TYPE="${BUILD_TYPE:-Release}"
INSTALL_PREFIX="${INSTALL_PREFIX:-./install}"
CONAN_CPPSTD="${CONAN_CPPSTD:-gnu17}"
CONAN_BUILD_ARGS="${CONAN_BUILD_ARGS:---build=missing}"
CONAN_PROFILE="${CONAN_PROFILE:-/workspace/docker/conan/legacy-system-tools}"
# Split the simple, space-delimited Conan build policy string into argv items.
# This lets the legacy Linux path force known build tools such as b2 to be
# rebuilt inside the manylinux2014 container instead of downloading binaries
Expand All @@ -19,6 +20,7 @@ sudo chown -R "$(id -u):$(id -g)" build "${CONAN_HOME:-/home/dev/.conan2}"
conan profile detect --force
conan install . \
--output-folder=build \
--profile:all="${CONAN_PROFILE}" \
"${conan_build_args[@]}" \
-s build_type="${BUILD_TYPE}" \
-s compiler.cppstd="${CONAN_CPPSTD}" \
Expand Down
Loading