From 2333f79e3af6966d919fbe9eb28b2fcd6a6fe7d6 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 6 Oct 2024 14:22:34 +0200 Subject: [PATCH] Coin: Fix env var for Oracle libraries and headers While on windows the instantclient sdk also provides the relevant (import) libs, on linux those libraries are only provided by instantclient-basiclite package. Therfore setting the Oracle_ROOT env var to the sdk dir will prevent the libraries to be found on linux. The FindOracle.cmake module is already adjusted to look for the libraries in ${Oracle_ROOT}, ${Oracle_ROOT}/lib and ${Oracle_ROOT}/sdk/lib so they should be found correctly even we don't append 'sdk' for Oracle_ROOT on windows for consistency. Task-number: QTBUG-128873 Change-Id: Icd211d5b503234de529c339581a4f42f0b5fc726 Reviewed-by: Axel Spoerl --- coin/provisioning/common/linux/install-oracle.sh | 2 +- coin/provisioning/common/windows/install-oracle.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/install-oracle.sh b/coin/provisioning/common/linux/install-oracle.sh index ad454a5c..28c50356 100755 --- a/coin/provisioning/common/linux/install-oracle.sh +++ b/coin/provisioning/common/linux/install-oracle.sh @@ -46,6 +46,6 @@ sudo unzip -o -q /tmp/${packageFile} -d ${installFolder} echo "Remove downloaded ${packageFile} ..." rm -rf /tmp/${packageFile} -SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/sdk/" +SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/" echo "Oracle Instant Client = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-oracle.ps1 b/coin/provisioning/common/windows/install-oracle.ps1 index 3f5494dc..7601735b 100644 --- a/coin/provisioning/common/windows/install-oracle.ps1 +++ b/coin/provisioning/common/windows/install-oracle.ps1 @@ -40,7 +40,7 @@ Extract-7Zip $package $installFolder Write-Host "Remove downloaded $package ..." Remove $package -Set-EnvironmentVariable "Oracle_ROOT" "$installFolder\${distdir}\sdk\" +Set-EnvironmentVariable "Oracle_ROOT" "$installFolder\${distdir}\" # Store version information to ~/versions.txt, which is used to print version information to provision log. Write-Output "Oracle Instant Client = $version" >> ~/versions.txt