Skip to content

Upgrade recipes for ubuntu26 compatibility #234

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

Open
antonioiuliano2 wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −5
Open

Upgrade recipes for ubuntu26 compatibility #234

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
b1b37b4
feat: upgrade recipes for ubuntu26 compatibility
antonioiuliano2 May 5, 2026
dd99ef5
fix: update also folder name in prepend-path
antonioiuliano2 May 5, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it

## Unreleased

### Changed

* yaml-cpp: Upgrade to 0.9.0 to fix issue with modern gcc https://github.com/jbeder/yaml-cpp/issues/1307
* xrootd: Add dist-packages as a possible location for python bindings

## [26.04](https://github.com/ShipSoft/shipdist/tree/26.04)

### Added
Expand Down
13 changes: 9 additions & 4 deletions xrootd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,14 @@ if [[ "$XROOTD_PYTHON" == "True" ]]; then

# Print found XRootD python bindings
# just run the the command as this is under "bash -e"
echo -ne ">>>>>> Found XRootD python bindings: "
LD_LIBRARY_PATH="$INSTALLROOT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" PYTHONPATH="$INSTALLROOT/lib/python/site-packages${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
echo
if [ -d "$INSTALLROOT/lib/python/dist-packages" ]; then
XROOTD_PYTHON_PKG_DIR="dist-packages"
else
XROOTD_PYTHON_PKG_DIR="site-packages"
fi
echo -ne ">>>>>> Found XRootD python bindings: "
LD_LIBRARY_PATH="$INSTALLROOT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" PYTHONPATH="$INSTALLROOT/lib/python/${XROOTD_PYTHON_PKG_DIR}${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
echo

fi # end of PYTHON part

Expand All @@ -108,7 +113,7 @@ alibuild-generate-module --bin --lib > "$MODULEFILE"

cat >> "$MODULEFILE" <<EoF
if { $XROOTD_PYTHON } {
prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
prepend-path PYTHONPATH \$PKG_ROOT/lib/python/${XROOTD_PYTHON_PKG_DIR}
module load ${PYTHON_REVISION:+Python/$PYTHON_VERSION-$PYTHON_REVISION}
}
EoF
2 changes: 1 addition & 1 deletion yaml-cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: yaml-cpp
version: "%(tag_basename)s"
tag: 0.8.0
tag: yaml-cpp-0.9.0
source: https://github.com/jbeder/yaml-cpp
build_requires:
- CMake
Expand Down
Loading