From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 19 Jun 2023 17:58:59 +0000 (-0400)
Subject: jjb: temporary fix for python layout on deb12
X-Git-Url: https://git.liburcu.org/?a=commitdiff_plain;h=05615fb2bf814a91967420d9745d920670b4e15c;p=lttng-ci.git

jjb: temporary fix for python layout on deb12

Revert the change to 'DEB_PYTHON_INSTALL_LAYOUT=deb' which also changes
'site-packages' to 'dist-packages' which is debian specific.

Instead, temporarily add the incorrect 'local/$LIBDIR' to the
lttng-tools PYTHONPATH while we work on a fix for the build system of
the affected projects.

Change-Id: I662295ae48973eff0864377f58c915edf9ded941
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 0c3e6e7..ae13afa 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -121,9 +121,6 @@ PREFIX="/build"
 LIBDIR="lib"
 LIBDIR_ARCH="$LIBDIR"
 
-# Force the normal Python install layout without 'local' on Debian / Ubuntu
-export DEB_PYTHON_INSTALL_LAYOUT="deb"
-
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
 if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then
diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index b70a46a..6467e11 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -136,9 +136,6 @@ PREFIX="/build"
 LIBDIR="lib"
 LIBDIR_ARCH="$LIBDIR"
 
-# Force the normal Python install layout without 'local' on Debian / Ubuntu
-export DEB_PYTHON_INSTALL_LAYOUT="deb"
-
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
 if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then
@@ -256,7 +253,9 @@ cygwin|cygwin64|msys32|msys64)
     fi
 
     P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
-    DEPS_PYTHON3="$WORKSPACE/deps/build/$LIBDIR/python$P3_VERSION/site-packages"
+
+    # Temporary fix for an issue on debian python >= 3.10, add the 'local' prefix
+    DEPS_PYTHON3="$WORKSPACE/deps/build/$LIBDIR/python$P3_VERSION/site-packages:$WORKSPACE/deps/build/local/$LIBDIR/python$P3_VERSION/dist-packages"
     if [ "$LIBDIR" != "$LIBDIR_ARCH" ]; then
         DEPS_PYTHON3="$DEPS_PYTHON3:$WORKSPACE/deps/build/$LIBDIR_ARCH/python$P3_VERSION/site-packages"
     fi
diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index e39f290..625b285 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -114,9 +114,6 @@ PREFIX="/build"
 LIBDIR="lib"
 LIBDIR_ARCH="$LIBDIR"
 
-# Force the normal Python install layout without 'local' on Debian / Ubuntu
-export DEB_PYTHON_INSTALL_LAYOUT="deb"
-
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
 if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then