From 32dde2a3e67e7c517fe2699b3f24781b4a48ae59 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 21 Mar 2023 16:55:34 -0400
Subject: [PATCH] fix: jjb: always set LIBDIR_ARCH

Change-Id: Ie3e6f4f84524bed315446c09525738f7b8dcd268
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 scripts/babeltrace/build.sh  | 3 +--
 scripts/liburcu/build.sh     | 3 +--
 scripts/lttng-tools/build.sh | 3 +--
 scripts/lttng-ust/build.sh   | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 5756c8e..8ab9261 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -106,6 +106,7 @@ SRCDIR="$WORKSPACE/src/babeltrace"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -113,8 +114,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 
diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 8c87543..6fe33b5 100755
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -98,6 +98,7 @@ SRCDIR="$WORKSPACE/src/liburcu"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -105,8 +106,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 
diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 1f64168..c67802a 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -115,6 +115,7 @@ SRCDIR="$WORKSPACE/src/lttng-tools"
 TAPDIR="$WORKSPACE/tap"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -122,8 +123,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 
diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 65c405c..44e0183 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -98,6 +98,7 @@ SRCDIR="$WORKSPACE/src/lttng-ust"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -105,8 +106,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 
-- 
2.34.1