mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '188-root-build-module-with-new-version-6-24-06-and-review-release-stage' into 'master'

Browse Source 
Resolve "root: build module with new version 6.24.06 and review release stage"

Closes #188

See merge request Pmodules/buildblocks!259
This commit is contained in:
gsell
2021-11-18 17:53:39 +00:00
parent b98b189522 3a54d99d2b
commit e9ac5dc569
5 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Compiler/root/5/variants
View File

@@ -1,12 +0,0 @@
root/5.34.19 stable gcc/4.7.4
root/5.34.19 stable gcc/4.8.3
root/5.34.19 stable gcc/4.8.4
root/5.34.19 stable gcc/4.9.2
root/5.34.26 stable gcc/4.7.4
root/5.34.26 stable gcc/4.8.3
root/5.34.26 stable gcc/4.8.4
root/5.34.26 stable gcc/4.9.2
root/5.34.36 stable gcc/4.8.5
root/5.34.36 stable gcc/4.9.4
root/5.34.36 stable gcc/5.3.0
root/5.34.36 stable gcc/6.2.0

16
Compiler/root/6/variants
View File

@@ -1,16 +0,0 @@
root/6.04.10 deprecated gcc/4.9.2 b:psi-python27/2.3.0
root/6.04.10 deprecated gcc/5.2.0 b:psi-python27/2.3.0
root/6.08.00 stable gcc/4.8.5 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
root/6.08.00 stable gcc/4.9.4 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
root/6.08.00 stable gcc/5.4.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
root/6.08.00 stable gcc/6.2.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
root/6.08.02 stable gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
root/6.08.02 stable gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
root/6.08.02 stable gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
root/6.08.02 stable gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
root/6.12.06 unstable gcc/5.5.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
root/6.12.06 unstable gcc/6.4.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
root/6.12.06 unstable gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3

6
Compiler/root/build
View File

@@ -21,6 +21,7 @@ pbuild::pre_configure_Darwin() {
}
pbuild::pre_configure_Linux() {
pbuild::use_cmake
if pbuild::use_flag 'oracleclient'; then
INSTANTCLIENT_INCLUDE_DIR='/usr/lib/oracle/12.1/client64/include'
INSTANTCLIENT_LIBRARY_DIR='/usr/lib/oracle/12.1/client64/lib'
@@ -34,11 +35,6 @@ pbuild::pre_configure_Linux() {
pbuild::add_configure_args "-DORACLE_PATH_LIB=${INSTANTCLIENT_LIBRARY_DIR}"
pbuild::add_configure_args "-DORACLE_OCI_VERSION=10G_R2"
fi
}
pbuild::post_configure() {
sed -i.bak "s:${MODULE_SRCDIR//\/\///}/root.exe:${MODULE_BUILDDIR//\/\///}/bin/root.exe:" CMakeFiles/hsimple.dir/build.make
}
pbuild::compile() {

12
Compiler/root/files/cmake_oracle12.patch Normal file
View File

@@ -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}
)

13
Compiler/root/files/variants Normal file
View File

@@ -0,0 +1,13 @@
root/5.34.19 stable gcc/{4.7.4,4.8.3,4.8.4,4.9.2}
root/5.34.26 stable gcc/{4.7.4,4.8.3,4.8.4,4.9.2}
root/5.34.34 stable gcc/4.8.3
root/5.34.36 stable gcc/{4.8.5,4.9.4}
root/6.04.10 deprecated gcc/{4.9.2,5.2.0} b:psi-python27/2.3.0
root/6.08.00 stable gcc/{4.8.5,4.9.4,5.4.0,6.2.0} b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
root/6.08.02 stable gcc/{4.8.5,4.9.4,5.4.0,6.2.0} b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
root/6.12.06 stable gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
root/6.24.06 stable gcc/10.3.0 b:Python/3.8.12 b:gsl/2.7 b:cmake/3.20.5 b:binutils/2.29