From c9243fd7ec550ffb681c41bd33387b5c2ae7c323 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 13 Jun 2023 14:50:57 -0400 Subject: [PATCH] jjb: set python install layout to deb The default install layout for user built python modules has changed in Debian 12 to add a 'local' dir to the prefix. Force the traditionnal system layout by exporting 'DEB_PYTHON_INSTALL_LAYOUT=deb'. Change-Id: I0d684be831a8deaf49dc486d6850dba3c8267be2 Signed-off-by: Michael Jeanson --- scripts/babeltrace/build.sh | 3 +++ scripts/lttng-tools/build.sh | 3 +++ scripts/lttng-ust/build.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index ae13afa..0c3e6e7 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -121,6 +121,9 @@ 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 243e647..b70a46a 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -136,6 +136,9 @@ 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-ust/build.sh b/scripts/lttng-ust/build.sh index 625b285..e39f290 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -114,6 +114,9 @@ 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 -- 2.34.1