From b1b37b4abb56a3f59bb191d47b4e0d7a793dfef2 Mon Sep 17 00:00:00 2001
From: Antonio Iuliano <antonio.iuliano@na.infn.it>
Date: Tue, 5 May 2026 14:06:48 +0200
Subject: [PATCH 1/2] feat: upgrade recipes for ubuntu26 compatibility

---
 CHANGELOG.md |  5 +++++
 xrootd.sh    | 12 +++++++++---
 yaml-cpp.sh  |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc93ea014..7f1617882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/xrootd.sh b/xrootd.sh
index f180eeacb..85bc2737d 100644
--- a/xrootd.sh
+++ b/xrootd.sh
@@ -93,9 +93,15 @@ 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
+     echo -ne ">>>>>>   Found XRootD python bindings: "
+     LD_LIBRARY_PATH="$INSTALLROOT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" PYTHONPATH="$INSTALLROOT/lib/python/dist-packages${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
+     echo
+    else
+     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
+    fi
 
 fi  # end of PYTHON part
 
diff --git a/yaml-cpp.sh b/yaml-cpp.sh
index 0b290a63b..512763d17 100644
--- a/yaml-cpp.sh
+++ b/yaml-cpp.sh
@@ -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

From dd99ef5b4744729efd4c51314b2f82dbe674f09c Mon Sep 17 00:00:00 2001
From: Antonio Iuliano <antonio.iuliano@na.infn.it>
Date: Tue, 5 May 2026 15:00:40 +0200
Subject: [PATCH 2/2] fix: update also folder name in prepend-path

---
 xrootd.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/xrootd.sh b/xrootd.sh
index 85bc2737d..4861c780e 100644
--- a/xrootd.sh
+++ b/xrootd.sh
@@ -94,14 +94,13 @@ if [[ "$XROOTD_PYTHON" == "True" ]]; then
     # Print found XRootD python bindings
     # just run the the command as this is under "bash -e"
     if [ -d "$INSTALLROOT/lib/python/dist-packages" ]; then
-     echo -ne ">>>>>>   Found XRootD python bindings: "
-     LD_LIBRARY_PATH="$INSTALLROOT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" PYTHONPATH="$INSTALLROOT/lib/python/dist-packages${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
-     echo
+     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/site-packages${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
+     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
 
 fi  # end of PYTHON part
 
@@ -114,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