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

Merge branch '222-root-new-version-with-fftw' into 'master'

Browse Source 
Resolve "root new version with FFTW"

Closes #222

See merge request Pmodules/buildblocks!316
This commit is contained in:
gsell
2023-01-27 15:07:48 +00:00
parent 41ff8e1c5c 8d32c7db62
commit f551579c5d
3 changed files with 87 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Compiler/root/build
View File

@@ -35,6 +35,11 @@ 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::add_configure_args "-Dbuiltin_fftw3=ON"
pbuild::add_configure_args "-Dxrootd=OFF"
pbuild::add_configure_args "-DCMAKE_CXX_STANDARD=17"
pbuild::add_configure_args "-DCXX_STANDARD_STRING=17"
}
pbuild::compile() {
@@ -50,5 +55,6 @@ pbuild::post_install_Linux() {
install -m 0644 "${INSTANTCLIENT_LIBRARY_DIR}"/* "${PREFIX}"/lib
install -m 0644 "${INSTANTCLIENT_INCLUDE_DIR}"/* "${PREFIX}"/include
fi
install -m 0644 "${GSL_LIBRARY_DIR}"/lib*.so.* "${PREFIX}"/lib
}

42
Compiler/root/files/variants
View File

@@ -1,13 +1,29 @@
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
root/5.34.19 deprecated gcc/4.7.4
root/5.34.19 deprecated gcc/4.8.3
root/5.34.19 deprecated gcc/4.8.4
root/5.34.19 deprecated gcc/4.9.2
root/5.34.26 deprecated gcc/4.7.4
root/5.34.26 deprecated gcc/4.8.3
root/5.34.26 deprecated gcc/4.8.4
root/5.34.26 deprecated gcc/4.9.2
root/5.34.34 deprecated gcc/4.8.3
root/5.34.36 deprecated gcc/4.8.5
root/5.34.36 deprecated gcc/4.9.4
root/6.04.10 deprecated gcc/4.9.2
root/6.04.10 deprecated gcc/5.2.0
root/6.08.00 deprecated gcc/4.8.5
root/6.08.00 deprecated gcc/4.9.4
root/6.08.00 deprecated gcc/5.4.0
root/6.08.00 deprecated gcc/6.2.0
root/6.08.02 deprecated gcc/4.8.5
root/6.08.02 deprecated gcc/4.9.4
root/6.08.02 deprecated gcc/5.4.0
root/6.08.02 deprecated gcc/6.2.0
root/6.12.06 deprecated gcc/7.3.0
root/6.24.06 stable gcc/10.3.0
root/6.26.02 deprecated gcc/10.3.0
root/6.26.02-1 stable gcc/8.5.0
root/6.26.02-1 stable gcc/10.3.0
root/6.26.04 stable gcc/10.3.0
root/6.26.04 stable gcc/11.3.0
root/6.26.04 stable gcc/12.1.0

52
Compiler/root/files/variants.yaml Normal file
View File

@@ -0,0 +1,52 @@
overlay: base
root/5.34.19:
- with: gcc/{4.7.4,4.8.3,4.8.4,4.9.2}
relstage: deprecated
root/5.34.26:
- with: gcc/{4.7.4,4.8.3,4.8.4,4.9.2}
relstage: deprecated
root/5.34.34:
- with: gcc/4.8.3
relstage: deprecated
root/5.34.36:
- with: gcc/{4.8.5,4.9.4}
relstage: deprecated
root/6.04.10:
- with: gcc/{4.9.2,5.2.0}
dependencies: b:psi-python27/2.3.0
relstage: deprecated
root/6.08.00:
- with: gcc/{4.8.5,4.9.4,5.4.0,6.2.0}
dependencies: b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
relstage: deprecated
root/6.08.02:
- with: gcc/{4.8.5,4.9.4,5.4.0,6.2.0}
dependencies: b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
relstage: deprecated
root/6.12.06:
- with: gcc/7.3.0
dependencies: b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
relstage: deprecated
root/6.24.06:
- with: gcc/10.3.0
dependencies: b:Python/3.8.12 b:gsl/2.7 b:cmake/3.20.5 b:binutils/2.29
relstage: stable
root/6.26.02:
- with: gcc/10.3.0
dependencies: b:Python/3.8.12 b:gsl/2.7 b:cmake/3.20.5 b:binutils/2.29 b:tiff/4.3.0
relstage: deprecated
root/6.26.02-1:
- with: gcc/{8.5.0,9.5.0,10.3.0,11.3.0,12.1.0}
dependencies: b:Python/3.8.12 b:gsl/2.7 b:cmake/3.20.5 b:binutils/2.29 b:tiff/4.3.0
relstage: stable
root/6.26.04:
- with: gcc/{8.5.0,9.5.0,10.3.0,11.3.0,12.1.0}
dependencies: b:Python/3.8.12 b:gsl/2.7 b:cmake/3.20.5 b:binutils/2.29 b:tiff/4.3.0
relstage: unstable