Skip to content

Commit f679bf9

Browse files
committed
[setup] Fix config files for Resolute
1 parent 30f3131 commit f679bf9

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

setup/ubuntu/binary_distribution/install_prereqs.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ apt-get install ${maybe_yes} --no-install-recommends lsb-release
6666

6767
codename=$(lsb_release -sc)
6868

69-
if ! [[ "${codename}" =~ (jammy|noble) ]]; then
69+
if [[ "${codename}" =~ (resolute) ]]; then
70+
echo 'WARNING: This script is unsupported on Ubuntu 26.04 (Resolute)' >&2
71+
elif ! [[ "${codename}" =~ (jammy|noble) ]]; then
7072
echo 'ERROR: This script requires Ubuntu 22.04 (Jammy) or 24.04 (Noble)' >&2
7173
exit 2
7274
fi

setup/ubuntu/binary_distribution/packages-resolute.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ libblas-dev
33
libegl1
44
libeigen3-dev
55
libgfortran5
6-
libglib2.0-0
6+
libglib2.0-0t64
77
libglx0
88
libgomp1
99
liblapack3
1010
libopengl0
11-
libpython3.12
11+
libpython3.13
1212
libspdlog-dev
1313
libx11-6
1414
ocl-icd-libopencl1

tools/ubuntu-resolute.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build:clang --host_action_env=CXX=clang++-19
1313
build:clang --copt=-fno-assume-unique-vtables
1414
build:clang --host_copt=-fno-assume-unique-vtables
1515

16-
build --define=UBUNTU_VERSION=24.04
16+
build --define=UBUNTU_VERSION=26.04
1717

1818
# This flag tells our drake_cc.bzl rules which GCC version they should expect to
1919
# see, so that the rules can tweak our warning flags. Note that this is not

tools/workspace/mkdoc_internal/libclang_setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,17 @@ def add_library_paths(parameters=None):
4040
if os.path.exists(sdkroot):
4141
parameters += ["-isysroot", sdkroot]
4242
elif platform.system() == "Linux":
43-
# By default we expect Clang 15 to be installed, but on Ubuntu 24.04
44-
# we'll use Clang 19 for compatibility with GCC 14.
43+
# By default we expect Clang 15 to be installed, but on Ubuntu >= 24.04
44+
# we'll use Clang 19 for compatibility with GCC >= 14.
4545
version = 15
4646
try:
4747
completed_process = subprocess.run(
4848
["lsb_release", "-sr"], stdout=subprocess.PIPE, encoding="utf-8"
4949
)
5050
if completed_process.returncode == 0:
51-
if completed_process.stdout.strip() == "24.04":
51+
output = completed_process.stdout.strip()
52+
ubuntu_major = int(output.split(".")[0])
53+
if ubuntu_major >= 24:
5254
version = 19
5355
except Exception:
5456
pass

0 commit comments

Comments
 (0)