From 429cfe574d091ab5dbbfbdecd1daff7dd26064d2 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:53:47 +0000 Subject: [PATCH] Add required library for Configure to work on Ubuntu 22 onwards. (#3548) * Add library path for ubuntu 22 onwards for x64 * Tidy Ubuntu check logic * Linter fix * Linter fix --- build-farm/platform-specific-configurations/linux.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index 94d43424e..22e7ec49d 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -194,6 +194,15 @@ function downloadBootJDK() if [ "${ARCHITECTURE}" == "x64" ] then export PATH=/opt/rh/devtoolset-2/root/usr/bin:$PATH + ## Fix For Issue https://github.com/adoptium/temurin-build/issues/3547 + ## Add Missing Library Path For Ubuntu 22+ + if [ -e /etc/os-release ]; then + ID=$(grep "^ID=" /etc/os-release | awk -F'=' '{print $2}') + INT_VERSION_ID=$(grep "^VERSION_ID=" /etc/os-release | awk -F'"' '{print $2}' | awk -F'.' '{print $1}') + if [ "$ID" == "ubuntu" ] && [ "$INT_VERSION_ID" -ge "22" ]; then + export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:$LIBRARY_PATH + fi + fi fi if [ "${ARCHITECTURE}" == "s390x" ]