From a1a7231e3a8b3d76ff5f3ce6542834c0ca6dc33a Mon Sep 17 00:00:00 2001 From: dpalermo Date: Mon, 10 Aug 2026 20:26:33 -0500 Subject: [PATCH 1/2] [UMT] Use release tag for CONDUIT (#2415) - avoids error needing newer cmake 3.26 --- bin/run_umt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run_umt.sh b/bin/run_umt.sh index a1c6fbbdc..2b78fd477 100755 --- a/bin/run_umt.sh +++ b/bin/run_umt.sh @@ -104,7 +104,7 @@ if [ "$1" == "build_umt" ]; then popd pushd $AOMP_REPOS_TEST/$CONDUIT_SRC_DIR - git clone https://github.com/LLNL/conduit.git . + git clone --branch v0.9.6 https://github.com/LLNL/conduit.git . rm -rf build mkdir build pushd build From 7d63e274fa0f05eb90c043a84846a9b0837195f5 Mon Sep 17 00:00:00 2001 From: dpalermo Date: Wed, 12 Aug 2026 10:24:08 -0500 Subject: [PATCH 2/2] [srock] Add pip meson workaround for the libdrm build failure (#2422) - Fixes the libdrm failure due to duplicate -Wl,--version-script Co-authored-by: Larry Meadows --- srock-bin/srock_common_vars | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/srock-bin/srock_common_vars b/srock-bin/srock_common_vars index 49826dae5..c55b400c5 100644 --- a/srock-bin/srock_common_vars +++ b/srock-bin/srock_common_vars @@ -44,6 +44,16 @@ function srock_venv_activate() { fi echo "pip install -r requirements.txt" pip install -r requirements.txt + # WORKAROUND: meson 1.12.0 has a regression in + # mesonbuild/compilers/mixins/clike.py where CLikeCompiler's + # _sanity_check_compile_args() double-applies LDFLAGS-derived link + # args. TheRock's libdrm build passes a -Wl,--version-script= via + # LDFLAGS, so the duplicate causes `ld: duplicate version tag` and + # meson reports "Compiler cc cannot compile programs." Pin below + # requirements.txt's floor until upstream releases a fix. + echo "pip install 'meson>=1.7.0,<1.12.0' # workaround for meson 1.12.0 LDFLAGS dup bug" + pip install 'meson>=1.7.0,<1.12.0' + export PATH=$SROCK_THEROCK_DIR/$SROCK_VENV/bin:$PATH }