summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Amadio <amadio@gentoo.org>2017-12-18 13:46:13 +0100
committerGuilherme Amadio <amadio@gentoo.org>2017-12-18 14:12:00 +0100
commit6f906b12aa6fb6d0956f48566ed5158ea7bcc36e (patch)
tree0df058cfa138a272b7dff91fd604e72976ac668b /sci-physics
parentsci-physics/root: disable unused OCaml bindings (diff)
downloadgentoo-6f906b12aa6fb6d0956f48566ed5158ea7bcc36e.tar.gz
gentoo-6f906b12aa6fb6d0956f48566ed5158ea7bcc36e.tar.bz2
gentoo-6f906b12aa6fb6d0956f48566ed5158ea7bcc36e.zip
sci-physics/root: fix build with USE=oracle
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/root/files/root-6.12.04-find-oracle-12.patch34
-rw-r--r--sci-physics/root/root-6.12.04.ebuild10
2 files changed, 36 insertions, 8 deletions
diff --git a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
new file mode 100644
index 00000000000..242e76d0987
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
@@ -0,0 +1,34 @@
+From 7aa8aacad80c75b40bb25bdeccc7cacce9a270ca Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 13:32:06 +0100
+Subject: [PATCH] Fix FindOracle.cmake to find version 12.x
+
+---
+ cmake/modules/FindOracle.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
+index 24031664a6..b7c8cfbb99 100644
+--- a/cmake/modules/FindOracle.cmake
++++ b/cmake/modules/FindOracle.cmake
+@@ -12,7 +12,7 @@ set(ORACLE_FOUND 0)
+ if(ORACLE_INCLUDE_DIR AND ORACLE_LIBRARY_OCCI)
+ set(ORACLE_FIND_QUIETLY 1)
+ endif()
+-set(ORACLE_HOME $ENV{ORACLE_DIR})
++set(ORACLE_HOME $ENV{ORACLE_HOME})
+
+ IF (ORACLE_PATH_INCLUDES)
+ SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES})
+@@ -55,7 +55,7 @@ FIND_LIBRARY(
+ )
+ FIND_LIBRARY(
+ ORACLE_LIBRARY_LNNZ
+- NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32
++ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
+ PATHS ${ORACLE_LIB_LOCATION}
+ )
+
+--
+2.15.1
+
diff --git a/sci-physics/root/root-6.12.04.ebuild b/sci-physics/root/root-6.12.04.ebuild
index 7f21bace306..f428493ad11 100644
--- a/sci-physics/root/root-6.12.04.ebuild
+++ b/sci-physics/root/root-6.12.04.ebuild
@@ -129,7 +129,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch \
- "${FILESDIR}"/${PN}-6.11.02-no-ocaml.patch \
+ "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch \
+ "${FILESDIR}"/${PN}-6.12.04-find-oracle-12.patch \
"${FILESDIR}"/${PN}-6.12.04-z3.patch
# make sure we use system libs and headers
@@ -254,13 +255,6 @@ src_configure() {
${EXTRA_ECONF}
)
- if use oracle ; then
- mycmakeargs+=(
- -DORACLE_PATH_INCLUDES="${ORACLE_HOME}/include"
- -DORACLE_PATH_LIB="${ORACLE_HOME}/$(get_libdir)"
- )
- fi
-
cmake-utils_src_configure
}