From 4eae2f2a4eaf8a2a5bba8834cb6b79f115836b1f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 19 Feb 2018 17:54:20 +0100 Subject: [PATCH] Compiler/root - we do not have to apply the CMakeList patch for Oracle Instantclient if root version is >= 6.12 --- Compiler/root/build6 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Compiler/root/build6 b/Compiler/root/build6 index dc1cba1..6b022e9 100755 --- a/Compiler/root/build6 +++ b/Compiler/root/build6 @@ -31,7 +31,9 @@ Linux ) esac pbuild::patch_sources_Linux() { - patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/cmake_oracle12.patch" + if (( V_MAJOR == 6 && V_MINOR < 12)); then + patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/cmake_oracle12.patch" + fi } pbuild::configure() {