Skip to content

merge aomp-dev into amd-staging #2425

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
ronlieb merged 3 commits into from
Aug 13, 2026
Merged

merge aomp-dev into amd-staging #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1a7231
[UMT] Use release tag for CONDUIT (#2415)
dpalermo Aug 11, 2026
7d63e27
[srock] Add pip meson workaround for the libdrm build failure (#2422)
dpalermo Aug 12, 2026
2311da6
merge aomp-dev into amd-staging
z1-cciauto Aug 13, 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
2 changes: 1 addition & 1 deletion bin/run_umt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions srock-bin/srock_common_vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading