From b161db7b8276acb00cd623ceabec270dac84ab5d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 24 Apr 2017 07:58:13 +0200 Subject: [PATCH] Compiler/root - fix issue with Oracle Instant Client 12 --- Compiler/root/6/cmake_oracle12.patch | 12 ++++++++++++ Compiler/root/build6 | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 Compiler/root/6/cmake_oracle12.patch diff --git a/Compiler/root/6/cmake_oracle12.patch b/Compiler/root/6/cmake_oracle12.patch new file mode 100644 index 0000000..021e1ad --- /dev/null +++ b/Compiler/root/6/cmake_oracle12.patch @@ -0,0 +1,12 @@ +diff -ur root-6.08.02.orig/cmake/modules/FindOracle.cmake root-6.08.02/cmake/modules/FindOracle.cmake +--- root-6.08.02.orig/cmake/modules/FindOracle.cmake 2016-12-03 00:07:29.000000000 +0100 ++++ root-6.08.02/cmake/modules/FindOracle.cmake 2017-03-30 15:40:50.682127137 +0200 +@@ -55,7 +55,7 @@ + ) + FIND_LIBRARY( + ORACLE_LIBRARY_LNNZ +- NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 ++ NAMES libnnz10 nnz10 libnnz11 nnz11 nnz12 ociw32 + PATHS ${ORACLE_LIB_LOCATION} + ) + diff --git a/Compiler/root/build6 b/Compiler/root/build6 index e4f503a..74abbf4 100755 --- a/Compiler/root/build6 +++ b/Compiler/root/build6 @@ -28,6 +28,10 @@ Linux ) ;; esac +pbuild::patch_sources_Linux() { + patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/cmake_oracle12.patch" +} + pbuild::configure() { cmake "${MODULE_SRCDIR}" \ ${config_args} \