Merge branch 'easyconfigs-it4i-anselm'

This commit is contained in:
Lukas Krupcik 2017-04-18 14:06:58 +02:00
commit e7d0e6ae8c
3 changed files with 2 additions and 29 deletions

View File

@ -5,7 +5,7 @@ homepage = 'http://java.com/'
description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
Java applications on desktops and servers."""
toolchain = {'name': 'dummy', 'version': 'dummy'}
toolchain = {'name': 'dummy', 'version': ''}
# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
(vp, vs) = version.split('_')

View File

@ -25,31 +25,4 @@ sanity_check_paths = {
}
moduleclass = 'system'
<<<<<<< HEAD
=======
# Build statistics
buildstats = [{
"easybuild-framework_version": "2.5.0",
"easybuild-easyblocks_version": "2.5.0",
"timestamp": 1453108029,
"build_time": 33.75,
"install_size": 210409,
"command_line": ['--buildpath=/easybuild/build', '--installpath=/apps', '--installpath-modules=/apps/modules', '--installpath-software=/apps', '--module-naming-scheme=IT4IModuleNamingScheme', '--modules-footer=/easybuild/templates/modules/jas02_footer.txt', '--repositorypath=/easybuild/file-repository', '--robot=/easybuild/easyconfigs-salomon/easybuild/easyconfigs:/easybuild/file-repository', '--robot-paths=/easybuild/easyconfigs-salomon/easybuild/easyconfigs:/easybuild/file-repository', '--sourcepath=/easybuild/sources', '--try-toolchain="[\'foss\', \'2015g\']"', 'libdrm-2.4.27-ictce-5.5.0.eb'],
"modules_tool": ('EnvironmentModulesC', '/usr/bin/modulecmd', '3.2.10'),
"core_count": 28,
"cpu_model": "Intel(R) Xeon(R) CPU E5-2695 v3 @ 2.30GHz",
"cpu_speed": 2299.973,
"cpu_vendor": "Intel",
"gcc_version": "Using built-in specs.; COLLECT_GCC=gcc; COLLECT_LTO_WRAPPER=/apps/all/GCC/4.9.3-binutils-2.25/libexec/gcc/x86_64-unknown-linux-gnu/4.9.3/lto-wrapper; Target: x86_64-unknown-linux-gnu; Configured with: ../configure --enable-languages=c,c++,fortran --enable-lto --enable-checking=release --disable-multilib --enable-shared=yes --enable-static=yes --enable-threads=posix --enable-gold=default --enable-plugins --enable-ld --with-plugin-ld=ld.gold --enable-bootstrap --prefix=/apps/all/GCC/4.9.3-binutils-2.25 --with-local-prefix=/apps/all/GCC/4.9.3-binutils-2.25; Thread model: posix; gcc version 4.9.3 (GCC) ; ",
"glibc_version": "2.12",
"hostname": "login3",
"os_name": "centos",
"os_type": "Linux",
"os_version": "6.6",
"platform_name": "x86_64-unknown-linux",
"python_version": "2.6.6 (r266:84292, Jan 22 2014, 09:42:36) ; [GCC 4.4.7 20120313 (Red Hat 4.4.7-4)]",
"system_gcc_path": "/apps/all/GCC/4.9.3-binutils-2.25/bin/gcc",
"system_python_path": "/usr/bin/python",
}]
>>>>>>> 722d100eeb14742609db5d4494b9f5a98c70e176

View File

@ -14,7 +14,7 @@ sources = ['singularity-%(version)s.tar.gz']
builddependencies = [('Autotools', '20150215')]
dependencies = [('Python', '3.5.2', '', True)]
dependencies = [('Python', '3.6.1', '', True)]
preconfigopts = './autogen.sh && '