From f63b9b32771855a54dec00f745aa0bc3f07e6745 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Mar 2013 08:36:15 +0100 Subject: [PATCH 001/811] add GIMPS Signed-off-by: Fotis Georgatos --- .../easyconfigs/g/GIMPS/GIMPS-p95v277.eb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb new file mode 100644 index 0000000000..2d1405f493 --- /dev/null +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb @@ -0,0 +1,28 @@ +## +# This file is an EasyBuild recipy as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +easyblock = 'Tarball' + +name = 'GIMPS' +version = 'p95v277' + +homepage = 'http://www.mersenne.org/' +description = """GIMPS: Great Internet Mersenne Prime Search; it can be useful for limited stress testing of nodes, in user space""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['%s.linux64.tar.gz' % version] +source_urls = ['ftp://mersenne.org/%s/' % name.lower()] + +sanity_check_paths = { + 'files': ["mprime"], + 'dirs': [] + } + +moduleclass = 'tools' -- GitLab From 5bdd2b89ea5999b94bfb93cd3d51dc2dd4cca29f Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Mar 2013 08:42:15 +0100 Subject: [PATCH 002/811] promote version to p95v279 Signed-off-by: Fotis Georgatos --- .../easyconfigs/g/GIMPS/{GIMPS-p95v277.eb => GIMPS-p95v279.eb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename easybuild/easyconfigs/g/GIMPS/{GIMPS-p95v277.eb => GIMPS-p95v279.eb} (97%) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb similarity index 97% rename from easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb rename to easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb index 2d1405f493..bf58211a66 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v277.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb @@ -10,7 +10,7 @@ easyblock = 'Tarball' name = 'GIMPS' -version = 'p95v277' +version = 'p95v279' homepage = 'http://www.mersenne.org/' description = """GIMPS: Great Internet Mersenne Prime Search; it can be useful for limited stress testing of nodes, in user space""" -- GitLab From 49b2ce14768722e54c4a4a132554393d9470bab6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 21 Mar 2013 02:09:53 +0100 Subject: [PATCH 003/811] add buildable version of GIMPS Signed-off-by: Fotis Georgatos --- .../GIMPS-p95v279-goalf-1.1.0-no-OFED.eb | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb new file mode 100644 index 0000000000..1cf186c018 --- /dev/null +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb @@ -0,0 +1,30 @@ +## +# This file is an EasyBuild recipy as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +# easyblock = 'Tarball' + +name = 'GIMPS' +version = 'p95v279' + +homepage = 'http://www.mersenne.org/' +description = """GIMPS: Great Internet Mersenne Prime Search; + it can be useful for limited stress testing of nodes, in user space""" + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} + +# eg. http://www.mersenne.info/gimps/p95v279.source.zip +sources = ['%s.source.zip' % version] +source_urls = ['http://www.mersenne.info/%s' % name.lower()] + +sanity_check_paths = { + 'files': ["bin/mprime"], + 'dirs': [] + } + +moduleclass = 'tools' -- GitLab From 47fcfff3009e144ac240901ffa005d74b028f03c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 21 Mar 2013 02:14:57 +0100 Subject: [PATCH 004/811] retune GIMPS Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb index bf58211a66..d69adc3f5e 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb @@ -13,7 +13,8 @@ name = 'GIMPS' version = 'p95v279' homepage = 'http://www.mersenne.org/' -description = """GIMPS: Great Internet Mersenne Prime Search; it can be useful for limited stress testing of nodes, in user space""" +description = """GIMPS: Great Internet Mersenne Prime Search; + it can be useful for limited stress testing of nodes, in user space""" toolchain = {'name': 'dummy', 'version': 'dummy'} @@ -25,4 +26,6 @@ sanity_check_paths = { 'dirs': [] } +modextravars = {'PATH': ''} + moduleclass = 'tools' -- GitLab From 9a83db6fc1c307a235abf210127fa7c210d27024 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 1 Apr 2013 01:38:00 +0200 Subject: [PATCH 005/811] fix PATH and readjust files Signed-off-by: Fotis Georgatos --- .../g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb | 2 +- .../{GIMPS-p95v279.eb => GIMPS-p95v279.linux64.eb} | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) rename easybuild/easyconfigs/g/GIMPS/{GIMPS-p95v279.eb => GIMPS-p95v279.linux64.eb} (71%) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb index 1cf186c018..5289792c73 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb @@ -1,5 +1,5 @@ ## -# This file is an EasyBuild recipy as per https://github.com/hpcugent/easybuild +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # # Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine # Authors:: Fotis Georgatos diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb similarity index 71% rename from easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb rename to easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb index d69adc3f5e..f222a32981 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb @@ -1,5 +1,5 @@ ## -# This file is an EasyBuild recipy as per https://github.com/hpcugent/easybuild +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # # Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine # Authors:: Fotis Georgatos @@ -10,7 +10,7 @@ easyblock = 'Tarball' name = 'GIMPS' -version = 'p95v279' +version = 'p95v279.linux64' homepage = 'http://www.mersenne.org/' description = """GIMPS: Great Internet Mersenne Prime Search; @@ -18,14 +18,12 @@ description = """GIMPS: Great Internet Mersenne Prime Search; toolchain = {'name': 'dummy', 'version': 'dummy'} -sources = ['%s.linux64.tar.gz' % version] +sources = [('%s.tar.gz' % version, 'tar xzf %s;mkdir bin;mv mprime bin')] # this hack ensures PATH is proper source_urls = ['ftp://mersenne.org/%s/' % name.lower()] sanity_check_paths = { - 'files': ["mprime"], + 'files': ["bin/mprime"], 'dirs': [] } -modextravars = {'PATH': ''} - moduleclass = 'tools' -- GitLab From 15e0894257fb722f79e70de8f16787f0b2f9aff7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 26 Apr 2013 13:15:00 +0200 Subject: [PATCH 006/811] add QE-ictce-5.3.0 easyconfigs Signed-off-by: Fotis Georgatos --- .../QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb | 42 +++++++++++++++ .../QuantumESPRESSO-4.2-ictce-5.3.0.eb | 38 +++++++++++++ ...uantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb | 54 +++++++++++++++++++ .../QuantumESPRESSO-5.0.2-ictce-5.3.0.eb | 50 +++++++++++++++++ 4 files changed, 184 insertions(+) create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb new file mode 100644 index 0000000000..9252372604 --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb @@ -0,0 +1,42 @@ +name = 'QuantumESPRESSO' +version = '4.2' +versionsuffix = '-hybrid' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +sources = [ + 'espresso-%s.tar.gz' % version, + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', + ] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz + ] + +patches = [ + 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', + ] + +makeopts = 'all gipaw vdw w90 want gww xspectra yambo' + +# parallel build tends to fail +parallel = 1 + +# hybrid build (enable OpenMP) +hybrid = True + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..2c9da47c8d --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb @@ -0,0 +1,38 @@ +name = 'QuantumESPRESSO' +version = '4.2' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +sources = [ + 'espresso-%s.tar.gz' % version, + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', + ] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz + ] + +patches = [ + 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', + ] + +makeopts = 'all gipaw vdw w90 want gww xspectra yambo' + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb new file mode 100644 index 0000000000..2acbc21f76 --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb @@ -0,0 +1,54 @@ +name = 'QuantumESPRESSO' +version = '5.0.2' +versionsuffix = '-hybrid' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +# major part of this list was determined from espresso-5.0.2/install/plugins_list +sources = [ + 'espresso-%s.tar.gz' % version, + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', + ] +missing_sources = [ + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found + ] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others + ] + +patches = [ + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-5.0.2_yambo-fftw.patch', + ] + +# parallel build tends to fail +parallel = 1 + +# gipaw excluded, because v5.0 isn't stable +# xspectra v5.0.2 is nowhere to be found +makeopts = 'all w90 want yambo plumed' + +# hybrid build (enable OpenMP) +hybrid = True + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..854d3543cf --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb @@ -0,0 +1,50 @@ +name = 'QuantumESPRESSO' +version = '5.0.2' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +# major part of this list was determined from espresso-5.0.2/install/plugins_list +sources = [ + 'espresso-%s.tar.gz' % version, + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', + ] +missing_sources = [ + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found + ] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others + ] + +patches = [ + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-5.0.2_yambo-fftw.patch', + ] + +# gipaw excluded, because v5.0 isn't stable +# xspectra v5.0.2 is nowhere to be found +makeopts = 'all w90 want yambo plumed' + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'chem' -- GitLab From 41901e57b3b02e8d24d6fd982c639bc04b506be6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 26 Apr 2013 13:18:49 +0200 Subject: [PATCH 007/811] add libffi-ictce-5.3.0 Signed-off-by: Fotis Georgatos --- .../l/libffi/libffi-3.0.11-ictce-5.3.0.eb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb new file mode 100644 index 0000000000..072d1d7f01 --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb @@ -0,0 +1,23 @@ +name = 'libffi' +version = '3.0.11' + +homepage = 'http://sourceware.org/libffi' +description = """The libffi library provides a portable, high level programming interface to various calling conventions. + This allows a programmer to call any function specified by a call interface description at run-time. + +FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the interface that +allows code written in one language to call code written in another language.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = ['%s-%s.tar.gz' % (name.lower(), version)] +source_urls = ['ftp://sourceware.org/pub/libffi/'] + +patches = ['libffi-3.0.11_icc_UINT128.patch'] + +sanity_check_paths = { + 'files': ['lib/libffi.a'], + 'dirs': [] + } + +moduleclass = 'lib' -- GitLab From 8ea2663e5b497a74f571c8b59a18d850a36b635e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 26 Apr 2013 16:49:28 +0200 Subject: [PATCH 008/811] add libffi related easyconfigs Signed-off-by: Fotis Georgatos --- .../g/guile/guile-1.8.8-ictce-5.3.0.eb | 30 +++++++++++++++++++ .../h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb | 30 +++++++++++++++++++ .../l/libctl/libctl-3.2.1-ictce-5.3.0.eb | 16 ++++++++++ .../libmatheval-1.1.8-ictce-5.3.0.eb | 29 ++++++++++++++++++ .../m/Meep/Meep-1.2-ictce-5.3.0.eb | 30 +++++++++++++++++++ ...hon-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb | 28 +++++++++++++++++ 6 files changed, 163 insertions(+) create mode 100644 easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb new file mode 100644 index 0000000000..c2d30cc208 --- /dev/null +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb @@ -0,0 +1,30 @@ +name = 'guile' +version = '1.8.8' + +homepage = 'http://www.gnu.org/software/guile' +description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions, + the official extension language for the GNU operating system.""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = ['%s-%s.tar.gz' % (name.lower(), version)] +source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] + +dependencies = [ + ('libtool', '2.4.2'), + ('GMP', '5.0.5'), + ('libunistring', '0.9.3'), + ('pkg-config', '0.27.1'), + ('libffi', '3.0.11'), + ('libreadline', '6.2'), + ] + +configopts = " --enable-error-on-warning=no" + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"], + 'dirs': [] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..1156a3d1e9 --- /dev/null +++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb @@ -0,0 +1,30 @@ +name = 'h5utils' +version = '1.12.1' + +homepage = 'http://ab-initio.mit.edu/wiki/index.php/H5utils' +description = """h5utils is a set of utilities for visualization and conversion of scientific data in the free, portable + HDF5 format. Besides providing a simple tool for batch visualization as PNG images, h5utils also includes programs to + convert HDF5 datasets into the formats required by other free visualization software (e.g. plain text, Vis5d, and VTK).""" + +source_urls = ['http://ab-initio.mit.edu/h5utils/'] +sources = ['%s-%s.tar.gz' % (name.lower(), version)] + +patches = ['libpng1.5_fix.patch'] + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +dependencies = [ + ('zlib', '1.2.7'), + ('libpng', '1.5.11'), + ('libmatheval', '1.1.8'), + ('HDF5', '1.8.7'), + ] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['h5fromtxt', 'h5math', 'h5topng', 'h5totxt', 'h5tovtk']], + 'dirs': ['share/h5utils/colormaps'] +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..32972e3ae5 --- /dev/null +++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb @@ -0,0 +1,16 @@ +name = 'libctl' +version = '3.2.1' + +homepage = 'http://ab-initio.mit.edu/libctl' +description = """libctl is a free Guile-based library implementing flexible control files for scientific simulations.""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +source_urls = ['http://ab-initio.mit.edu/libctl/'] +sources = ['%s-%s.tar.gz' % (name.lower(), version)] + +dependencies = [('guile', '1.8.8')] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb new file mode 100644 index 0000000000..c3709d8e78 --- /dev/null +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb @@ -0,0 +1,29 @@ +name = 'libmatheval' +version = '1.1.8' + +homepage = 'http://www.gnu.org/software/libmatheval/' +description = """GNU libmatheval is a library (callable from C and Fortran) to parse + and evaluate symbolic expressions input as text.""" + +source_urls = ['http://ftp.gnu.org/gnu/libmatheval/'] +sources = ['%s-%s.tar.gz' % (name.lower(), version)] + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +dependencies = [ + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('byacc', '20120526'), + ('guile', '1.8.8'), + ] + +configopts = '--with-pic' + +sanity_check_paths = { + 'files': ['lib/libmatheval.a', 'include/matheval.h'], + 'dirs': [] + } + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..90651eb628 --- /dev/null +++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb @@ -0,0 +1,30 @@ +name = 'Meep' +version = '1.2' + +homepage = 'http://ab-initio.mit.edu/wiki/index.php/Meep' +description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) simulation software package + developed at MIT to model electromagnetic systems.""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': + True, 'pic': True} + +source_urls = ['http://ab-initio.mit.edu/meep/', + 'http://ab-initio.mit.edu/meep/old/'] +sources = ['%s-%s.tar.gz' % (name.lower(), version)] + +patches = ['Meep-%s_version-string-without-spaces.patch' % version] + +dependencies = [ + ('Harminv', '1.3.1'), + ('HDF5', '1.8.7'), + ('libctl', '3.2.1'), + ('GSL', '1.15'), + ('FFTW', '3.3.1') +] + +configopts = "--with-pic --with-mpi --with-blas=mkl_em64t --with-lapack=mkl_em64t --without-gcc-arch " +configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared" + +moduleclass = 'phys' diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..a36e1a3a8d --- /dev/null +++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,28 @@ +name = 'python-meep' +version = '1.4.2' + +homepage = 'https://code.launchpad.net/python-meep' +description = """Python wrapper for the Meep FDTD solver.""" + + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True} + +source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"] +sources = ['%s-%s.tar' % (name.lower(), version)] + +patches = [ + 'MPI_destructor_1.3.patch' + ] + +python = 'Python' +pythonver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('Meep', '1.2'), + ('SWIG', '2.0.4', '-%s-%s' % (python, pythonver)) + ] + +moduleclass = 'devel' -- GitLab From 6610c28730382d1cc0d6092749771a569e8f40ee Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 28 Apr 2013 03:52:40 +0200 Subject: [PATCH 009/811] remove binary GIMPS Signed-off-by: Fotis Georgatos --- .../GIMPS-p95v279-goalf-1.1.0-no-OFED.eb | 4 +-- .../g/GIMPS/GIMPS-p95v279.linux64.eb | 29 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb index 5289792c73..c073bcdb6c 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb @@ -7,14 +7,12 @@ # $Id$ ## -# easyblock = 'Tarball' - name = 'GIMPS' version = 'p95v279' homepage = 'http://www.mersenne.org/' description = """GIMPS: Great Internet Mersenne Prime Search; - it can be useful for limited stress testing of nodes, in user space""" + it can be useful for limited stress testing of nodes, in user space""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb deleted file mode 100644 index f222a32981..0000000000 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb +++ /dev/null @@ -1,29 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine -# Authors:: Fotis Georgatos -# License:: MIT/GPL -# $Id$ -## - -easyblock = 'Tarball' - -name = 'GIMPS' -version = 'p95v279.linux64' - -homepage = 'http://www.mersenne.org/' -description = """GIMPS: Great Internet Mersenne Prime Search; - it can be useful for limited stress testing of nodes, in user space""" - -toolchain = {'name': 'dummy', 'version': 'dummy'} - -sources = [('%s.tar.gz' % version, 'tar xzf %s;mkdir bin;mv mprime bin')] # this hack ensures PATH is proper -source_urls = ['ftp://mersenne.org/%s/' % name.lower()] - -sanity_check_paths = { - 'files': ["bin/mprime"], - 'dirs': [] - } - -moduleclass = 'tools' -- GitLab From 9c4c1de9f0f45b144b323b45181e2dd08de462e7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 28 Apr 2013 14:22:24 +0200 Subject: [PATCH 010/811] add back GIMPS binary easyconfig etc Signed-off-by: Fotis Georgatos --- ...-OFED.eb => GIMPS-p95v279-goolf-1.4.10.eb} | 6 ++-- .../g/GIMPS/GIMPS-p95v279.linux64.eb | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/g/GIMPS/{GIMPS-p95v279-goalf-1.1.0-no-OFED.eb => GIMPS-p95v279-goolf-1.4.10.eb} (79%) create mode 100644 easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb similarity index 79% rename from easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb rename to easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb index c073bcdb6c..68c6887f88 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb @@ -14,12 +14,14 @@ homepage = 'http://www.mersenne.org/' description = """GIMPS: Great Internet Mersenne Prime Search; it can be useful for limited stress testing of nodes, in user space""" -toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchain = {'name': 'goolf', 'version': '1.4.10'} # eg. http://www.mersenne.info/gimps/p95v279.source.zip -sources = ['%s.source.zip' % version] +sources = [('%s.source.zip' % version, 'unzip -qq %s ; /bin/true')] # workaround since unzip is in effect buggy source_urls = ['http://www.mersenne.info/%s' % name.lower()] +skipsteps = ['configure'] + sanity_check_paths = { 'files': ["bin/mprime"], 'dirs': [] diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb new file mode 100644 index 0000000000..f222a32981 --- /dev/null +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb @@ -0,0 +1,29 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +easyblock = 'Tarball' + +name = 'GIMPS' +version = 'p95v279.linux64' + +homepage = 'http://www.mersenne.org/' +description = """GIMPS: Great Internet Mersenne Prime Search; + it can be useful for limited stress testing of nodes, in user space""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = [('%s.tar.gz' % version, 'tar xzf %s;mkdir bin;mv mprime bin')] # this hack ensures PATH is proper +source_urls = ['ftp://mersenne.org/%s/' % name.lower()] + +sanity_check_paths = { + 'files': ["bin/mprime"], + 'dirs': [] + } + +moduleclass = 'tools' -- GitLab From 2f6e104753bf1e7023cd66e39856d5e37dbe5709 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 28 Apr 2013 16:17:50 +0200 Subject: [PATCH 011/811] tmp_commit Signed-off-by: Fotis Georgatos --- .../easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb index 68c6887f88..bcbf697a8c 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb @@ -20,11 +20,19 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [('%s.source.zip' % version, 'unzip -qq %s ; /bin/true')] # workaround since unzip is in effect buggy source_urls = ['http://www.mersenne.info/%s' % name.lower()] +dependencies = [('cURL', '7.29.0')] + skipsteps = ['configure'] +start_dir = 'gwnum' +#premakeopts = ['', 'cd gwnum; '] +makeopts = ['-f make64; cd ../linux64'] #; make'] + sanity_check_paths = { 'files': ["bin/mprime"], 'dirs': [] } +parallel = 1 + moduleclass = 'tools' -- GitLab From 32e4c6db5079be4ae4c0093e607eaee916be3cf6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 28 Apr 2013 16:41:05 +0200 Subject: [PATCH 012/811] FINALLY: Fix GIMPS in some kind of sensible way Signed-off-by: Fotis Georgatos --- .../g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb | 9 +++-- .../easyconfigs/g/GIMPS/gimps-linux64.patch | 39 +++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb index bcbf697a8c..938d1f707a 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb @@ -16,17 +16,18 @@ description = """GIMPS: Great Internet Mersenne Prime Search; toolchain = {'name': 'goolf', 'version': '1.4.10'} +dependencies = [('cURL', '7.29.0')] + # eg. http://www.mersenne.info/gimps/p95v279.source.zip sources = [('%s.source.zip' % version, 'unzip -qq %s ; /bin/true')] # workaround since unzip is in effect buggy source_urls = ['http://www.mersenne.info/%s' % name.lower()] -dependencies = [('cURL', '7.29.0')] +patches = ['gimps-linux64.patch'] skipsteps = ['configure'] -start_dir = 'gwnum' -#premakeopts = ['', 'cd gwnum; '] -makeopts = ['-f make64; cd ../linux64'] #; make'] +start_dir = 'linux64' +preinstallopts = ["PREFIX=%(installdir)s "] sanity_check_paths = { 'files': ["bin/mprime"], diff --git a/easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch b/easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch new file mode 100644 index 0000000000..c0b098a046 --- /dev/null +++ b/easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch @@ -0,0 +1,39 @@ +--- linux64/makefile.orig 2012-12-12 13:31:54.000000000 +0100 ++++ linux64/makefile 2013-04-28 16:29:40.547843966 +0200 +@@ -8,7 +8,7 @@ CPP = g++ + CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2 + + LFLAGS = -Wl,-M +-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl ++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ + + FACTOROBJ = factor64.o + LINUXOBJS = prime.o menu.o +@@ -16,19 +16,25 @@ EXE = mprime + + ######################################################################### + +-$(EXE): security $(LINUXOBJS) $(FACTOROBJ) ++$(EXE): build_gwnum64 security $(LINUXOBJS) $(FACTOROBJ) + $(CC) $(LFLAGS) -o $(EXE) $(LINUXOBJS) $(FACTOROBJ) $(LIBS) + ++build_gwnum64: ++ make -C ../gwnum -f make64 ++ + security: + [ ! -e ../security.h ] && touch ../security.h || true + [ ! -e ../security.c ] && touch ../security.c || true + [ ! -e ../secure5.c ] && touch ../secure5.c || true + + clean: +- rm -f $(EXE) $(EXE2) $(LINUXOBJS) $(FACTOROBJ) ++ rm -f $(EXE) $(EXE2) $(LINUXOBJS) + + .c.o: + $(CC) $(CFLAGS) -c $< + + .cpp.o: + $(CPP) $(CPPFLAGS) -c $< ++ ++install: ++ install -Dm755 mprime ${PREFIX}/bin/mprime -- GitLab From a2b1e83fc62bb0735ca8f00e6e59d20b09277f58 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 5 May 2013 21:32:09 +0200 Subject: [PATCH 013/811] add URLs describing the patch need Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb index 938d1f707a..5c8bfec408 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb @@ -22,6 +22,7 @@ dependencies = [('cURL', '7.29.0')] sources = [('%s.source.zip' % version, 'unzip -qq %s ; /bin/true')] # workaround since unzip is in effect buggy source_urls = ['http://www.mersenne.info/%s' % name.lower()] +# ref. https://bbs.archlinux.org/viewtopic.php?id=114996 & http://pastebin.com/PEFUUxHq patches = ['gimps-linux64.patch'] skipsteps = ['configure'] -- GitLab From fa484876db8ad25ba63583485d971f0f3f9cee70 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 19 Jul 2013 14:42:51 +0200 Subject: [PATCH 014/811] added arb and dependency easyconfigs --- .../easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 36 +++++++++++++++++++ easybuild/easyconfigs/a/arb/arb_xmkmf.patch | 20 +++++++++++ .../i/imake/imake-1.0.5-goolf-1.4.10.eb | 23 ++++++++++++ .../l/libICE/libICE-1.0.8-goolf-1.4.10.eb | 28 +++++++++++++++ .../l/libSM/libSM-1.2.1-goolf-1.4.10.eb | 27 ++++++++++++++ .../l/libXt/libXt-1.1.4-goolf-1.4.10.eb | 35 ++++++++++++++++++ .../l/lynx/lynx-2.8.7-goolfs-1.4.10.eb | 18 ++++++++++ .../m/motif/motif-2.3.4-goolf-1.4.10.eb | 29 +++++++++++++++ .../x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb | 19 ++++++++++ .../x/xtrans/xtrans-1.2-goolf-1.4.10.eb | 24 +++++++++++++ 10 files changed, 259 insertions(+) create mode 100644 easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/a/arb/arb_xmkmf.patch create mode 100644 easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolfs-1.4.10.eb create mode 100644 easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb new file mode 100644 index 0000000000..c6fef22df1 --- /dev/null +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -0,0 +1,36 @@ +name = 'arb' +version = '5.5' + +homepage = 'http://www.arb-home.de/' +description = """The ARB software is a graphically oriented package comprising various tools for sequence database +handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked +to the respective sequence entries is structured according to phylogeny or other user defined criteria.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = ['%(name)ssrc.tgz'] +source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] +patches = ['arb_xmkmf.patch'] + +builddependencies = [ + ('libpng', '1.6.2'), + ('LibTIFF', '4.0.3'), + ('Java', '1.7.0_15', '', True), + ('lynx', '2.8.7'), + ('makedepend', '1.0.4'), + ('imake', '1.0.5'), + ('motif', '2.3.4'), + ('libXt', '1.1.4'), + # xmllint + # optional + # currently fails, see https://github.com/hpcugent/easybuild-easyconfigs/issues/368 + # but this is optional anyway + #('freeglut', '2.8.1'), + # xaw + # sablotron +] +preconfigopts = 'make || echo this is expected, continuing... ||' +premakeopts = "ARBHOME=`pwd` PATH=$ARBHOME/bin:$PATH LD_LIBRARY_PATH=$ARBHOME/LIBLINK:$LD_LIBRARY_PATH" +makeopts = 'all OPENGL=0 V=1' +parallel = 1 +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/a/arb/arb_xmkmf.patch b/easybuild/easyconfigs/a/arb/arb_xmkmf.patch new file mode 100644 index 0000000000..84c57ec8f0 --- /dev/null +++ b/easybuild/easyconfigs/a/arb/arb_xmkmf.patch @@ -0,0 +1,20 @@ +--- Makefile.orig 2013-07-16 14:55:29.971221036 +0200 ++++ Makefile 2013-07-16 14:58:28.543495360 +0200 +@@ -68,7 +68,7 @@ + 4.3.1 4.3.2 4.3.3 \ + 4.4.1 4.4.3 \ + 4.6.1 \ +- 4.7.1 ++ 4.7.1 4.7.2 + + ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS) + +@@ -322,7 +322,7 @@ + ifdef DARWIN + XMKMF := $(PREFIX)/bin/xmkmf + else +- XMKMF := /usr/bin/X11/xmkmf ++ XMKMF := xmkmf + endif + + MAKEDEPEND_PLAIN = makedepend diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb new file mode 100644 index 0000000000..d8927bac33 --- /dev/null +++ b/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb @@ -0,0 +1,23 @@ + +name = 'imake' +version = '1.0.5' + +homepage = 'http://www.x.org/' +description = """imake is a Makefile-generator that is intended to make it easier to develop software portably for multiple systems""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +# For sources line to work correctly with --try-software-version, you MUST employ %s OR use a construct like SOURCE_TAR_GZ +sources = [SOURCE_TAR_GZ] +source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/'] + +sanity_check_paths = { + 'files': ['bin/%s' % binfile for binfile in [ + 'ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf' + ] + ], + 'dirs': [] +} + +# You SHOULD change the following line; Kindly consult other easyconfigs for possible options +moduleclass = 'base' diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb new file mode 100644 index 0000000000..245e8a65e4 --- /dev/null +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb @@ -0,0 +1,28 @@ +name = 'libICE' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +X Inter-Client Exchange library for freedesktop.org +""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('xproto', '7.0.23'), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files' : ['include/X11/ICE/%s' % x for x in [ + 'ICEconn.h', 'ICE.h', 'ICElib.h', 'ICEmsg.h', 'ICEproto.h', 'ICEutil.h', + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..8ed98110db --- /dev/null +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb @@ -0,0 +1,27 @@ +name = 'libSM' +version = '1.2.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +X11 Session Management library, which allows for applications to both manage sessions, +and make use of session managers to save and restore their state for later use. +""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libICE', '1.0.8'), + ('xproto', '7.0.23'), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb new file mode 100644 index 0000000000..11e36a95e5 --- /dev/null +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb @@ -0,0 +1,35 @@ +name = 'libXt' +version = '1.1.4' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are +based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation). +""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libSM', '1.2.1'), + ('libICE', '1.0.8'), + #('X11 ?? + ('xproto', '7.0.23'), + #('kbproto', ''), +] + +sanity_check_paths = { + 'files' : ['include/X11/%s' % x for x in [ + 'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h', + 'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h', + 'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h', + 'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h', + 'ThreadsI.h', 'VarargsI.h', 'VendorP.h', + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolfs-1.4.10.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolfs-1.4.10.eb new file mode 100644 index 0000000000..533739ebbd --- /dev/null +++ b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolfs-1.4.10.eb @@ -0,0 +1,18 @@ +name = 'lynx' +version = '2.8.7' + +description = "lynx is an alphanumeric display oriented World-Wide Web Client" + +sources = ['lynx2.8.7.tar.bz2'] +version = '2.8.7' +name = 'lynx' +source_urls = ['http://lynx.isc.org/release/'] +homepage = 'http://lynx.isc.org/' + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +sanity_check_paths = { + 'files': ['bin/lynx'], + 'dirs': [] +} + +moduleclass = 'base' diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb new file mode 100644 index 0000000000..d127145067 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb @@ -0,0 +1,29 @@ +name = 'motif' +version = '2.3.4' + +homepage = 'http://motif.ics.com/' +description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building +applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = ['%(name)s-%(version)s-src.tgz'] +source_urls = [SOURCEFORGE_SOURCE] + +builddependencies = [ + ('libtool', '2.4.2'), + ('libXt', '1.1.4'), + ('xbitmaps', '1.1.1'), + ('flex', '2.5.35'), + ('Bison', '2.7'), +] +# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories +#sanity_check_paths = { +# 'files': [], +# 'dirs': ["."] +#} + +# You SHOULD change the following line; Kindly consult other easyconfigs for possible options +preconfigopts = "./autogen.sh && " +moduleclass = 'vis' +parallel = 1 diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..6be0e5d58e --- /dev/null +++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = 'xbitmaps' +version = '1.1.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +provides bitmaps for x +""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/data/'] + +sanity_check_paths = { + 'files' : ['include/X11/bitmaps/gray'], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..5e1f6186bc --- /dev/null +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb @@ -0,0 +1,24 @@ +name = 'xtrans' +version = '1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +xtrans includes a number of routines to make X implementations transport-independent; at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. +""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/Xtrans/%s' % x for x in [ + 'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', + 'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c' + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' -- GitLab From 6938f23b1456dfc1e85e2e706210e1b0ee6ef6cf Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 14:20:11 +0200 Subject: [PATCH 015/811] added motif 2.2.4 + a lot of x dependencies --- .../inputproto/inputproto-2.3-goolf-1.4.10.eb | 22 ++++++++++ .../k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb | 22 ++++++++++ .../l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 31 ++++++++++++++ .../l/libXau/libXau-1.0.8-goolf-1.4.10.eb | 23 +++++++++++ .../l/libXext/libXext-1.3.2-goolf-1.4.10.eb | 23 +++++++++++ .../l/libXp/libXp-1.0.2-goolf-1.4.10.eb | 32 +++++++++++++++ .../l/libxcb/libxcb-1.8-goolf-1.4.10.eb | 28 +++++++++++++ .../m/motif/motif-2.2.4-goolf-1.4.10.eb | 41 +++++++++++++++++++ .../printproto-1.0.5-goolf-1.4.10.eb | 18 ++++++++ .../x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb | 18 ++++++++ .../xextproto/xextproto-7.2.1-goolf-1.4.10.eb | 24 +++++++++++ 11 files changed, 282 insertions(+) create mode 100644 easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb new file mode 100644 index 0000000000..8549c315d7 --- /dev/null +++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb @@ -0,0 +1,22 @@ +name = 'inputproto' +version = '2.3' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org InputProto protocol headers.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb new file mode 100644 index 0000000000..4b57f81611 --- /dev/null +++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb @@ -0,0 +1,22 @@ +name = 'kbproto' +version = '1.0.6' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org KBProto protocol headers.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..c7a7be05a3 --- /dev/null +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -0,0 +1,31 @@ +name = 'libX11' +version = '1.6.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ X11 client-side library""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ + ('xextproto', '7.2.1'), + ('xtrans', '1.2'), + ('xcb-proto', '1.7'), + ('kbproto', '1.0.6'), + ('inputproto', '2.3'), + ('xproto', '7.0.23'), +] + +sanity_check_paths = { + 'files': ['include/X11/%s' % x for x in [ + 'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h', + 'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb new file mode 100644 index 0000000000..c6c2097878 --- /dev/null +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb @@ -0,0 +1,23 @@ +name = 'libXau' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """The libXau package contains a library implementing the X11 Authorization Protocol. +This is useful for restricting client access to the display. +""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXau.a', 'libXau.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..06deb80640 --- /dev/null +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb @@ -0,0 +1,23 @@ +name = 'libXext' +version = '1.3.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """Common X Extensions library""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h', + 'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..9ebe4d1bd0 --- /dev/null +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb @@ -0,0 +1,32 @@ +name = 'libXp' +version = '1.0.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXp provides the X print library.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ +# ('libSM', '1.2.1'), +# ('libICE', '1.0.8'), +# ('xproto', '7.0.23'), + ('libX11', '1.6.1'), + ('xextproto', '7.2.1'), + ('libXext', '1.3.2'), + ('libXau', '1.0.8'), + ('printproto', '1.0.5'), +] + +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXp.a', 'libXp.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb new file mode 100644 index 0000000000..d4af8b0d44 --- /dev/null +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb @@ -0,0 +1,28 @@ +name = 'libxcb' +version = '1.8' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, +latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['libxcb-no-pthread-stubs.patch'] +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +versionsuffix = '' +dependencies = [ + ('xcb-proto', '1.7', versionsuffix) +] + + +sanity_check_paths = { + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'] + } + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb new file mode 100644 index 0000000000..6162154497 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -0,0 +1,41 @@ +name = 'motif' +version = '2.2.4' # this version provides libXm.so.3 +easyblock = 'ConfigureMake' + +homepage = 'http://motif.ics.com/' +description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building +applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +# from the source rpm +sources = ['open%(name)s-%(version)s.tar.bz2'] +source_urls = [SOURCEFORGE_SOURCE] +patches = [ + 'datadir.patch', 'openmotif-2.2.4.diff', 'openmotif22-add_LONG64_define.diff', 'openmotif22-strcmp.diff', + 'openmotif-uil.diff', 'openmotif-xpm.diff', 'PrintableString.diff', 'sentinel.diff', 'warn.patch', + 'XmResizeHashTable.patch', +] + + +builddependencies = [ + ('libtool', '2.4.2'), + ('libXt', '1.1.4'), + ('xbitmaps', '1.1.1'), + ('flex', '2.5.35'), + ('Bison', '2.7'), + ('Automake','1.13.4'), + ('gettext', '0.18.2'), + ('libXp', '1.0.2'), + ('printproto', '1.0.5'), +] +# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories +#sanity_check_paths = { +# 'files': [], +# 'dirs': ["."] +#} +premakeopts = "LANG=C " +#preconfigopts = "export ACLOCAL_PATH=$EBROOTLIBTOOL/share/aclocal-1.11/ && autoreconf && ./autogen.sh && make clean && " +preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " +moduleclass = 'vis' +parallel = 1 diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb new file mode 100644 index 0000000000..062ad8ceb8 --- /dev/null +++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb @@ -0,0 +1,18 @@ +name = 'printproto' +version = '1.0.5' + +homepage = 'http://xorg.freedesktop.org/' +description = """X.org PrintProto protocol headers.""" + +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] +sources = [SOURCELOWER_TAR_GZ] + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + + +sanity_check_paths = { + 'files': ['include/X11/extensions/Print.h', 'include/X11/extensions/Printstr.h'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb new file mode 100644 index 0000000000..4577448559 --- /dev/null +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb @@ -0,0 +1,18 @@ +name = 'xcb-proto' +version = '1.7' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, +latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sanity_check_paths = { + 'files': ['lib/pkgconfig/xcb-proto.pc'], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..199f76e62c --- /dev/null +++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb @@ -0,0 +1,24 @@ +name = 'xextproto' +version = '7.2.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """XExtProto protocol headers.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h', + 'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h', + 'xtestconst.h', 'xtestext1proto.h' + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' -- GitLab From db6bbdddc98c94fd18f3608cb49252de9456e82b Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:17:33 +0200 Subject: [PATCH 016/811] added missing dependencies to libXext --- .../easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb index 06deb80640..e5fc4e58ab 100644 --- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb @@ -10,6 +10,11 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +dependencies = [ + ('xproto','7.0.23'), + ('libX11', '1.6.1'), + ('xextproto', '7.2.1'), +] sanity_check_paths = { 'files': ['include/X11/extensions/%s' % x for x in [ -- GitLab From f3fff27d7bfc6f43bcd497af96c369a85c97d4be Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:18:50 +0200 Subject: [PATCH 017/811] xcb-proto needs python after all --- .../l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 2 +- .../x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb index c7a7be05a3..07d0efffa2 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -13,7 +13,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] builddependencies = [ ('xextproto', '7.2.1'), ('xtrans', '1.2'), - ('xcb-proto', '1.7'), + ('xcb-proto', '1.7', '-Python-2.7.3'), ('kbproto', '1.0.6'), ('inputproto', '2.3'), ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb deleted file mode 100644 index 4577448559..0000000000 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10.eb +++ /dev/null @@ -1,18 +0,0 @@ -name = 'xcb-proto' -version = '1.7' - -homepage = 'http://xcb.freedesktop.org/' -description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, -latency hiding, direct access to the protocol, improved threading support, and extensibility.""" - -source_urls = ['http://xcb.freedesktop.org/dist/'] -sources = [SOURCELOWER_TAR_GZ] - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -sanity_check_paths = { - 'files': ['lib/pkgconfig/xcb-proto.pc'], - 'dirs': [], -} - -moduleclass = 'devel' -- GitLab From c0dce9c21476f7ab889531b8a921f4c4f6197c21 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:25:17 +0200 Subject: [PATCH 018/811] make sure libs are full dependencies, not builddependencies --- .../easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb | 2 ++ .../easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 5 ++++- .../easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb | 11 +++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb index 8ed98110db..70b0958cef 100644 --- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb @@ -15,6 +15,8 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] dependencies = [ ('libICE', '1.0.8'), +] +builddependencies = [ ('xproto', '7.0.23'), ('xtrans', '1.2'), ] diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb index 07d0efffa2..b2b83ee840 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -12,13 +12,16 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] builddependencies = [ ('xextproto', '7.2.1'), - ('xtrans', '1.2'), ('xcb-proto', '1.7', '-Python-2.7.3'), ('kbproto', '1.0.6'), ('inputproto', '2.3'), ('xproto', '7.0.23'), ] +dependencies = [ + ('xtrans', '1.2'), +] + sanity_check_paths = { 'files': ['include/X11/%s' % x for x in [ 'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h', diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb index 9ebe4d1bd0..0aa7bd042e 100644 --- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb @@ -11,16 +11,15 @@ sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] builddependencies = [ -# ('libSM', '1.2.1'), -# ('libICE', '1.0.8'), -# ('xproto', '7.0.23'), - ('libX11', '1.6.1'), ('xextproto', '7.2.1'), - ('libXext', '1.3.2'), - ('libXau', '1.0.8'), ('printproto', '1.0.5'), ] +dependencies = [ + ('libX11', '1.6.1'), + ('libXext', '1.3.2'), + ('libXau', '1.0.8'), +] sanity_check_paths = { 'files': ['lib/%s' % x for x in [ 'libXp.a', 'libXp.so', -- GitLab From 31df33a81ab91c4bfc2f13e401660c73b00dfbe2 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:27:10 +0200 Subject: [PATCH 019/811] dependencies, not builddependencies --- easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb index d127145067..d7cd1f8b2e 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['%(name)s-%(version)s-src.tgz'] source_urls = [SOURCEFORGE_SOURCE] -builddependencies = [ +dependencies = [ ('libtool', '2.4.2'), ('libXt', '1.1.4'), ('xbitmaps', '1.1.1'), -- GitLab From d7951b59baf26438a7fcec77551074f8cd7e3b36 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:28:00 +0200 Subject: [PATCH 020/811] dependencies, not builddependencies --- easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index c6fef22df1..f43f9ef92b 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -12,7 +12,7 @@ sources = ['%(name)ssrc.tgz'] source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] patches = ['arb_xmkmf.patch'] -builddependencies = [ +dependencies = [ ('libpng', '1.6.2'), ('LibTIFF', '4.0.3'), ('Java', '1.7.0_15', '', True), -- GitLab From 927d72dbcab1af5c66d4a0e2aafbe3f2760e5b81 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:33:49 +0200 Subject: [PATCH 021/811] libxcb is a dependency of libX11 --- easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb index b2b83ee840..b7c225c405 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -19,6 +19,7 @@ builddependencies = [ ] dependencies = [ + ('libxcb', '1.8'), ('xtrans', '1.2'), ] -- GitLab From 3e17dfa1e6424c3de4f6619e5adf335f6ada29a5 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 2 Aug 2013 15:40:28 +0200 Subject: [PATCH 022/811] libxcb with -python that is --- easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb index b7c225c405..ea9d45ac3a 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -10,16 +10,18 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +pythonversion = '-Python-2.7.3' builddependencies = [ ('xextproto', '7.2.1'), - ('xcb-proto', '1.7', '-Python-2.7.3'), + ('xcb-proto', '1.7', pythonversion), ('kbproto', '1.0.6'), ('inputproto', '2.3'), ('xproto', '7.0.23'), ] dependencies = [ - ('libxcb', '1.8'), + ('libxcb', '1.8', pythonversion), ('xtrans', '1.2'), ] -- GitLab From c3505d3d649c1d7cc6310e109a44c44fc9c9ef0d Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 09:18:28 +0200 Subject: [PATCH 023/811] added ictce versions --- .../a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb | 22 ++++++++++ .../Automake/Automake-1.13.4-ictce-4.1.13.eb | 30 ++++++++++++++ .../b/Bison/Bison-2.7-ictce-4.1.13.eb | 19 +++++++++ .../inputproto/inputproto-2.3-ictce-4.1.13.eb | 21 ++++++++++ .../k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb | 21 ++++++++++ .../l/libICE/libICE-1.0.8-ictce-4.1.13.eb | 27 +++++++++++++ .../l/libSM/libSM-1.2.1-ictce-4.1.13.eb | 28 +++++++++++++ .../l/libX11/libX11-1.6.1-ictce-4.1.13.eb | 36 +++++++++++++++++ .../l/libXau/libXau-1.0.8-ictce-4.1.13.eb | 22 ++++++++++ .../l/libXext/libXext-1.3.2-ictce-4.1.13.eb | 27 +++++++++++++ .../l/libXp/libXp-1.0.2-ictce-4.1.13.eb | 30 ++++++++++++++ .../l/libXt/libXt-1.1.4-ictce-4.1.13.eb | 34 ++++++++++++++++ .../libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb | 32 +++++++++++++++ .../m/motif/motif-2.2.4-ictce-4.1.13.eb | 40 +++++++++++++++++++ .../printproto-1.0.5-ictce-4.1.13.eb | 17 ++++++++ .../x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb | 18 +++++++++ ...xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb | 24 +++++++++++ .../x/xproto/xproto-7.0.23-ictce-4.1.13.eb | 21 ++++++++++ .../x/xtrans/xtrans-1.2-ictce-4.1.13.eb | 23 +++++++++++ 19 files changed, 492 insertions(+) create mode 100644 easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb new file mode 100644 index 0000000000..1a348db552 --- /dev/null +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb @@ -0,0 +1,22 @@ +name = 'Autoconf' +version = '2.69' + +homepage = 'http://www.gnu.org/software/autoconf/' +description = """Autoconf is an extensible package of M4 macros that produce shell scripts to automatically + configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like + systems without manual user intervention. Autoconf creates a configuration script for a package from a + template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) + +source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..be7c908b30 --- /dev/null +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb @@ -0,0 +1,30 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'Automake' +version = '1.13.4' + +homepage = 'http://www.gnu.org/software/automake/automake.html' +description = "Automake: GNU Standards-compliant Makefile generator" + +source_urls = ['http://ftp.gnu.org/gnu/automake'] +sources = [SOURCELOWER_TAR_GZ] +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +dependencies = [('Autoconf', '2.69')] + +sanity_check_paths = { + 'files': ['bin/automake', 'bin/aclocal'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb new file mode 100644 index 0000000000..0459442821 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb @@ -0,0 +1,19 @@ +name = 'Bison' +version = '2.7' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar + into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'iqacml', 'version': '3.7.3'}) + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files':["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs':[] + } + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb new file mode 100644 index 0000000000..a593e205f0 --- /dev/null +++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'inputproto' +version = '2.3' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org InputProto protocol headers.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb new file mode 100644 index 0000000000..7cbf3eb5a0 --- /dev/null +++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'kbproto' +version = '1.0.6' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org KBProto protocol headers.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb new file mode 100644 index 0000000000..f08b4f4874 --- /dev/null +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb @@ -0,0 +1,27 @@ +name = 'libICE' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +X Inter-Client Exchange library for freedesktop.org +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('xproto', '7.0.23'), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files' : ['include/X11/ICE/%s' % x for x in [ + 'ICEconn.h', 'ICE.h', 'ICElib.h', 'ICEmsg.h', 'ICEproto.h', 'ICEutil.h', + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..ba56701133 --- /dev/null +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb @@ -0,0 +1,28 @@ +name = 'libSM' +version = '1.2.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +X11 Session Management library, which allows for applications to both manage sessions, +and make use of session managers to save and restore their state for later use. +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libICE', '1.0.8'), +] +builddependencies = [ + ('xproto', '7.0.23'), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..89fe739f16 --- /dev/null +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb @@ -0,0 +1,36 @@ +name = 'libX11' +version = '1.6.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ X11 client-side library""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + + +pythonversion = '-Python-2.7.3' +builddependencies = [ + ('xextproto', '7.2.1'), + ('xcb-proto', '1.7', pythonversion), + ('kbproto', '1.0.6'), + ('inputproto', '2.3'), + ('xproto', '7.0.23'), +] + +dependencies = [ + ('libxcb', '1.8', pythonversion), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files': ['include/X11/%s' % x for x in [ + 'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h', + 'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb new file mode 100644 index 0000000000..9ea06091ad --- /dev/null +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb @@ -0,0 +1,22 @@ +name = 'libXau' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """The libXau package contains a library implementing the X11 Authorization Protocol. +This is useful for restricting client access to the display. +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXau.a', 'libXau.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..4b3efa2917 --- /dev/null +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb @@ -0,0 +1,27 @@ +name = 'libXext' +version = '1.3.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """Common X Extensions library""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('xproto','7.0.23'), + ('libX11', '1.6.1'), + ('xextproto', '7.2.1'), +] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h', + 'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..7719480732 --- /dev/null +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb @@ -0,0 +1,30 @@ +name = 'libXp' +version = '1.0.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXp provides the X print library.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ + ('xextproto', '7.2.1'), + ('printproto', '1.0.5'), +] + +dependencies = [ + ('libX11', '1.6.1'), + ('libXext', '1.3.2'), + ('libXau', '1.0.8'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXp.a', 'libXp.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..d2d810c6a8 --- /dev/null +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb @@ -0,0 +1,34 @@ +name = 'libXt' +version = '1.1.4' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are +based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation). +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libSM', '1.2.1'), + ('libICE', '1.0.8'), + #('X11 ?? + ('xproto', '7.0.23'), + #('kbproto', ''), +] + +sanity_check_paths = { + 'files' : ['include/X11/%s' % x for x in [ + 'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h', + 'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h', + 'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h', + 'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h', + 'ThreadsI.h', 'VarargsI.h', 'VendorP.h', + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..28db2d290a --- /dev/null +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,32 @@ +name = 'libxcb' +version = '1.8' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, + latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['libxcb-no-pthread-stubs.patch'] +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) + +python = 'Python' +pyver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pyver) +dependencies = [ + (python, pyver), + ('xcb-proto', '1.7', versionsuffix) + ] + +preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && " + +sanity_check_paths = { + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'] + } + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..c10b8bc19a --- /dev/null +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -0,0 +1,40 @@ +name = 'motif' +version = '2.2.4' # this version provides libXm.so.3 +easyblock = 'ConfigureMake' + +homepage = 'http://motif.ics.com/' +description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building +applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +# from the source rpm +sources = ['open%(name)s-%(version)s.tar.bz2'] +source_urls = [SOURCEFORGE_SOURCE] +patches = [ + 'datadir.patch', 'openmotif-2.2.4.diff', 'openmotif22-add_LONG64_define.diff', 'openmotif22-strcmp.diff', + 'openmotif-uil.diff', 'openmotif-xpm.diff', 'PrintableString.diff', 'sentinel.diff', 'warn.patch', + 'XmResizeHashTable.patch', +] + + +builddependencies = [ + ('libtool', '2.4.2'), + ('libXt', '1.1.4'), + ('xbitmaps', '1.1.1'), + ('flex', '2.5.35'), + ('Bison', '2.7'), + ('Automake','1.13.4'), + ('gettext', '0.18.2'), + ('libXp', '1.0.2'), + ('printproto', '1.0.5'), +] +# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories +#sanity_check_paths = { +# 'files': [], +# 'dirs': ["."] +#} +premakeopts = "LANG=C " +#preconfigopts = "export ACLOCAL_PATH=$EBROOTLIBTOOL/share/aclocal-1.11/ && autoreconf && ./autogen.sh && make clean && " +preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " +moduleclass = 'vis' +parallel = 1 diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb new file mode 100644 index 0000000000..0d1af06991 --- /dev/null +++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'printproto' +version = '1.0.5' + +homepage = 'http://xorg.freedesktop.org/' +description = """X.org PrintProto protocol headers.""" + +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] +sources = [SOURCELOWER_TAR_GZ] +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + + +sanity_check_paths = { + 'files': ['include/X11/extensions/Print.h', 'include/X11/extensions/Printstr.h'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..8d01c7c711 --- /dev/null +++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb @@ -0,0 +1,18 @@ +name = 'xbitmaps' +version = '1.1.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +provides bitmaps for x +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/data/'] + +sanity_check_paths = { + 'files' : ['include/X11/bitmaps/gray'], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..44f01127f7 --- /dev/null +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,24 @@ +name = 'xcb-proto' +version = '1.7' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, + latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) + +python = 'Python' +pyver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pyver) +dependencies = [(python, pyver)] + +pyshortver = '.'.join(pyver.split('.')[0:2]) + +sanity_check_paths = { + 'files': ['lib/pkgconfig/xcb-proto.pc'], + 'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb new file mode 100644 index 0000000000..823fd1b838 --- /dev/null +++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'xproto' +version = '7.0.23' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = "X protocol and ancillary headers" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h', + 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', + 'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h', + 'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h', + 'XWDFile.h', 'Xwinsock.h']], + 'dirs' : [] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..073287d887 --- /dev/null +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb @@ -0,0 +1,23 @@ +name = 'xtrans' +version = '1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """ +xtrans includes a number of routines to make X implementations transport-independent; at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/Xtrans/%s' % x for x in [ + 'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', + 'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c' + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' -- GitLab From 34e37e1c3dda93fcd9d0fa3173c15535dfe2d58f Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 10:08:11 +0200 Subject: [PATCH 024/811] added libX11 and kbproto as dependencies for libXt --- easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb | 4 ++-- easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb index 11e36a95e5..6e32204779 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb @@ -15,9 +15,9 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] dependencies = [ ('libSM', '1.2.1'), ('libICE', '1.0.8'), - #('X11 ?? + ('X11', '1.6.1'), + ('kbproto', '1.0.6'), ('xproto', '7.0.23'), - #('kbproto', ''), ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb index d2d810c6a8..348781dd4b 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb @@ -14,9 +14,9 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] dependencies = [ ('libSM', '1.2.1'), ('libICE', '1.0.8'), - #('X11 ?? + ('X11', '1.6.1'), ('xproto', '7.0.23'), - #('kbproto', ''), + ('kbproto', '1.0.6'), ] sanity_check_paths = { -- GitLab From e28424f69fdf0faa7a55bc638e680894ea119b45 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 10:10:07 +0200 Subject: [PATCH 025/811] make that libX11 --- easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb index 6e32204779..1f9db83955 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb @@ -15,7 +15,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] dependencies = [ ('libSM', '1.2.1'), ('libICE', '1.0.8'), - ('X11', '1.6.1'), + ('libX11', '1.6.1'), ('kbproto', '1.0.6'), ('xproto', '7.0.23'), ] diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb index 348781dd4b..bd4c414a97 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb @@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] dependencies = [ ('libSM', '1.2.1'), ('libICE', '1.0.8'), - ('X11', '1.6.1'), + ('libX11', '1.6.1'), ('xproto', '7.0.23'), ('kbproto', '1.0.6'), ] -- GitLab From c61c6cd488e5a647301d9d8a5d953484692bf73f Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 10:31:36 +0200 Subject: [PATCH 026/811] added libX11 and libXext as dependencies for motif --- .../easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 2 ++ .../easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 6162154497..eb05340cf5 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -28,6 +28,8 @@ builddependencies = [ ('gettext', '0.18.2'), ('libXp', '1.0.2'), ('printproto', '1.0.5'), + ('libX11', '1.6.1'), + ('libXext', '1.3.2'), ] # The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories #sanity_check_paths = { diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index c10b8bc19a..a0632fed55 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -5,7 +5,7 @@ easyblock = 'ConfigureMake' homepage = 'http://motif.ics.com/' description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchain = {'name': 'ictce', 'version': '4.1.13'} # from the source rpm sources = ['open%(name)s-%(version)s.tar.bz2'] @@ -18,15 +18,20 @@ patches = [ builddependencies = [ + ('printproto', '1.0.5'), +] + +dependencies = [ ('libtool', '2.4.2'), ('libXt', '1.1.4'), ('xbitmaps', '1.1.1'), ('flex', '2.5.35'), ('Bison', '2.7'), - ('Automake','1.13.4'), + ('Automake', '1.13.4'), ('gettext', '0.18.2'), ('libXp', '1.0.2'), - ('printproto', '1.0.5'), + ('libX11', '1.6.1'), + ('libXext', '1.3.2'), ] # The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories #sanity_check_paths = { -- GitLab From 2e874b7973914522684e02900606290884605faf Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 10:49:40 +0200 Subject: [PATCH 027/811] use -fPIC in openmotif --- .../m/motif/motif-2.2.4-goolf-1.4.10.eb | 14 +++++++------- .../m/motif/motif-2.2.4-ictce-4.1.13.eb | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index eb05340cf5..d496ee6f11 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -7,6 +7,7 @@ description = """Motif refers to both a graphical user interface (GUI) specifica applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} # from the source rpm sources = ['open%(name)s-%(version)s.tar.bz2'] @@ -27,17 +28,16 @@ builddependencies = [ ('Automake','1.13.4'), ('gettext', '0.18.2'), ('libXp', '1.0.2'), - ('printproto', '1.0.5'), ('libX11', '1.6.1'), ('libXext', '1.3.2'), ] -# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories -#sanity_check_paths = { -# 'files': [], -# 'dirs': ["."] -#} + +builddependencies = [ + ('printproto', '1.0.5'), +] + premakeopts = "LANG=C " -#preconfigopts = "export ACLOCAL_PATH=$EBROOTLIBTOOL/share/aclocal-1.11/ && autoreconf && ./autogen.sh && make clean && " preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " moduleclass = 'vis' +# make is not parallel safe parallel = 1 diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index a0632fed55..093ac8c5cf 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -6,6 +6,7 @@ homepage = 'http://motif.ics.com/' description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True, 'pic': True} # from the source rpm sources = ['open%(name)s-%(version)s.tar.bz2'] -- GitLab From e4325151834e0fc172efacd824eeed8feca3be56 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 11:20:04 +0200 Subject: [PATCH 028/811] enable building of shared lib's --- .../easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 8 +++++++- .../easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 11 +++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index d496ee6f11..5cfc5c7a71 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -19,7 +19,7 @@ patches = [ ] -builddependencies = [ +dependencies = [ ('libtool', '2.4.2'), ('libXt', '1.1.4'), ('xbitmaps', '1.1.1'), @@ -36,8 +36,14 @@ builddependencies = [ ('printproto', '1.0.5'), ] +sanity_check_paths = { + 'files': ['lib/libXm.so.3'], + 'dirs': [] +} + premakeopts = "LANG=C " preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " +configopts = "--enable-shared" moduleclass = 'vis' # make is not parallel safe parallel = 1 diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index 093ac8c5cf..370e1bc3b4 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -34,13 +34,12 @@ dependencies = [ ('libX11', '1.6.1'), ('libXext', '1.3.2'), ] -# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories -#sanity_check_paths = { -# 'files': [], -# 'dirs': ["."] -#} +sanity_check_paths = { + 'files': ['lib/libXm.so.3'], + 'dirs': [] +} premakeopts = "LANG=C " -#preconfigopts = "export ACLOCAL_PATH=$EBROOTLIBTOOL/share/aclocal-1.11/ && autoreconf && ./autogen.sh && make clean && " preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " +configopts = "--enable-shared" moduleclass = 'vis' parallel = 1 -- GitLab From 7a42a71138a6a36b18126be8c30b45544cfcbaff Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 11:32:32 +0200 Subject: [PATCH 029/811] added xextproto ictce easyconfig --- .../xextproto/xextproto-7.2.1-ictce-4.1.13.eb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..f39b1a0905 --- /dev/null +++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb @@ -0,0 +1,23 @@ +name = 'xextproto' +version = '7.2.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """XExtProto protocol headers.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h', + 'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h', + 'xtestconst.h', 'xtestext1proto.h' + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' -- GitLab From ca47ea7d7315030a38a8cda31602a4a3def76358 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 5 Aug 2013 14:03:50 +0200 Subject: [PATCH 030/811] replace broken libtool with working one --- easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 3 ++- easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 5cfc5c7a71..c7dee065cd 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -42,7 +42,8 @@ sanity_check_paths = { } premakeopts = "LANG=C " -preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " +# motif ships a broken automake and libtool +preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " configopts = "--enable-shared" moduleclass = 'vis' # make is not parallel safe diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index 370e1bc3b4..d19f899d12 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -39,7 +39,8 @@ sanity_check_paths = { 'dirs': [] } premakeopts = "LANG=C " -preconfigopts = "rm -f install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || " +# motif ships a broken automake and libtool +preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " configopts = "--enable-shared" moduleclass = 'vis' parallel = 1 -- GitLab From e547920285e1ee47142e74962fc73e3ca96074ac Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 19 Aug 2013 14:48:42 +0200 Subject: [PATCH 031/811] add easyconfigs for Parallel Python (PP) --- .../PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb | 30 +++++++++++++++++++ .../PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb new file mode 100644 index 0000000000..53d4aebdfe --- /dev/null +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb @@ -0,0 +1,30 @@ +easyblock = "PythonPackage" + +name = 'PP' +version = '1.6.4' + +homepage = 'http://www.parallelpython.com/' +description = """PP is a python module which provides mechanism for parallel execution of python code on SMP +(systems with multiple processors or cores) and clusters (computers connected via network).""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://www.parallelpython.com/downloads/pp/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pythonshortversion] +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb new file mode 100644 index 0000000000..7cae0123b6 --- /dev/null +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb @@ -0,0 +1,30 @@ +easyblock = "PythonPackage" + +name = 'PP' +version = '1.6.4' + +homepage = 'http://www.parallelpython.com/' +description = """PP is a python module which provides mechanism for parallel execution of python code on SMP +(systems with multiple processors or cores) and clusters (computers connected via network).""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://www.parallelpython.com/downloads/pp/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pythonshortversion] +} + +moduleclass = 'lang' -- GitLab From 8366331f7f9ba29b43fc2f940c14a7ea392e2878 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 6 Sep 2013 17:08:26 +0200 Subject: [PATCH 032/811] add imkl easyconfig for 11.1.0.080 + style fixes --- .../i/imkl/imkl-10.2.6.038-32bit.eb | 5 ++-- .../easyconfigs/i/imkl/imkl-10.2.6.038.eb | 5 ++-- .../easyconfigs/i/imkl/imkl-10.3.10.319.eb | 5 ++-- .../easyconfigs/i/imkl/imkl-11.1.0.080.eb | 30 +++++++++++++++++++ 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-32bit.eb b/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-32bit.eb index 17496e5915..6ff37fb0a5 100644 --- a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-32bit.eb +++ b/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-32bit.eb @@ -15,9 +15,10 @@ sources = ['l_mkl_p_%(version)s.tar.gz'] dontcreateinstalldir = 'True' # deps for interface build +compver = '11.1.073-32bit' dependencies = [ - ('icc', '11.1.073-32bit'), - ('ifort', '11.1.073-32bit'), + ('icc', compver), + ('ifort', compver), ('impi', '4.0.0.028-32bit'), ] diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb b/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb index f8105ef53d..a693a15b86 100644 --- a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb +++ b/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb @@ -14,9 +14,10 @@ sources = ['l_mkl_p_%(version)s.tar.gz'] dontcreateinstalldir = 'True' # deps for interface build +compver = '11.1.073' dependencies = [ - ('icc', '11.1.073'), - ('ifort', '11.1.073'), + ('icc', compver), + ('ifort', compver), ('impi', '4.0.0.028'), ] diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb b/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb index 608d782783..b3d47b810d 100644 --- a/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb +++ b/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb @@ -12,9 +12,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mkl_%(version)s_intel64.tgz'] # deps for interface build +compver = '2011.10.319' dependencies = [ - ('icc', '2011.10.319'), - ('ifort', '2011.10.319'), + ('icc', compver), + ('ifort', compver), ('impi', '4.0.2.003'), ] diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb new file mode 100644 index 0000000000..a835fca22a --- /dev/null +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb @@ -0,0 +1,30 @@ +name = 'imkl' +version = '11.1.0.080' + +homepage = 'http://software.intel.com/en-us/intel-mkl/' +description = """Intel Math Kernel Library is a library of highly optimized, + extensively threaded math routines for science, engineering, and financial + applications that require maximum performance. Core math functions include + BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mkl_%(version)s.tgz'] + +# deps for interface build +compver = '2013.sp1.080' +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.1.036') +] + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +interfaces = True + +moduleclass = 'numlib' -- GitLab From 93e95e4aa24336310de83319e5569f31740f8c7c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 6 Sep 2013 17:17:40 +0200 Subject: [PATCH 033/811] add icc and ifort easyconfigs for 2013_sp1.0.080 + style fixes --- .../easyconfigs/i/icc/icc-11.1.073-32bit.eb | 6 +++--- easybuild/easyconfigs/i/icc/icc-11.1.073.eb | 6 +++--- easybuild/easyconfigs/i/icc/icc-11.1.075.eb | 6 +++--- easybuild/easyconfigs/i/icc/icc-2011.10.319.eb | 4 ++-- easybuild/easyconfigs/i/icc/icc-2011.13.367.eb | 4 ++-- easybuild/easyconfigs/i/icc/icc-2011.3.174.eb | 4 ++-- easybuild/easyconfigs/i/icc/icc-2011.6.233.eb | 4 ++-- easybuild/easyconfigs/i/icc/icc-2013.1.117.eb | 4 ++-- easybuild/easyconfigs/i/icc/icc-2013.2.146.eb | 4 ++-- easybuild/easyconfigs/i/icc/icc-2013.3.163.eb | 5 ++--- easybuild/easyconfigs/i/icc/icc-2013.4.183.eb | 5 ++--- easybuild/easyconfigs/i/icc/icc-2013.5.192.eb | 5 ++--- .../easyconfigs/i/icc/icc-2013_sp1.0.080.eb | 17 +++++++++++++++++ .../easyconfigs/i/ifort/ifort-11.1.073-32bit.eb | 6 +++--- easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb | 6 +++--- easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb | 6 +++--- .../easyconfigs/i/ifort/ifort-2011.10.319.eb | 4 ++-- .../easyconfigs/i/ifort/ifort-2011.13.367.eb | 4 ++-- .../easyconfigs/i/ifort/ifort-2011.3.174.eb | 4 ++-- .../easyconfigs/i/ifort/ifort-2011.6.233.eb | 4 ++-- .../easyconfigs/i/ifort/ifort-2013.1.117.eb | 4 ++-- .../easyconfigs/i/ifort/ifort-2013.2.146.eb | 4 ++-- .../easyconfigs/i/ifort/ifort-2013.3.163.eb | 5 ++--- .../easyconfigs/i/ifort/ifort-2013.4.183.eb | 5 ++--- .../easyconfigs/i/ifort/ifort-2013.5.192.eb | 5 ++--- .../easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb | 17 +++++++++++++++++ 26 files changed, 88 insertions(+), 60 deletions(-) create mode 100644 easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb create mode 100644 easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb diff --git a/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb b/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb index d99b8550b8..25d906e87f 100644 --- a/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb +++ b/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb @@ -9,11 +9,9 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_cproc_p_%s.tgz' % version] -## small patch for the installer +# small patch for the installer patches = ['specified-paths.patch'] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file @@ -21,3 +19,5 @@ import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") m32 = True + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-11.1.073.eb b/easybuild/easyconfigs/i/icc/icc-11.1.073.eb index cca27f98ee..270e177a0c 100644 --- a/easybuild/easyconfigs/i/icc/icc-11.1.073.eb +++ b/easybuild/easyconfigs/i/icc/icc-11.1.073.eb @@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_cproc_p_%s.tgz' % version] -## small patch for the installer +# small patch for the installer patches = ['specified-paths.patch'] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-11.1.075.eb b/easybuild/easyconfigs/i/icc/icc-11.1.075.eb index ead27506ae..005adc34f3 100644 --- a/easybuild/easyconfigs/i/icc/icc-11.1.075.eb +++ b/easybuild/easyconfigs/i/icc/icc-11.1.075.eb @@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_cproc_p_%s_intel64.tgz' % version] -## small patch for the installer +# small patch for the installer patches = ['specified-paths.patch'] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb b/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb index 7da3e690e4..e8019bf5f8 100644 --- a/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb +++ b/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_intel64_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb b/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb index 7ae1a1aafb..17d0cd2bbe 100644 --- a/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb +++ b/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb b/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb index 359651488a..cf51e4e41b 100644 --- a/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb +++ b/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_intel64_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb b/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb index 686e02c34f..4079daa6ca 100644 --- a/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb +++ b/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_intel64_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb b/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb index dd5ed9dc3d..818ade63f2 100644 --- a/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb +++ b/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb b/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb index e037b77a5d..086b7132e2 100644 --- a/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb +++ b/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb b/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb index 6cf0697eeb..08d3496656 100644 --- a/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb +++ b/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb @@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_%s.tgz' % version] -# compiler class -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb b/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb index b4b9b50107..8c5cfaeab5 100644 --- a/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb +++ b/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb @@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_%(version)s.tgz'] -# compiler class -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb b/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb index 326e4303ab..3be64f6a79 100644 --- a/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb +++ b/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb @@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_ccompxe_%(version)s.tgz'] -# compiler class -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb new file mode 100644 index 0000000000..af863bb54e --- /dev/null +++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb @@ -0,0 +1,17 @@ +name = 'icc' +version = '2013_sp1.0.080' + +homepage = 'http://software.intel.com/en-us/intel-compilers/' +description = "C and C++ compiler from Intel" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_ccompxe_2013_%(version)s.tgz'] + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb b/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb index f82df2060c..c4b7144887 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb @@ -9,11 +9,9 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_cprof_p_%s.tgz' % version] -## small patch for the installer +# small patch for the installer patches = ['specified-paths.patch'] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file @@ -21,3 +19,5 @@ import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") m32 = True + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb b/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb index 3f25c39122..da0e19e8a7 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb @@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_cprof_p_%s.tgz' % version] -## small patch for the installer +# small patch for the installer patches = ['specified-paths.patch'] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb b/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb index a47f1292cd..f8534d1717 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb @@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_cprof_p_%s_intel64.tgz' % version] -## small patch for the installer +# small patch for the installer patches = ['specified-paths.patch'] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb index 2f99029196..c0ab005da2 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_intel64_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb index 90b6da56be..8d6eeaafb4 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb index 82182ae836..65ff75aa5c 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_intel64_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb index 1347acd620..0749ed0e0c 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_intel64_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb index 49f0ac1b18..99bf3863c6 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb index bfc7da7af9..54b49ddcaf 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_%s.tgz' % version] -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb index aa3ec53ee3..4efd890d23 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb @@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_%s.tgz' % version] -# compiler class -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb index 375028b1ab..05c638d451 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb @@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_%(version)s.tgz'] -# compiler class -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb index 158defc0fc..32705da10f 100644 --- a/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb +++ b/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb @@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_fcompxe_%(version)s.tgz'] -# compiler class -moduleclass = 'compiler' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb new file mode 100644 index 0000000000..dc69a4da5e --- /dev/null +++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb @@ -0,0 +1,17 @@ +name = 'ifort' +version = '2013_sp1.0.080' + +homepage = 'http://software.intel.com/en-us/intel-compilers/' +description = "Fortran compiler from Intel" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_fcompxe_%(version)s.tgz'] + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'compiler' -- GitLab From eb6bd1fc62af2238f419d65fa53d2e1463b986d2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 9 Sep 2013 15:19:14 +0200 Subject: [PATCH 034/811] add easyconfig for WPS 3.5 + libpng/CMake update --- .../c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb | 18 ++++++++++++ .../l/libpng/libpng-1.6.3-ictce-4.1.13.eb | 17 +++++++++++ .../w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb | 29 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..f6b734a958 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb @@ -0,0 +1,18 @@ +name = 'CMake' +version = "2.8.10.2" + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13.eb new file mode 100644 index 0000000000..7cb1ac2c09 --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'libpng' +version = '1.6.3' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb new file mode 100644 index 0000000000..9eebf9dbb8 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb @@ -0,0 +1,29 @@ +name = 'WPS' +version = '3.5' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True} + +sources = ['%sV%s.TAR.gz' % (name, version)] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +patches = ['WPS_netCDF-Fortran_seperate_path.patch'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('zlib', '1.2.7'), + ('libpng', '1.6.3'), + ('JasPer', '1.900.1'), +] + +moduleclass = 'geo' -- GitLab From bc60485ecc6bf3a8d8b1e618534d48b8205d6b23 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Sep 2013 14:45:26 +0200 Subject: [PATCH 035/811] add easyconfig for matplotlib 1.3.0 + freetype/libpng (with custom zlib version for compatibility with Python) --- .../freetype/freetype-2.5.0.1-ictce-4.1.13.eb | 19 ++++++++++ .../libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb | 19 ++++++++++ ...plotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb | 36 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..5e2aa250bc --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb @@ -0,0 +1,19 @@ +name = 'freetype' +version = '2.5.0.1' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +sources = [SOURCE_TAR_GZ] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb new file mode 100644 index 0000000000..5cac7b92a2 --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb @@ -0,0 +1,19 @@ +name = 'libpng' +version = '1.6.3' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +zlibver = '1.2.8' +versionsuffix = '-zlib-%s' % zlibver +dependencies = [('zlib', zlibver)] + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb new file mode 100644 index 0000000000..fb97ddff8b --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -0,0 +1,36 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.0' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of +hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python +and ipython shell, web application servers, and six graphical user interface toolkits. +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +majorversion = "%s.x" % ".".join(version.split('.')[:-1]) +source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +zlibver = '1.2.8' +dependencies = [ + (python, pythonversion), + ('zlib', zlibver), + ('freetype', '2.5.0.1'), + ('libpng', '1.6.3', '-zlib-%s' % zlibver), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion] +} + +moduleclass = 'vis' -- GitLab From 813973d7e1761ed73ffdfe89ce2d4dfd05a33822 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Sep 2013 17:49:51 +0200 Subject: [PATCH 036/811] fix freetype dep version in matplotlib --- .../m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb index fb97ddff8b..bf64592318 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -24,7 +24,7 @@ zlibver = '1.2.8' dependencies = [ (python, pythonversion), ('zlib', zlibver), - ('freetype', '2.5.0.1'), + ('freetype', '2.4.10'), ('libpng', '1.6.3', '-zlib-%s' % zlibver), ] -- GitLab From 9933b5b56b4ec3bffafd246008276c4f90d586c0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Sep 2013 17:51:00 +0200 Subject: [PATCH 037/811] remove troublesome freetype easyconfig --- .../freetype/freetype-2.5.0.1-ictce-4.1.13.eb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb deleted file mode 100644 index 5e2aa250bc..0000000000 --- a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb +++ /dev/null @@ -1,19 +0,0 @@ -name = 'freetype' -version = '2.5.0.1' - -homepage = 'http://freetype.org' -description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and - portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display - servers, font conversion tools, text image generation tools, and many other products as well.""" - -toolchain = {'name': 'ictce', 'version': '4.1.13'} - -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] -sources = [SOURCE_TAR_GZ] - -sanity_check_paths = { - 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], - 'dirs': ['include/freetype2'], -} - -moduleclass = 'vis' -- GitLab From 9817cc96dd1309eafa7261a32cd8eae55661f20b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 20 Sep 2013 17:58:57 +0200 Subject: [PATCH 038/811] add easyconfig for scikit-learn --- ...it-learn-0.14-ictce-4.1.13-Python-2.7.3.eb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..5e0d6b5e2f --- /dev/null +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,28 @@ +easyblock = "PythonPackage" + +name = "scikit-learn" +version = "0.14" + +homepage = 'http://scikit-learn.org/stable/index.html' +description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world, +building upon numpy, scipy, and matplotlib. As a machine-learning module, +it provides versatile tools for data mining and analysis in any field of science and engineering. +It strives to be simple and efficient, accessible to everybody, and reusable in various contexts.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) +dependencies = [ + (python, pythonversion), + ('matplotlib', '1.3.0', versionsuffix), +] + +options = {'modulename': "sklearn"} + +moduleclass = 'data' -- GitLab From 6126e6ec5d087f741773581aa1c9746694da7d0e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 20 Sep 2013 18:32:26 +0200 Subject: [PATCH 039/811] add easyconfigs for numpy, Python 3.3.2, python-dateutil --- .../numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb | 26 +++ ...py-1.7.1_distutils_multiple-lib-dirs.patch | 202 ++++++++++++++++++ .../p/Python/Python-3.3.2-goolf-1.4.10.eb | 44 ++++ .../p/Python/Python-3.3.2-ictce-4.1.13.eb | 44 ++++ .../p/Python/Python-3.3.2-ictce-5.3.0.eb | 44 ++++ ...-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb | 31 +++ ...-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb | 31 +++ 7 files changed, 422 insertions(+) create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch create mode 100644 easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb new file mode 100644 index 0000000000..df7582a273 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb @@ -0,0 +1,26 @@ +name = 'numpy' +version = '1.7.1' + +homepage = 'http://www.numpy.org' +description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things: + a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran + code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses, + NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be + defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +sources = [SOURCE_TAR_GZ] + +patches = ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'] + +python = 'Python' +pyver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch b/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch new file mode 100644 index 0000000000..12501c6754 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch @@ -0,0 +1,202 @@ +diff -ru numpy-1.7.0.orig/numpy/distutils/fcompiler/__init__.py numpy-1.7.0/numpy/distutils/fcompiler/__init__.py +--- numpy-1.7.0.orig/numpy/distutils/fcompiler/__init__.py 2013-02-09 22:04:55.000000000 +0100 ++++ numpy-1.7.0/numpy/distutils/fcompiler/__init__.py 2013-05-13 10:40:59.806346107 +0200 +@@ -626,7 +626,11 @@ + return options + + def library_option(self, lib): +- return "-l" + lib ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib ++ + def library_dir_option(self, dir): + return "-L" + dir + +diff -ru numpy-1.7.0.orig/numpy/distutils/system_info.py numpy-1.7.0/numpy/distutils/system_info.py +--- numpy-1.7.0.orig/numpy/distutils/system_info.py 2013-02-09 22:04:56.000000000 +0100 ++++ numpy-1.7.0/numpy/distutils/system_info.py 2013-05-13 10:48:49.063599772 +0200 +@@ -588,7 +588,7 @@ + if is_string(default): + return [default] + return default +- return [b for b in [a.strip() for a in libs.split(',')] if b] ++ return [b for b in [a.strip().replace(':',',') for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): + return self.get_libs(key, '') +@@ -630,6 +630,23 @@ + lib_dirs) + return info + ++ def check_libs_all(self,lib_dir,libs,opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks for all libraries as shared libraries first, then ++ static (or vice versa if self.search_static_first is True). ++ """ ++ exts = self.library_extensions() ++ info = None ++ for ext in exts: ++ info = self._check_libs_all(lib_dir,libs,opt_libs,[ext]) ++ if info is not None: ++ break ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), lib_dir) ++ return info ++ + def check_libs2(self, lib_dirs, libs, opt_libs=[]): + """If static or shared libraries are available then return + their info dictionary. +@@ -643,6 +660,18 @@ + lib_dirs) + return info + ++ def check_libs2_all(self, lib_dirs, libs, opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks each library for shared or static. ++ """ ++ exts = self.library_extensions() ++ info = self._check_libs_all(lib_dirs,libs,opt_libs,exts) ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), os.pathsep.join(lib_dirs)) ++ return info ++ + def _lib_list(self, lib_dir, libs, exts): + assert is_string(lib_dir) + liblist = [] +@@ -653,6 +682,9 @@ + lib_prefixes = ['lib'] + # for each library name, see if we can find a file for it. + for l in libs: ++ if l[0]=='-': ++ liblist.append(l) ++ continue + for ext in exts: + for prefix in lib_prefixes: + p = self.combine_paths(lib_dir, prefix + l + ext) +@@ -668,6 +700,19 @@ + break + return liblist + ++ def _lib_list_all(self, lib_dirs, libs, exts): ++ assert (type(lib_dirs)==list) ++ if lib_dirs: ++ assert is_string(lib_dirs[0]) ++ liblist=[] ++ for lib_dir in lib_dirs: ++ ls=self._lib_list(lib_dir,libs,exts) ++ for l in ls: ++ log.info("(_lib_list_all) Found %s in %s"%(l,lib_dir)) ++ if l not in liblist: ++ liblist.append(l) ++ return liblist ++ + def _check_libs(self, lib_dirs, libs, opt_libs, exts): + """Find mandatory and optional libs in expected paths. + +@@ -709,6 +754,22 @@ + else: + return None + ++ def _check_libs_all(self, lib_dirs, libs, opt_libs, exts): ++ found_libs_unordered = self._lib_list_all(lib_dirs, libs, exts) ++ # ensure same order as in lib_dirs ++ found_libs = [] ++ for lib_dir in libs: ++ if lib_dir in found_libs_unordered: ++ found_libs.append(lib_dir) ++ if len(found_libs) == len(libs): ++ info = {'libraries' : found_libs, 'library_dirs' : lib_dirs} ++ opt_found_libs = self._lib_list_all(lib_dirs, opt_libs, exts) ++ if len(opt_found_libs) == len(opt_libs): ++ info['libraries'].extend(opt_found_libs) ++ return info ++ else: ++ return ++ + def combine_paths(self, *args): + """Return a list of existing paths composed by all combinations + of items from the arguments. +@@ -944,7 +1005,7 @@ + lib_dirs = self.get_lib_dirs() + incl_dirs = self.get_include_dirs() + mkl_libs = self.get_libs('mkl_libs', self._lib_mkl) +- info = self.check_libs2(lib_dirs, mkl_libs) ++ info = self.check_libs2_all(lib_dirs, mkl_libs) + if info is None: + return + dict_append(info, +@@ -1008,16 +1069,13 @@ + atlas = None + lapack = None + atlas_1 = None +- for d in lib_dirs: +- atlas = self.check_libs2(d, atlas_libs, []) +- lapack_atlas = self.check_libs2(d, ['lapack_atlas'], []) +- if atlas is not None: +- lib_dirs2 = [d] + self.combine_paths(d, ['atlas*', 'ATLAS*']) +- lapack = self.check_libs2(lib_dirs2, lapack_libs, []) +- if lapack is not None: +- break +- if atlas: +- atlas_1 = atlas ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs) ++ lapack_atlas = self.check_libs2_all(lib_dirs, ['lapack_atlas']) ++ if atlas is not None: ++ lib_dirs2 = lib_dirs + self.combine_paths(lib_dirs,['atlas*','ATLAS*']) ++ lapack = self.check_libs2_all(lib_dirs2, lapack_libs) ++ if atlas: ++ atlas_1 = atlas + log.info(self.__class__) + if atlas is None: + atlas = atlas_1 +@@ -1096,7 +1154,7 @@ + info = {} + atlas_libs = self.get_libs('atlas_libs', + self._lib_names + self._lib_atlas) +- atlas = self.check_libs2(lib_dirs, atlas_libs, []) ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs, []) + if atlas is None: + return + include_dirs = self.get_include_dirs() +@@ -1144,7 +1202,7 @@ + lib_dirs = self.get_lib_dirs() + + lapack_libs = self.get_libs('lapack_libs', self._lib_names) +- info = self.check_libs(lib_dirs, lapack_libs, []) ++ info = self.check_libs_all(lib_dirs, lapack_libs, []) + if info is None: + return + info['language'] = 'f77' +@@ -1521,7 +1579,7 @@ + lib_dirs = self.get_lib_dirs() + + blas_libs = self.get_libs('blas_libs', self._lib_names) +- info = self.check_libs(lib_dirs, blas_libs, []) ++ info = self.check_libs_all(lib_dirs, blas_libs, []) + if info is None: + return + info['language'] = 'f77' # XXX: is it generally true? +Only in numpy-1.7.0/numpy/distutils: system_info.py.orig +Only in numpy-1.7.0/numpy/distutils: system_info.py.rej +diff -ru numpy-1.7.0.orig/numpy/distutils/unixccompiler.py numpy-1.7.0/numpy/distutils/unixccompiler.py +--- numpy-1.7.0.orig/numpy/distutils/unixccompiler.py 2013-02-09 22:04:55.000000000 +0100 ++++ numpy-1.7.0/numpy/distutils/unixccompiler.py 2013-05-13 10:40:59.833592000 +0200 +@@ -109,3 +109,12 @@ + + replace_method(UnixCCompiler, 'create_static_lib', + UnixCCompiler_create_static_lib) ++ ++def UnixCCompiler_library_option(self, lib): ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib ++ ++replace_method(UnixCCompiler, 'library_option', ++ UnixCCompiler_library_option) diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..0a4ab2b959 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb @@ -0,0 +1,44 @@ +name = 'Python' +version = '3.3.2' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.1' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.8'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools'], + }), + ('pip', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..38956ed8cb --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb @@ -0,0 +1,44 @@ +name = 'Python' +version = '3.3.2' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.1' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.8'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools'], + }), + ('pip', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..c1fb8acaac --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb @@ -0,0 +1,44 @@ +name = 'Python' +version = '3.3.2' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.1' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.8'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools'], + }), + ('pip', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..6f00563718 --- /dev/null +++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,31 @@ +easyblock = "PythonPackage" + +name = "python-dateutil" +version = "2.1" + +homepage = "https://pypi.python.org/pypi/python-dateutil" +description = """The dateutil module provides powerful extensions to the datetime module available in the Python standard library.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = "2.7.3" + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [(python, pythonversion)] + +py_short_ver = ".".join(pythonversion.split(".")[0:2]) +pylibdir = "lib/python%s/site-packages/%%(name)s" % py_short_ver + +sanity_check_paths = { + 'files': ["%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver)], + 'dirs': [] +} + +options = {'modulename': 'dateutil'} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..fae72a3762 --- /dev/null +++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,31 @@ +easyblock = "PythonPackage" + +name = "python-dateutil" +version = "2.1" + +homepage = "https://pypi.python.org/pypi/python-dateutil" +description = """The dateutil module provides powerful extensions to the datetime module available in the Python standard library.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = "2.7.3" + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [(python, pythonversion)] + +py_short_ver = ".".join(pythonversion.split(".")[0:2]) +pylibdir = "lib/python%s/site-packages/%%(name)s" % py_short_ver + +sanity_check_paths = { + 'files': ["%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver)], + 'dirs': [] +} + +options = {'modulename': 'dateutil'} + +moduleclass = 'lib' -- GitLab From 4662d2e62a09fedf325aef5ab081ca48c3787a00 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 26 Sep 2013 15:54:53 +0200 Subject: [PATCH 040/811] tweaked some things --- .../a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb index 1a348db552..0c80334f22 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb @@ -6,7 +6,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) +toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] sources = [SOURCELOWER_TAR_GZ] @@ -14,9 +14,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [] +} moduleclass = 'devel' -- GitLab From 476344b0cd61892b52d370648d13d202e6495ccc Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 27 Sep 2013 10:29:38 +0200 Subject: [PATCH 041/811] add easyconfigs for WRF/WPS 3.5.1 --- .../w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb | 29 +++++++++++++++ .../w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb | 29 +++++++++++++++ .../w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb | 36 +++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb new file mode 100644 index 0000000000..9eebf9dbb8 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb @@ -0,0 +1,29 @@ +name = 'WPS' +version = '3.5' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True} + +sources = ['%sV%s.TAR.gz' % (name, version)] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +patches = ['WPS_netCDF-Fortran_seperate_path.patch'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('zlib', '1.2.7'), + ('libpng', '1.6.3'), + ('JasPer', '1.900.1'), +] + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb new file mode 100644 index 0000000000..0df4426d34 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb @@ -0,0 +1,29 @@ +name = 'WPS' +version = '3.5.1' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True} + +sources = ['%sV%s.TAR.gz' % (name, version)] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +patches = ['WPS_netCDF-Fortran_seperate_path.patch'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('zlib', '1.2.7'), + ('libpng', '1.6.3'), + ('JasPer', '1.900.1'), +] + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb new file mode 100644 index 0000000000..4a1027a710 --- /dev/null +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb @@ -0,0 +1,36 @@ +name = 'WRF' +version = '3.5.1' + +homepage = 'http://www.wrf-model.org' +description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale + numerical weather prediction system designed to serve both operational forecasting and atmospheric + research needs.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 + +sources = ['%sV%s.TAR.gz' % (name, version)] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +# csh is used by WRF install scripts +builddependencies = [('tcsh', '6.18.01')] + +dependencies = [ + ('JasPer', '1.900.1'), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), +] + +patches = [ + 'WRF_parallel_build_fix.patch', + 'WRF-3.5_netCDF-Fortran_separate_path.patch', + 'WRF_tests_limit-runtimes.patch', +] + +# limit parallel build to 20 +maxparallel = 20 + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +moduleclass = 'geo' -- GitLab From e9709ad47708d87cb30c238c7747eb010885d55f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 27 Sep 2013 17:50:01 +0200 Subject: [PATCH 042/811] add BWA 0.7.4 ictce easyconfig --- .../b/BWA/BWA-0.7.4-ictce-4.1.13.eb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..03f79756d9 --- /dev/null +++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-4.1.13.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB +# Authors:: George Tsouloupas , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'BWA' +version = '0.7.4' + +homepage = 'http://bio-bwa.sourceforge.net/' +description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns + relatively short nucleotide sequences against a long reference sequence such as the human genome.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [('http://sourceforge.net/projects/bio-bwa/files/', 'download')] + +moduleclass = 'bio' -- GitLab From 56930d01b8e3a07495b5dbbdeb7285c514758773 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 30 Sep 2013 18:45:25 +0200 Subject: [PATCH 043/811] added new modules to perl needed for arb + fixed arb --- .../easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 16 +++++++------- .../p/Perl/Perl-5.16.3-goolf-1.4.10.eb | 21 +++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index f43f9ef92b..92535d5df7 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['%(name)ssrc.tgz'] source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] -patches = ['arb_xmkmf.patch'] +patches = ['arb_xmkmf.patch', 'arb_xflags.patch'] dependencies = [ ('libpng', '1.6.2'), @@ -21,16 +21,18 @@ dependencies = [ ('imake', '1.0.5'), ('motif', '2.3.4'), ('libXt', '1.1.4'), - # xmllint + ('motif', '2.3.4'), # libXm + ('libXpm', '3.5.11'), + ('libXaw', '1.0.12'), + ('Perl', '5.16.3'), +#TODO: + #xmllint # optional + #('freeglut', '2.8.1'), # currently fails, see https://github.com/hpcugent/easybuild-easyconfigs/issues/368 # but this is optional anyway - #('freeglut', '2.8.1'), - # xaw # sablotron ] -preconfigopts = 'make || echo this is expected, continuing... ||' premakeopts = "ARBHOME=`pwd` PATH=$ARBHOME/bin:$PATH LD_LIBRARY_PATH=$ARBHOME/LIBLINK:$LD_LIBRARY_PATH" -makeopts = 'all OPENGL=0 V=1' -parallel = 1 +makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support moduleclass = 'bio' diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.16.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Perl/Perl-5.16.3-goolf-1.4.10.eb index f411d03841..150aff629b 100644 --- a/easybuild/easyconfigs/p/Perl/Perl-5.16.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Perl/Perl-5.16.3-goolf-1.4.10.eb @@ -216,6 +216,27 @@ exts_list = [ 'source_tmpl': 'XML-SAX-0.99.tar.gz', 'source_urls': ['http://www.cpan.org/modules/by-module/XML/GRANTM/'], }), + ('Test::Harness', '3.28', { + 'source_tmpl': 'Test-Harness-3.28.tar.gz', + 'source_urls': ['http://cpan.metacpan.org/authors/id/O/OV/OVID'], + }), + ('Test::Simple', '0.98', { + 'source_tmpl': 'Test-Simple-0.98.tar.gz', + 'source_urls': ['http://cpan.metacpan.org/authors/id/M/MS/MSCHWERN'], + }), + ('IO::Tty', '1.10', { + 'source_tmpl': 'IO-Tty-1.10.tar.gz', + 'source_urls': ['http://cpan.metacpan.org/authors/id/T/TO/TODDR'], + }), + ('IPC::Run', '0.92', { + 'source_tmpl': 'IPC-Run-0.92.tar.gz', + 'source_urls': ['http://cpan.metacpan.org/authors/id/T/TO/TODDR'], + }), + ('B::LintSubs', '0.06', { + 'source_tmpl': 'B-LintSubs-0.06.tar.gz', + 'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PEVANS'], + }), + ] moduleclass = 'lang' -- GitLab From e92ea1a01fd7937daea29224490acdf28ebc807c Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 30 Sep 2013 18:59:29 +0200 Subject: [PATCH 044/811] added more xlibs --- easybuild/easyconfigs/a/arb/arb_xflags.patch | 221 ++++++++++++++++++ .../l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb | 32 +++ .../l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb | 32 +++ .../l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb | 31 +++ 4 files changed, 316 insertions(+) create mode 100644 easybuild/easyconfigs/a/arb/arb_xflags.patch create mode 100644 easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/a/arb/arb_xflags.patch b/easybuild/easyconfigs/a/arb/arb_xflags.patch new file mode 100644 index 0000000000..9217dd68b8 --- /dev/null +++ b/easybuild/easyconfigs/a/arb/arb_xflags.patch @@ -0,0 +1,221 @@ +--- Makefile.orig 2013-09-26 16:43:53.016909280 +0200 ++++ Makefile 2013-09-26 16:48:39.953144714 +0200 +@@ -31,7 +31,7 @@ + # configurable in config.makefile + # + # ----------------------------------------------------- +-# Read configuration ++# Read configuration + include config.makefile + + ifeq ($(LD_LIBRARY_PATH),'') +@@ -121,10 +121,10 @@ + + # Enable several warnings + extended_warnings := -Wwrite-strings -Wunused -Wno-aggregate-return -Wshadow +- extended_cpp_warnings := -Wnon-virtual-dtor -Wreorder -Wpointer-arith ++ extended_cpp_warnings := -Wnon-virtual-dtor -Wreorder -Wpointer-arith + ifneq ('$(USING_GCC_3XX)','') + extended_cpp_warnings += -Wdisabled-optimization -Wmissing-format-attribute +- extended_cpp_warnings += -Wmissing-noreturn # -Wfloat-equal ++ extended_cpp_warnings += -Wmissing-noreturn # -Wfloat-equal + endif + ifneq ('$(USING_GCC_4XX)','') + # extended_cpp_warnings += -Wwhatever +@@ -135,7 +135,7 @@ + endif + endif + +-#---------------------- developer ++#---------------------- developer + + ifneq ($(DEVELOPER),ANY) # ANY=default setting (skip all developer specific code) + ifdef dflags +@@ -153,7 +153,7 @@ + endif + + ifeq ($(ARB_64),1) +- dflags += -DARB_64 #-fPIC ++ dflags += -DARB_64 #-fPIC + lflags += + shared_cflags += -fPIC + +@@ -175,7 +175,7 @@ + # build 32-bit ARB version on 64-bit host + CROSS_LIB:=# empty = autodetect below + cflags += -m32 +- lflags += -m32 -m elf_i386 ++ lflags += -m32 -m elf_i386 + else + # build 32-bit ARB version on 32-bit host + CROSS_LIB:=/lib +@@ -214,20 +214,20 @@ + XHOME:=/usr/X11R6 + endif + +-XINCLUDES:=-I$(XHOME)/include ++XINCLUDES:=$(CPPFLAGS) + ifdef DARWIN + XINCLUDES += -I$(OSX_FW)/GLUT.framework/Headers -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5 + +- XLIBS := -L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXp -lXmu -lXi ++ XLIBS := -$(LDFLAGS) L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXp -lXmu -lXi + XLIBS += -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib + XLIBS += -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGLU.dylib:$(OSX_FW_OPENGL)/libGLU.dylib + else +- XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXt -lXext -lX11 ++ XLIBS:=$(LDFLAGS) -L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXt -lXext -lX11 + endif + + #---------------------- open GL + +-ifeq ($(OPENGL),1) ++ifeq ($(OPENGL),1) + cflags += -DARB_OPENGL # activate OPENGL code + GL := gl # this is the name of the OPENGL base target + GL_LIB := -lGL -L$(ARBHOME)/GL/glAW -lglAW +@@ -280,7 +280,7 @@ + endif + endif + +-# ------------------------------------------------------------------------- ++# ------------------------------------------------------------------------- + # Don't put any machine/version/etc conditionals below! + # (instead define variables above) + # ------------------------------------------------------------------------- +@@ -335,9 +335,9 @@ + + lflags:= + +-# ------------------------- +-# Main arb targets: +-# ------------------------- ++# ------------------------- ++# Main arb targets: ++# ------------------------- + + first_target: + $(MAKE) checks +@@ -521,7 +521,7 @@ + + # --------------------- + +-check_setup: check_ENVIRONMENT check_DEBUG check_ARB_64 check_DEVELOPER check_GCC_VERSION ++check_setup: check_ENVIRONMENT check_DEBUG check_ARB_64 check_DEVELOPER check_GCC_VERSION + @echo Your setup seems to be ok. + + checks: check_setup check_tabs +@@ -558,7 +558,7 @@ + cflags:=$(cflags) -DFAKE_VTAB_PTR=char + endif + +-# ------------------------------- ++# ------------------------------- + # old PTSERVER or PTPAN? + + ifeq ($(PTPAN),1) +@@ -583,7 +583,7 @@ + ARCHS_PT_SERVER_LINK = $(ARCHS_PT_SERVER) + endif + +-# ------------------------------- ++# ------------------------------- + # List of all Directories + + ARCHS = \ +@@ -894,7 +894,7 @@ + $(ARCHS_PROBE_COMMON) \ + $(ARCHS_PT_SERVER) \ + +-$(PROBE): $(ARCHS_PROBE_DEPEND:.a=.dummy) shared_libs ++$(PROBE): $(ARCHS_PROBE_DEPEND:.a=.dummy) shared_libs + @SOURCE_TOOLS/binuptodate.pl $@ $(ARCHS_PROBE_LINK) $(ARBDB_LIB) $(ARCHS_CLIENT_PROBE) || ( \ + echo Link $@ ; \ + echo "$(LINK_EXECUTABLE) $@ $(LIBPATH) $(ARCHS_PROBE_LINK) $(ARBDB_LIB) $(ARCHS_CLIENT_PROBE) $(SYSLIBS)" ; \ +@@ -1008,7 +1008,7 @@ + NAMES_COM/server.dummy : comtools + NAMES_COM/client.dummy : comtools + +-com_probe: PROBE_COM/PROBE_COM.dummy ++com_probe: PROBE_COM/PROBE_COM.dummy + com_names: NAMES_COM/NAMES_COM.dummy + com_all: com_probe com_names + +@@ -1151,7 +1151,7 @@ + #******************************************************************************** + + depends: +- $(MAKE) comtools ++ $(MAKE) comtools + @echo "$(SEP) Partially build com interface" + $(MAKE) PROBE_COM/PROBE_COM.depends + $(MAKE) NAMES_COM/NAMES_COM.depends +@@ -1162,10 +1162,10 @@ + depend: depends + + proto_tools: +- @echo $(SEP) Building prototyper ++ @echo $(SEP) Building prototyper + $(MAKE) AISC_MKPTPS/AISC_MKPTPS.dummy + +-#proto: proto_tools TOOLS/TOOLS.dummy ++#proto: proto_tools TOOLS/TOOLS.dummy + proto: proto_tools + @echo $(SEP) Updating prototypes + $(MAKE) \ +@@ -1270,7 +1270,7 @@ + all + @$(MAKE) testperlscripts + +-testperlscripts: ++testperlscripts: + @$(MAKE) -C PERL_SCRIPTS/test test + + perl_clean: +@@ -1346,16 +1346,16 @@ + $(MAKE) all + + tarfile: rebuild +- $(MAKE) addlibs ++ $(MAKE) addlibs + util/arb_compress + + tarfile_quick: all +- $(MAKE) addlibs ++ $(MAKE) addlibs + util/arb_compress + +-save: sourcetarfile ++save: sourcetarfile + +-# test early whether save will work ++# test early whether save will work + testsave: + @util/arb_srclst.pl >/dev/null + +@@ -1377,14 +1377,14 @@ + touch SOURCE_TOOLS/inc_major.stamp + $(MAKE) do_release + +-do_release: ++do_release: + @echo Building release + @echo PATH=$(PATH) + @echo ARBHOME=$(ARBHOME) + -rm arb.tgz arbsrc.tgz + $(MAKE) testsave + $(MAKE) templ # auto upgrades version early +- $(MAKE) tarfile ++ $(MAKE) tarfile + $(MAKE) sourcetarfile + + release_quick: +@@ -1407,7 +1407,7 @@ + arbapplications: nt pa ed e4 wetc pt na nal di ph ds pgt + + # optionally things (no real harm for ARB if any of them fails): +-arbxtras: tg pst a3 xmlin ++arbxtras: tg pst a3 xmlin + + tryxtras: + @echo $(SEP) diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb new file mode 100644 index 0000000000..3c66204e11 --- /dev/null +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb @@ -0,0 +1,32 @@ +name = 'libXaw' +version = '1.0.12' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXaw provides the Athena Widgets toolkit""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +#builddependencies = [ +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +#] + +dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), + ('libXmu', '1.1.2'), + ('libXpm', '3.5.11'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXaw6.a', 'libXaw7.a', 'libXaw.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..e0f7d8c9a5 --- /dev/null +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb @@ -0,0 +1,32 @@ +name = 'libXmu' +version = '1.1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXmu""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +#builddependencies = [ +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +#] + +dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), + ('libXt', '1.1.4'), + ('libXpm', '3.5.11'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + '%(name)s.a', '%(name)s.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb new file mode 100644 index 0000000000..a45233812f --- /dev/null +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb @@ -0,0 +1,31 @@ +name = 'libXpm' +version = '3.5.11' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXp provides the X print library.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +#builddependencies = [ +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +#] + +#dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), +# ('libXau', '1.0.8'), +#] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXpm.a', 'libXpm.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' -- GitLab From c8fc6ee2775926879c4792dd7350fde762a8d3db Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 30 Sep 2013 19:02:00 +0200 Subject: [PATCH 045/811] added libTIFF --- .../l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb new file mode 100644 index 0000000000..2d8ea93b4b --- /dev/null +++ b/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb @@ -0,0 +1,29 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'LibTIFF' +version = '4.0.3' + +homepage = 'http://www.remotesensing.org/libtiff/' +description = "tiff: Library and tools for reading and writing TIFF data files" + +source_urls = ['ftp://ftp.remotesensing.org/pub/libtiff/'] +sources = ['tiff-%(version)s.tar.gz'] + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sanity_check_paths = { + 'files': ['bin/tiffinfo'], + 'dirs': [] +} + +moduleclass = 'lib' -- GitLab From 2325160adad1c4a78b96334b25e13e99c27a49b1 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 30 Sep 2013 20:00:25 +0200 Subject: [PATCH 046/811] bumped libpng version --- .../easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 2 +- .../l/libpng/libpng-1.6.6-goolf-1.4.10.eb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index 92535d5df7..c5dd7299af 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -13,7 +13,7 @@ source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] patches = ['arb_xmkmf.patch', 'arb_xflags.patch'] dependencies = [ - ('libpng', '1.6.2'), + ('libpng', '1.6.6'), ('LibTIFF', '4.0.3'), ('Java', '1.7.0_15', '', True), ('lynx', '2.8.7'), diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb new file mode 100644 index 0000000000..2645812cb1 --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb @@ -0,0 +1,16 @@ +name = 'libpng' +version = '1.6.6' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +toolchainopts = {'optarch': True} +configopts = "--with-pic" + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +moduleclass = 'lib' -- GitLab From caeb051a49a1b25cf247bf2fd55c0be02656ca36 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 30 Sep 2013 20:29:23 +0200 Subject: [PATCH 047/811] export what is needed for arb --- easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index c5dd7299af..abef55439b 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -33,6 +33,6 @@ dependencies = [ # but this is optional anyway # sablotron ] -premakeopts = "ARBHOME=`pwd` PATH=$ARBHOME/bin:$PATH LD_LIBRARY_PATH=$ARBHOME/LIBLINK:$LD_LIBRARY_PATH" +premakeopts = "export ARBHOME=`pwd` && PATH=$ARBHOME/bin:$PATH && LD_LIBRARY_PATH=$ARBHOME/LIBLINK:$LD_LIBRARY_PATH &&" makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support moduleclass = 'bio' -- GitLab From 5bf33449a6a639c3fca2927ee11b90bb1e942dd1 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 30 Sep 2013 23:57:27 +0200 Subject: [PATCH 048/811] add BWA-0.7.4-ictce-5.3.0.eb Signed-off-by: Fotis Georgatos --- .../b/BWA/BWA-0.7.4-ictce-5.3.0.eb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-5.3.0.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..d9514b2450 --- /dev/null +++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-5.3.0.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB +# Authors:: George Tsouloupas , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'BWA' +version = '0.7.4' + +homepage = 'http://bio-bwa.sourceforge.net/' +description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns + relatively short nucleotide sequences against a long reference sequence such as the human genome.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [('http://sourceforge.net/projects/bio-bwa/files/', 'download')] + +moduleclass = 'bio' -- GitLab From 0b2794f242e9900d9a864734c1864b4818ce323e Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 1 Oct 2013 15:46:08 +0200 Subject: [PATCH 049/811] added gettext as dependency for libXpm --- .../easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb index a45233812f..3a250c7936 100644 --- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb @@ -10,10 +10,11 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -#builddependencies = [ +builddependencies = [ + ('gettext', '0.18.2'), # ('xextproto', '7.2.1'), # ('printproto', '1.0.5'), -#] +] #dependencies = [ # ('libX11', '1.6.1'), @@ -21,10 +22,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] # ('libXau', '1.0.8'), #] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXpm.a', 'libXpm.so', - ] - ], + 'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']], 'dirs': [] } -- GitLab From 991bd9a2420e4dd3d0f6f8678bf17049cb594ff5 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 1 Oct 2013 15:47:33 +0200 Subject: [PATCH 050/811] fixed typo on lynx and arb --- easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 1 - .../{lynx-2.8.7-goolfs-1.4.10.eb => lynx-2.8.7-goolf-1.4.10.eb} | 0 2 files changed, 1 deletion(-) rename easybuild/easyconfigs/l/lynx/{lynx-2.8.7-goolfs-1.4.10.eb => lynx-2.8.7-goolf-1.4.10.eb} (100%) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index abef55439b..8e1358ca7a 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -19,7 +19,6 @@ dependencies = [ ('lynx', '2.8.7'), ('makedepend', '1.0.4'), ('imake', '1.0.5'), - ('motif', '2.3.4'), ('libXt', '1.1.4'), ('motif', '2.3.4'), # libXm ('libXpm', '3.5.11'), diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolfs-1.4.10.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb similarity index 100% rename from easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolfs-1.4.10.eb rename to easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb -- GitLab From 1cfa530dca3bdebd452bd8db66a3ff48ef9a4de5 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 1 Oct 2013 17:25:29 +0200 Subject: [PATCH 051/811] added libxslt as dependency for arb --- easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index 8e1358ca7a..bb22d3c587 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -24,6 +24,7 @@ dependencies = [ ('libXpm', '3.5.11'), ('libXaw', '1.0.12'), ('Perl', '5.16.3'), + ('libxslt', '1.1.28'), #TODO: #xmllint # optional -- GitLab From fc1cfb36ae8d486544aa645a30070cc4a7047b59 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 1 Oct 2013 17:54:07 +0200 Subject: [PATCH 052/811] added export for ARBHOME/lib --- easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb index bb22d3c587..732afabc98 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb @@ -33,6 +33,6 @@ dependencies = [ # but this is optional anyway # sablotron ] -premakeopts = "export ARBHOME=`pwd` && PATH=$ARBHOME/bin:$PATH && LD_LIBRARY_PATH=$ARBHOME/LIBLINK:$LD_LIBRARY_PATH &&" +premakeopts = "export ARBHOME=$PWD && export PATH=$ARBHOME/bin:$PATH && export LD_LIBRARY_PATH=$ARBHOME/lib:$ARBHOME:LIBLINK:$LD_LIBRARY_PATH &&" makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support moduleclass = 'bio' -- GitLab From 03f23c1aec825f809e6ce0e45c3e2d11f582a481 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 1 Oct 2013 17:57:51 +0200 Subject: [PATCH 053/811] added ictce parts --- .../easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb | 39 +++++++++++++++++++ .../i/imake/imake-1.0.5-ictce-4.1.13.eb | 22 +++++++++++ .../l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb | 28 +++++++++++++ .../l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb | 31 +++++++++++++++ .../l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb | 31 +++++++++++++++ .../l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb | 28 +++++++++++++ .../l/libpng/libpng-1.6.6-ictce-4.1.13.eb | 16 ++++++++ .../l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb | 21 ++++++++++ .../l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb | 21 ++++++++++ .../l/lynx/lynx-2.8.7-ictce-4.1.13.eb | 17 ++++++++ .../m/motif/motif-2.3.4-ictce-4.1.13.eb | 28 +++++++++++++ .../ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb | 21 ++++++++++ 12 files changed, 303 insertions(+) create mode 100644 easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb new file mode 100644 index 0000000000..8356d5f61c --- /dev/null +++ b/easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb @@ -0,0 +1,39 @@ +name = 'arb' +version = '5.5' + +homepage = 'http://www.arb-home.de/' +description = """The ARB software is a graphically oriented package comprising various tools for sequence database +handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked +to the respective sequence entries is structured according to phylogeny or other user defined criteria.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +sources = ['%(name)ssrc.tgz'] +source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] +patches = ['arb_xmkmf.patch', 'arb_xflags.patch'] + +dependencies = [ + ('libpng', '1.6.6'), + ('LibTIFF', '4.0.3'), + ('Java', '1.7.0_15', '', True), + ('lynx', '2.8.7'), + ('makedepend', '1.0.4'), + ('imake', '1.0.5'), + ('libXt', '1.1.4'), + ('motif', '2.3.4'), # libXm + ('libXpm', '3.5.11'), + ('libXaw', '1.0.12'), + ('Perl', '5.16.3'), + ('libxslt', '1.1.28'), +#TODO: + #xmllint + # optional + #('freeglut', '2.8.1'), + # currently fails, see https://github.com/hpcugent/easybuild-easyconfigs/issues/368 + # but this is optional anyway + # sablotron +] +premakeopts = "export ARBHOME=$PWD && PATH=$ARBHOME/bin:$PATH && LD_LIBRARY_PATH=$ARBHOME/lib:$ARBHOME/LIBLINK:$LD_LIBRARY_PATH &&" +makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support +# makefile doesn't support parallel builds +#parallel = 1 +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb new file mode 100644 index 0000000000..b8e07a9383 --- /dev/null +++ b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb @@ -0,0 +1,22 @@ + +name = 'imake' +version = '1.0.5' + +homepage = 'http://www.x.org/' +description = """imake is a Makefile-generator that is intended to make it easier to develop software portably for multiple systems""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +# For sources line to work correctly with --try-software-version, you MUST employ %s OR use a construct like SOURCE_TAR_GZ +sources = [SOURCE_TAR_GZ] +source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/'] + +sanity_check_paths = { + 'files': ['bin/%s' % binfile for binfile in [ + 'ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf' + ] + ], + 'dirs': [] +} + +# You SHOULD change the following line; Kindly consult other easyconfigs for possible options +moduleclass = 'base' diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb new file mode 100644 index 0000000000..2565ffa38d --- /dev/null +++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb @@ -0,0 +1,28 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'LibTIFF' +version = '4.0.3' + +homepage = 'http://www.remotesensing.org/libtiff/' +description = "tiff: Library and tools for reading and writing TIFF data files" + +source_urls = ['ftp://ftp.remotesensing.org/pub/libtiff/'] +sources = ['tiff-%(version)s.tar.gz'] +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +sanity_check_paths = { + 'files': ['bin/tiffinfo'], + 'dirs': [] +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb new file mode 100644 index 0000000000..f6e584a11d --- /dev/null +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb @@ -0,0 +1,31 @@ +name = 'libXaw' +version = '1.0.12' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXaw provides the Athena Widgets toolkit""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +#builddependencies = [ +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +#] + +dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), + ('libXmu', '1.1.2'), + ('libXpm', '3.5.11'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + 'libXaw6.a', 'libXaw7.a', 'libXaw.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..be57cbdc36 --- /dev/null +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb @@ -0,0 +1,31 @@ +name = 'libXmu' +version = '1.1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXmu""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +#builddependencies = [ +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +#] + +dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), + ('libXt', '1.1.4'), + ('libXpm', '3.5.11'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in [ + '%(name)s.a', '%(name)s.so', + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb new file mode 100644 index 0000000000..0864b663ed --- /dev/null +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb @@ -0,0 +1,28 @@ +name = 'libXpm' +version = '3.5.11' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXp provides the X print library.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ + ('gettext', '0.18.2'), +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +] + +#dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), +# ('libXau', '1.0.8'), +#] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb new file mode 100644 index 0000000000..84e32576dd --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb @@ -0,0 +1,16 @@ +name = 'libpng' +version = '1.6.6' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchainopts = {'optarch': True} +configopts = "--with-pic" + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..6b49f5a896 --- /dev/null +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +easyblock = 'ConfigureMake' + +name = 'libxml2' +version = '2.9.1' + +homepage = 'http://xmlsoft.org/' +description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project + (but usable outside of the Gnome platform).""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +source_urls = [ + 'http://xmlsoft.org/sources/', + 'http://xmlsoft.org/sources/old/' +] +sources = [SOURCELOWER_TAR_GZ] + +configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python' + +dependencies = [('zlib', '1.2.7')] + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb new file mode 100644 index 0000000000..972691efbf --- /dev/null +++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'libxslt' +version = '1.1.28' + +homepage = 'http://xmlsoft.org/' +description = """Libxslt is the XSLT C library developed for the GNOME project + (but usable outside of the Gnome platform).""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +source_urls = [ + 'http://xmlsoft.org/sources/', + 'http://xmlsoft.org/sources/old/' +] + +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('zlib', '1.2.7'), + ('libxml2', '2.9.1'), +] + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb new file mode 100644 index 0000000000..3ea708c6a5 --- /dev/null +++ b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'lynx' +version = '2.8.7' + +description = "lynx is an alphanumeric display oriented World-Wide Web Client" + +sources = ['lynx2.8.7.tar.bz2'] +version = '2.8.7' +name = 'lynx' +source_urls = ['http://lynx.isc.org/release/'] +homepage = 'http://lynx.isc.org/' +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +sanity_check_paths = { + 'files': ['bin/lynx'], + 'dirs': [] +} + +moduleclass = 'base' diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..4455b33349 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb @@ -0,0 +1,28 @@ +name = 'motif' +version = '2.3.4' + +homepage = 'http://motif.ics.com/' +description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building +applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +sources = ['%(name)s-%(version)s-src.tgz'] +source_urls = [SOURCEFORGE_SOURCE] + +dependencies = [ + ('libtool', '2.4.2'), + ('libXt', '1.1.4'), + ('xbitmaps', '1.1.1'), + ('flex', '2.5.35'), + ('Bison', '2.7'), +] +# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories +#sanity_check_paths = { +# 'files': [], +# 'dirs': ["."] +#} + +# You SHOULD change the following line; Kindly consult other easyconfigs for possible options +preconfigopts = "./autogen.sh && " +moduleclass = 'vis' +parallel = 1 diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb new file mode 100644 index 0000000000..3b70d88927 --- /dev/null +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb @@ -0,0 +1,21 @@ +name = 'ncurses' +version = '5.9-20130406' + +homepage = 'http://www.gnu.org/software/ncurses/' +description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, +and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and +function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" + +toolchain = {'name': 'GCC', 'version': '4.7.2'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [ + 'ncurses-5.9.tar.gz', +] +source_urls = [ + 'http://ftpmirror.gnu.org/%s' % name, + 'ftp://invisible-island.net/ncurses/5.9', +] +patches = ['ncurses-5.9-20130406.patch.gz'] + +moduleclass = 'devel' -- GitLab From 200aedd60fc8002b10049e4b8d464cf7575e3370 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:23:10 +0200 Subject: [PATCH 054/811] fix remarks in Autoconf easyconfigs --- .../a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb | 3 ++- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb | 3 +-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb index 352b52ab9e..2a6dea079e 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb index e1977487c5..76a8ff5483 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb @@ -6,7 +6,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb index 7aea8bbf66..53d570ad00 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb @@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb index 0c80334f22..1207288162 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb @@ -6,9 +6,10 @@ description = """Autoconf is an extensible package of M4 macros that produce she configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" + toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb index e7518959e5..5c86ebeadd 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb @@ -7,10 +7,9 @@ description = """Autoconf is an extensible package of M4 macros that produce she systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] -- GitLab From 93e791e190f50d070f3c01e54db704795a26665e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:24:49 +0200 Subject: [PATCH 055/811] fix remarks in Autoconf/Automake easyconfigs --- .../a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb | 8 ++++---- .../easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb | 8 ++++---- .../easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb | 8 ++++---- .../easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb | 4 ++-- .../easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb | 8 ++++---- .../a/Automake/Automake-1.13.4-goolf-1.4.10.eb | 2 +- .../a/Automake/Automake-1.13.4-ictce-4.1.13.eb | 5 +++-- .../easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb | 2 +- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb index 2a6dea079e..7b68488129 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb @@ -15,9 +15,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb index 76a8ff5483..82a404f023 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb @@ -12,9 +12,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb index 53d570ad00..749be4325e 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb @@ -15,9 +15,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb index 1207288162..a41534f1d8 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb @@ -16,8 +16,8 @@ dependencies = [('M4', '1.4.16')] sanity_check_paths = { 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb index 5c86ebeadd..22f54366ee 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb @@ -15,9 +15,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb index e65bc38cf2..5708912031 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb @@ -25,7 +25,7 @@ dependencies = [('Autoconf', '2.69')] sanity_check_paths = { 'files': ['bin/automake', 'bin/aclocal'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb index be7c908b30..e6a35fdebc 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb @@ -18,13 +18,14 @@ description = "Automake: GNU Standards-compliant Makefile generator" source_urls = ['http://ftp.gnu.org/gnu/automake'] sources = [SOURCELOWER_TAR_GZ] -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} dependencies = [('Autoconf', '2.69')] sanity_check_paths = { 'files': ['bin/automake', 'bin/aclocal'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb index 4877c7cc55..a6aed31760 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb @@ -25,7 +25,7 @@ dependencies = [('Autoconf', '2.69')] sanity_check_paths = { 'files': ['bin/automake', 'bin/aclocal'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' -- GitLab From 75b40add041b9aecf594afdc0443c8294783a338 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:29:11 +0200 Subject: [PATCH 056/811] fix (some) remarks in ARB easyconfigs --- .../ARB-5.5-goolf-1.4.10.eb} | 8 ++++++-- .../ARB-5.5-ictce-4.1.13.eb} | 8 ++++++-- .../a/{arb/arb_xflags.patch => ARB/ARB-5.5_xflags.patch} | 0 .../a/{arb/arb_xmkmf.patch => ARB/ARB-5.5_xmkmf.patch} | 0 4 files changed, 12 insertions(+), 4 deletions(-) rename easybuild/easyconfigs/a/{arb/arb-5.5-goolf-1.4.10.eb => ARB/ARB-5.5-goolf-1.4.10.eb} (92%) rename easybuild/easyconfigs/a/{arb/arb-5.5-ictce-4.1.13.eb => ARB/ARB-5.5-ictce-4.1.13.eb} (93%) rename easybuild/easyconfigs/a/{arb/arb_xflags.patch => ARB/ARB-5.5_xflags.patch} (100%) rename easybuild/easyconfigs/a/{arb/arb_xmkmf.patch => ARB/ARB-5.5_xmkmf.patch} (100%) diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb similarity index 92% rename from easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb rename to easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb index 732afabc98..bdf7039f7d 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb @@ -1,4 +1,4 @@ -name = 'arb' +name = 'ARB' version = '5.5' homepage = 'http://www.arb-home.de/' @@ -10,7 +10,11 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['%(name)ssrc.tgz'] source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] -patches = ['arb_xmkmf.patch', 'arb_xflags.patch'] + +patches = [ + '%(name)s-%(version)s_xmkmf.patch', + '%(name)s-%(version)s_xflags.patch', +] dependencies = [ ('libpng', '1.6.6'), diff --git a/easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb similarity index 93% rename from easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb rename to easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index 8356d5f61c..2bbfce994a 100644 --- a/easybuild/easyconfigs/a/arb/arb-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -1,4 +1,4 @@ -name = 'arb' +name = 'ARB' version = '5.5' homepage = 'http://www.arb-home.de/' @@ -9,7 +9,11 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: sources = ['%(name)ssrc.tgz'] source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] -patches = ['arb_xmkmf.patch', 'arb_xflags.patch'] + +patches = [ + '%(name)s-%(version)s_xmkmf.patch', + '%(name)s-%(version)s_xflags.patch', +] dependencies = [ ('libpng', '1.6.6'), diff --git a/easybuild/easyconfigs/a/arb/arb_xflags.patch b/easybuild/easyconfigs/a/ARB/ARB-5.5_xflags.patch similarity index 100% rename from easybuild/easyconfigs/a/arb/arb_xflags.patch rename to easybuild/easyconfigs/a/ARB/ARB-5.5_xflags.patch diff --git a/easybuild/easyconfigs/a/arb/arb_xmkmf.patch b/easybuild/easyconfigs/a/ARB/ARB-5.5_xmkmf.patch similarity index 100% rename from easybuild/easyconfigs/a/arb/arb_xmkmf.patch rename to easybuild/easyconfigs/a/ARB/ARB-5.5_xmkmf.patch -- GitLab From de414a87366444159efca551477b693768f0fd9a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:31:23 +0200 Subject: [PATCH 057/811] fix remarks in imake easyconfigs --- .../i/imake/imake-1.0.5-goolf-1.4.10.eb | 16 ++++++---------- .../i/imake/imake-1.0.5-ictce-4.1.13.eb | 19 ++++++++----------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb index d8927bac33..38d406d02b 100644 --- a/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/i/imake/imake-1.0.5-goolf-1.4.10.eb @@ -1,23 +1,19 @@ - name = 'imake' version = '1.0.5' homepage = 'http://www.x.org/' -description = """imake is a Makefile-generator that is intended to make it easier to develop software portably for multiple systems""" +description = """imake is a Makefile-generator that is intended to make it easier to develop software + portably for multiple systems.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -# For sources line to work correctly with --try-software-version, you MUST employ %s OR use a construct like SOURCE_TAR_GZ sources = [SOURCE_TAR_GZ] source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/'] sanity_check_paths = { - 'files': ['bin/%s' % binfile for binfile in [ - 'ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf' - ] - ], - 'dirs': [] + 'files': ['bin/%s' % binfile for binfile in ['ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', + 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf']], + 'dirs': [], } -# You SHOULD change the following line; Kindly consult other easyconfigs for possible options -moduleclass = 'base' +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb index b8e07a9383..17ce1fd060 100644 --- a/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb @@ -1,22 +1,19 @@ - name = 'imake' version = '1.0.5' homepage = 'http://www.x.org/' -description = """imake is a Makefile-generator that is intended to make it easier to develop software portably for multiple systems""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +description = """imake is a Makefile-generator that is intended to make it easier to develop software + portably for multiple systems.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} -# For sources line to work correctly with --try-software-version, you MUST employ %s OR use a construct like SOURCE_TAR_GZ sources = [SOURCE_TAR_GZ] source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/'] sanity_check_paths = { - 'files': ['bin/%s' % binfile for binfile in [ - 'ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf' - ] - ], - 'dirs': [] + 'files': ['bin/%s' % binfile for binfile in ['ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', + 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf']], + 'dirs': [], } -# You SHOULD change the following line; Kindly consult other easyconfigs for possible options -moduleclass = 'base' +moduleclass = 'devel' -- GitLab From a956c1ae673ec463f9c81d3b97088f02f30d68bc Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:33:44 +0200 Subject: [PATCH 058/811] fix remarks in inputproto easyconfigs --- .../i/inputproto/inputproto-2.3-goolf-1.4.10.eb | 11 +++-------- .../i/inputproto/inputproto-2.3-ictce-4.1.13.eb | 14 +++++--------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb index 8549c315d7..155c39ec04 100644 --- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb @@ -5,18 +5,13 @@ homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """X.org InputProto protocol headers.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] - sanity_check_paths = { - 'files': ['include/X11/extensions/%s' % x for x in [ - 'XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h', - ] - ], - 'dirs': [] + 'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb index a593e205f0..65764f964b 100644 --- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb @@ -3,19 +3,15 @@ version = '2.3' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """X.org InputProto protocol headers.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -toolchainopts = {'optarch': True} + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] - sanity_check_paths = { - 'files': ['include/X11/extensions/%s' % x for x in [ - 'XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h', - ] - ], - 'dirs': [] + 'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' -- GitLab From 8585d53746d049337a8abe12d2088b1e53c1b400 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:34:56 +0200 Subject: [PATCH 059/811] fix remarks in kbproto easyconfigs --- .../k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb | 11 +++-------- .../k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb | 14 +++++--------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb index 4b57f81611..65b4c068d1 100644 --- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb @@ -5,18 +5,13 @@ homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """X.org KBProto protocol headers.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] - sanity_check_paths = { - 'files': ['include/X11/extensions/%s' % x for x in [ - 'XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h', - ] - ], - 'dirs': [] + 'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb index 7cbf3eb5a0..5ad8638fca 100644 --- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb @@ -3,19 +3,15 @@ version = '1.0.6' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """X.org KBProto protocol headers.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -toolchainopts = {'optarch': True} + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] - sanity_check_paths = { - 'files': ['include/X11/extensions/%s' % x for x in [ - 'XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h', - ] - ], - 'dirs': [] + 'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' -- GitLab From 63497f37ce67edf77c1bbb2d5899508431ee0fe2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:40:38 +0200 Subject: [PATCH 060/811] fix remarks in libICE easyconfigs --- .../l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb | 5 +++-- .../l/LibTIFF/LibTIFF-4.0.3-ictce-5.3.0.eb | 2 +- .../l/libICE/libICE-1.0.8-goolf-1.4.10.eb | 14 ++++---------- .../l/libICE/libICE-1.0.8-ictce-4.1.13.eb | 17 ++++++----------- .../l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb | 2 +- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb index 2565ffa38d..1c408bae7f 100644 --- a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb @@ -18,11 +18,12 @@ description = "tiff: Library and tools for reading and writing TIFF data files" source_urls = ['ftp://ftp.remotesensing.org/pub/libtiff/'] sources = ['tiff-%(version)s.tar.gz'] -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sanity_check_paths = { 'files': ['bin/tiffinfo'], - 'dirs': [] + 'dirs': [], } moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-5.3.0.eb index 8d315433dc..b7013b9187 100644 --- a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-5.3.0.eb @@ -23,7 +23,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sanity_check_paths = { 'files': ['bin/tiffinfo'], - 'dirs': [] + 'dirs': [], } moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb index 245e8a65e4..bffb063aa8 100644 --- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb @@ -2,12 +2,9 @@ name = 'libICE' version = '1.0.8' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ -X Inter-Client Exchange library for freedesktop.org -""" +description = """X Inter-Client Exchange library for freedesktop.org""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] @@ -18,11 +15,8 @@ dependencies = [ ] sanity_check_paths = { - 'files' : ['include/X11/ICE/%s' % x for x in [ - 'ICEconn.h', 'ICE.h', 'ICElib.h', 'ICEmsg.h', 'ICEproto.h', 'ICEutil.h', - ] - ], - 'dirs' : [] + 'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']], + 'dirs' : [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb index f08b4f4874..e8b5e70adc 100644 --- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb @@ -2,11 +2,9 @@ name = 'libICE' version = '1.0.8' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ -X Inter-Client Exchange library for freedesktop.org -""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -toolchainopts = {'optarch': True} +description = """X Inter-Client Exchange library for freedesktop.org""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] @@ -17,11 +15,8 @@ dependencies = [ ] sanity_check_paths = { - 'files' : ['include/X11/ICE/%s' % x for x in [ - 'ICEconn.h', 'ICE.h', 'ICElib.h', 'ICEmsg.h', 'ICEproto.h', 'ICEutil.h', - ] - ], - 'dirs' : [] + 'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']], + 'dirs' : [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb index 2d8ea93b4b..1a0ed065bb 100644 --- a/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb @@ -23,7 +23,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sanity_check_paths = { 'files': ['bin/tiffinfo'], - 'dirs': [] + 'dirs': [], } moduleclass = 'lib' -- GitLab From 905cdd79e20134fd1d6f59d01f7bfa97ae0f6014 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 17:56:19 +0200 Subject: [PATCH 061/811] Delete LibTIFF-4.0.3-goolf-1.4.10.eb get rid of LibTIFF file in libTIFF path --- .../l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb deleted file mode 100644 index 1a0ed065bb..0000000000 --- a/easybuild/easyconfigs/l/libTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb +++ /dev/null @@ -1,29 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine -# Authors:: Fotis Georgatos -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/ -## - -name = 'LibTIFF' -version = '4.0.3' - -homepage = 'http://www.remotesensing.org/libtiff/' -description = "tiff: Library and tools for reading and writing TIFF data files" - -source_urls = ['ftp://ftp.remotesensing.org/pub/libtiff/'] -sources = ['tiff-%(version)s.tar.gz'] - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -sanity_check_paths = { - 'files': ['bin/tiffinfo'], - 'dirs': [], -} - -moduleclass = 'lib' -- GitLab From e79fa30fa2d75772eb2c2f0b943f9d3fd863fa2b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Oct 2013 18:04:48 +0200 Subject: [PATCH 062/811] fix remarks in libSM/libX11 easyconfigs --- .../l/LibTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb | 9 +++------ .../easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb | 12 +++++------- .../l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 8 +++----- .../l/libX11/libX11-1.6.1-ictce-4.1.13.eb | 11 +++++------ 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb index 2d8ea93b4b..1a0ed065bb 100644 --- a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-goolf-1.4.10.eb @@ -23,7 +23,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sanity_check_paths = { 'files': ['bin/tiffinfo'], - 'dirs': [] + 'dirs': [], } moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb index 70b0958cef..2297d22ca5 100644 --- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb @@ -2,13 +2,10 @@ name = 'libSM' version = '1.2.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ -X11 Session Management library, which allows for applications to both manage sessions, -and make use of session managers to save and restore their state for later use. -""" +description = """X11 Session Management library, which allows for applications to both manage sessions, + and make use of session managers to save and restore their state for later use.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] @@ -23,7 +20,7 @@ builddependencies = [ sanity_check_paths = { 'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']], - 'dirs' : [] + 'dirs' : [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb index ba56701133..61007b682e 100644 --- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb @@ -2,12 +2,10 @@ name = 'libSM' version = '1.2.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ -X11 Session Management library, which allows for applications to both manage sessions, -and make use of session managers to save and restore their state for later use. -""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -toolchainopts = {'optarch': True} +description = """X11 Session Management library, which allows for applications to both manage sessions, + and make use of session managers to save and restore their state for later use.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] @@ -22,7 +20,7 @@ builddependencies = [ sanity_check_paths = { 'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']], - 'dirs' : [] + 'dirs' : [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb index ea9d45ac3a..935f6ed825 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -2,15 +2,13 @@ name = 'libX11' version = '1.6.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ X11 client-side library""" +description = """X11 client-side library""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] - pythonversion = '-Python-2.7.3' builddependencies = [ ('xextproto', '7.2.1'), @@ -31,7 +29,7 @@ sanity_check_paths = { 'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h', ] ], - 'dirs': [] + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb index 89fe739f16..89cd7c6a13 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb @@ -2,14 +2,13 @@ name = 'libX11' version = '1.6.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ X11 client-side library""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -toolchainopts = {'optarch': True} +description = """X11 client-side library""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] - pythonversion = '-Python-2.7.3' builddependencies = [ ('xextproto', '7.2.1'), @@ -30,7 +29,7 @@ sanity_check_paths = { 'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h', ] ], - 'dirs': [] + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' -- GitLab From dd3129b59e9bb17946608cd599eaa562c4119ec0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 09:04:13 +0200 Subject: [PATCH 063/811] fix remarks in libXau, libXaw, libXext, libXmu, libXp, libXpm, libXt, libpng, libxcb, libxml2, libxslt easyconfigs --- .../l/libXau/libXau-1.0.8-goolf-1.4.10.eb | 12 ++++------ .../l/libXau/libXau-1.0.8-ictce-4.1.13.eb | 15 +++++------- .../l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb | 18 ++++----------- .../l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb | 21 +++++------------ .../l/libXext/libXext-1.3.2-goolf-1.4.10.eb | 4 ++-- .../l/libXext/libXext-1.3.2-ictce-4.1.13.eb | 7 +++--- .../l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb | 16 +++---------- .../l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb | 19 ++++----------- .../l/libXp/libXp-1.0.2-goolf-1.4.10.eb | 7 ++---- .../l/libXp/libXp-1.0.2-ictce-4.1.13.eb | 12 ++++------ .../l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb | 15 +++--------- .../l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb | 18 ++++----------- .../l/libXt/libXt-1.1.4-goolf-1.4.10.eb | 7 +++--- .../l/libXt/libXt-1.1.4-ictce-4.1.13.eb | 10 ++++---- .../l/libpng/libpng-1.6.6-goolf-1.4.10.eb | 7 +++--- .../l/libpng/libpng-1.6.6-ictce-4.1.13.eb | 7 +++--- ...cb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 22 +++++++++--------- .../libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb | 21 +++++++++-------- .../l/libxcb/libxcb-1.8-goolf-1.4.10.eb | 16 ++++++------- .../libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb | 22 +++++++++--------- .../libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb | 21 +++++++++-------- .../libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb | 23 +++++++++---------- ...-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 7 +++--- ...libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb | 7 +++--- .../libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb | 6 ++--- .../libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb | 6 ++--- .../l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb | 1 - .../l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb | 3 ++- .../libxslt-1.1.28-goalf-1.1.0-no-OFED.eb | 6 ++--- .../l/libxslt/libxslt-1.1.28-goolf-1.4.10.eb | 6 ++--- .../l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb | 3 ++- 31 files changed, 150 insertions(+), 215 deletions(-) diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb index c6c2097878..7c2488c42c 100644 --- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb @@ -3,8 +3,7 @@ version = '1.0.8' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """The libXau package contains a library implementing the X11 Authorization Protocol. -This is useful for restricting client access to the display. -""" +This is useful for restricting client access to the display.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} @@ -13,11 +12,8 @@ sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXau.a', 'libXau.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb index 9ea06091ad..a3ce0f8335 100644 --- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb @@ -3,20 +3,17 @@ version = '1.0.8' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """The libXau package contains a library implementing the X11 Authorization Protocol. -This is useful for restricting client access to the display. -""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +This is useful for restricting client access to the display.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXau.a', 'libXau.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb index 3c66204e11..5df92d968d 100644 --- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb @@ -2,7 +2,7 @@ name = 'libXaw' version = '1.0.12' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """libXaw provides the Athena Widgets toolkit""" +description = """libXaw provides the Athena Widgets toolkit""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} @@ -10,23 +10,13 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -#builddependencies = [ -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -#] - dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), ('libXmu', '1.1.2'), ('libXpm', '3.5.11'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXaw6.a', 'libXaw7.a', 'libXaw.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb index f6e584a11d..9810ba8313 100644 --- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb @@ -2,30 +2,21 @@ name = 'libXaw' version = '1.0.12' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """libXaw provides the Athena Widgets toolkit""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +description = """libXaw provides the Athena Widgets toolkit""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -#builddependencies = [ -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -#] - dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), ('libXmu', '1.1.2'), ('libXpm', '3.5.11'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXaw6.a', 'libXaw7.a', 'libXaw.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb index e5fc4e58ab..579e7c6d82 100644 --- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb @@ -22,7 +22,7 @@ sanity_check_paths = { 'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h', ] ], - 'dirs': [] + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb index 4b3efa2917..66aa620785 100644 --- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb @@ -3,7 +3,8 @@ version = '1.3.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """Common X Extensions library""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] @@ -21,7 +22,7 @@ sanity_check_paths = { 'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h', ] ], - 'dirs': [] + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb index e0f7d8c9a5..90518eb8e5 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb @@ -10,23 +10,13 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -#builddependencies = [ -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -#] - dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), ('libXt', '1.1.4'), ('libXpm', '3.5.11'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - '%(name)s.a', '%(name)s.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb index be57cbdc36..fd1b63af98 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb @@ -3,29 +3,20 @@ version = '1.1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """libXmu""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -#builddependencies = [ -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -#] - dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), ('libXt', '1.1.4'), ('libXpm', '3.5.11'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - '%(name)s.a', '%(name)s.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb index 0aa7bd042e..2c5ebf1f94 100644 --- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb @@ -21,11 +21,8 @@ dependencies = [ ('libXau', '1.0.8'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXp.a', 'libXp.so', - ] - ], + 'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']], 'dirs': [] } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb index 7719480732..5675382c34 100644 --- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb @@ -3,7 +3,8 @@ version = '1.0.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """libXp provides the X print library.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] @@ -20,11 +21,8 @@ dependencies = [ ('libXau', '1.0.8'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in [ - 'libXp.a', 'libXp.so', - ] - ], - 'dirs': [] + 'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']], + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb index 3a250c7936..ce7d81eb8d 100644 --- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb @@ -10,20 +10,11 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -builddependencies = [ - ('gettext', '0.18.2'), -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -] +builddependencies = [('gettext', '0.18.2')] -#dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), -# ('libXau', '1.0.8'), -#] sanity_check_paths = { 'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']], - 'dirs': [] + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb index 0864b663ed..1160baf2dd 100644 --- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb @@ -3,26 +3,18 @@ version = '3.5.11' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """libXp provides the X print library.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -builddependencies = [ - ('gettext', '0.18.2'), -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -] +builddependencies = [('gettext', '0.18.2')] -#dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), -# ('libXau', '1.0.8'), -#] sanity_check_paths = { 'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']], - 'dirs': [] + 'dirs': [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb index 1f9db83955..ab2d4419aa 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb @@ -3,8 +3,7 @@ version = '1.1.4' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are -based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation). -""" + based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} @@ -29,7 +28,7 @@ sanity_check_paths = { 'ThreadsI.h', 'VarargsI.h', 'VendorP.h', ] ], - 'dirs' : [] + 'dirs' : [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb index bd4c414a97..a2b0f3bde8 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb @@ -3,9 +3,9 @@ version = '1.1.4' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are -based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation). -""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation).""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] @@ -28,7 +28,7 @@ sanity_check_paths = { 'ThreadsI.h', 'VarargsI.h', 'VendorP.h', ] ], - 'dirs' : [] + 'dirs' : [], } -moduleclass = 'devel' +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb index 2645812cb1..3e4fd3d652 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb @@ -3,14 +3,15 @@ version = '1.6.6' homepage = 'http://www.libpng.org/pub/png/libpng.html' description = "libpng is the official PNG reference library" -toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} -configopts = "--with-pic" +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('zlib', '1.2.7')] +configopts = "--with-pic" + moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb index 84e32576dd..3abbc07090 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb @@ -3,14 +3,15 @@ version = '1.6.6' homepage = 'http://www.libpng.org/pub/png/libpng.html' description = "libpng is the official PNG reference library" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -toolchainopts = {'optarch': True} -configopts = "--with-pic" +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('zlib', '1.2.7')] +configopts = "--with-pic" + moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 8f4fd4b1c7..2b8220d832 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -5,29 +5,29 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} + source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] patches = ['libxcb-no-pthread-stubs.patch'] -toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} - python = 'Python' pyver = '2.7.3' versionsuffix = '-%s-%s' % (python, pyver) dependencies = [ - (python, pyver), - ('xcb-proto', '1.7', versionsuffix) - ] + (python, pyver), + ('xcb-proto', '1.7', versionsuffix), +] preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && " sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'] - } + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb index 684ecca0b6..2f5fe48a09 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb @@ -5,28 +5,29 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +toolchain = {'name': 'goolf', 'version': '1.4.10'} + source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] patches = ['libxcb-no-pthread-stubs.patch'] -toolchain = {'name': 'goolf', 'version': '1.4.10'} python = 'Python' pyver = '2.7.3' versionsuffix = '-%s-%s' % (python, pyver) dependencies = [ - (python, pyver), - ('xcb-proto', '1.7', versionsuffix) - ] + (python, pyver), + ('xcb-proto', '1.7', versionsuffix), +] preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && " sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'] - } + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb index d4af8b0d44..da98dbac0a 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb @@ -5,24 +5,24 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +toolchain = {'name': 'goolf', 'version': '1.4.10'} + source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] patches = ['libxcb-no-pthread-stubs.patch'] -toolchain = {'name': 'goolf', 'version': '1.4.10'} versionsuffix = '' dependencies = [ ('xcb-proto', '1.7', versionsuffix) ] - sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'] - } + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb index c0ddd5581b..954d302dbc 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb @@ -5,29 +5,29 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +toolchain = {'name': 'ictce', 'version': '4.0.6'} + source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] patches = ['libxcb-no-pthread-stubs.patch'] -toolchain = {'name': 'ictce', 'version': '4.0.6'} - python = 'Python' pyver = '2.7.3' versionsuffix = '-%s-%s' % (python, pyver) dependencies = [ - (python, pyver), - ('xcb-proto', '1.7', versionsuffix) - ] + (python, pyver), + ('xcb-proto', '1.7', versionsuffix), +] preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && " sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'] - } + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb index 28db2d290a..2abcb9f275 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb @@ -5,28 +5,29 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} + source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] patches = ['libxcb-no-pthread-stubs.patch'] -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) python = 'Python' pyver = '2.7.3' versionsuffix = '-%s-%s' % (python, pyver) dependencies = [ - (python, pyver), - ('xcb-proto', '1.7', versionsuffix) - ] + (python, pyver), + ('xcb-proto', '1.7', versionsuffix), +] preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && " sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'] - } + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb index a631608a95..174f651302 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb @@ -5,30 +5,29 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +toolchain = {'name': 'ictce', 'version': '5.3.0'} + source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] patches = ['libxcb-no-pthread-stubs.patch'] - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - python = 'Python' pyver = '2.7.3' versionsuffix = '-%s-%s' % (python, pyver) dependencies = [ - (python, pyver), - ('xcb-proto', '1.7', versionsuffix) - ] + (python, pyver), + ('xcb-proto', '1.7', versionsuffix), +] preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && " sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'] - } + 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", + "-randr", "-record", "-render", "-res", "-screensaver", + "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", + "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index c7f6451776..aaf4c869fd 100644 --- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -19,10 +19,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % ('Python', pythonver) - dependencies = [ - ('zlib', '1.2.7'), - ('Python', pythonver), - ] + ('zlib', '1.2.7'), + ('Python', pythonver), +] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb index b010136ea4..d6a8666d27 100644 --- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb @@ -18,10 +18,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % ('Python', pythonver) - dependencies = [ - ('zlib', '1.2.7'), - ('Python', pythonver), - ] + ('zlib', '1.2.7'), + ('Python', pythonver), +] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb index 7f7e1c9580..ddf8c95989 100644 --- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb @@ -20,8 +20,8 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % ('Python', pythonver) dependencies = [ - ('zlib', '1.2.7'), - ('Python', pythonver), - ] + ('zlib', '1.2.7'), + ('Python', pythonver), +] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb index ae23453aac..e014507e31 100644 --- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb @@ -20,8 +20,8 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % ('Python', pythonver) dependencies = [ - ('zlib', '1.2.7'), - ('Python', pythonver), - ] + ('zlib', '1.2.7'), + ('Python', pythonver), +] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb index 31bd6a13ff..5618053aba 100644 --- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb @@ -7,7 +7,6 @@ homepage = 'http://xmlsoft.org/' description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable outside of the Gnome platform).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = [ diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb index 6b49f5a896..b3eac90a51 100644 --- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb @@ -6,7 +6,8 @@ version = '2.9.1' homepage = 'http://xmlsoft.org/' description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable outside of the Gnome platform).""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = [ 'http://xmlsoft.org/sources/', diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb index dd969845e2..5d2945e805 100644 --- a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb @@ -8,9 +8,9 @@ outside of the Gnome platform).""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = [ - 'http://xmlsoft.org/sources/', - 'http://xmlsoft.org/sources/old/' - ] + 'http://xmlsoft.org/sources/', + 'http://xmlsoft.org/sources/old/', +] sources = [SOURCELOWER_TAR_GZ] dependencies = [ diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goolf-1.4.10.eb index cfe732f34f..2489dde795 100644 --- a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goolf-1.4.10.eb @@ -8,9 +8,9 @@ outside of the Gnome platform).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = [ - 'http://xmlsoft.org/sources/', - 'http://xmlsoft.org/sources/old/' - ] + 'http://xmlsoft.org/sources/', + 'http://xmlsoft.org/sources/old/', +] sources = [SOURCELOWER_TAR_GZ] dependencies = [ diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb index 972691efbf..bbdbcf88a1 100644 --- a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb @@ -4,7 +4,8 @@ version = '1.1.28' homepage = 'http://xmlsoft.org/' description = """Libxslt is the XSLT C library developed for the GNOME project (but usable outside of the Gnome platform).""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '5.3.0'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = [ 'http://xmlsoft.org/sources/', -- GitLab From 6e3a733f720dbd6a01dd0e8ae46297c877e6e773 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 09:06:29 +0200 Subject: [PATCH 064/811] fix remarks in lynx easyconfigs --- .../easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb | 13 ++++++------- .../easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb | 14 +++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb index 533739ebbd..272a75abdf 100644 --- a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-goolf-1.4.10.eb @@ -2,17 +2,16 @@ name = 'lynx' version = '2.8.7' description = "lynx is an alphanumeric display oriented World-Wide Web Client" - -sources = ['lynx2.8.7.tar.bz2'] -version = '2.8.7' -name = 'lynx' -source_urls = ['http://lynx.isc.org/release/'] homepage = 'http://lynx.isc.org/' toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://lynx.isc.org/release/'] +sources = ['%(name)s%(version)s.tar.bz2'] + sanity_check_paths = { 'files': ['bin/lynx'], - 'dirs': [] + 'dirs': [], } -moduleclass = 'base' +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb index 3ea708c6a5..85a2cf017b 100644 --- a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb @@ -1,17 +1,17 @@ name = 'lynx' version = '2.8.7' +homepage = 'http://lynx.isc.org/' description = "lynx is an alphanumeric display oriented World-Wide Web Client" -sources = ['lynx2.8.7.tar.bz2'] -version = '2.8.7' -name = 'lynx' +toolchain = {'name': 'ictce', 'version': '4.1.13'} + source_urls = ['http://lynx.isc.org/release/'] -homepage = 'http://lynx.isc.org/' -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +sources = ['%(name)s%(version)s.tar.bz2'] + sanity_check_paths = { 'files': ['bin/lynx'], - 'dirs': [] + 'dirs': [], } -moduleclass = 'base' +moduleclass = 'tools' -- GitLab From 52c3dfc736fc02a809307bae50383712232be34e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 10:25:56 +0200 Subject: [PATCH 065/811] add --without-emacs config opt for gettext to dance around issue with emacs-related packaging screwup --- easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb | 2 ++ .../easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb | 2 ++ .../easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb | 2 ++ .../easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb | 2 ++ easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb | 2 ++ 12 files changed, 24 insertions(+) diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb index 9cef8b5905..7aa8ebc89f 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb index c38d6e2bbb..a02af5a472 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb index e5a82d4348..7b771be38b 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb index 913dc91fd3..6a75826e5b 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'cgoolf', 'version': '1.1.7'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb index e3ebae236c..60cb87e25e 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'gmvolf', 'version': '1.7.12'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb index b0799682df..f6924ebc7b 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb index 0f6781f942..be1d80eb14 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb index 709050c9e4..a3b70c032f 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb index 07a6cab060..acbb710e53 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb index dab0bfd15b..34e274c6bd 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb index 82e57fd278..530e6833bb 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'ictce', 'version': '5.2.0'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb index ca7f3a6f2f..e49e2e384b 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb @@ -11,4 +11,6 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +configopts = '--without-emacs' + moduleclass = 'vis' -- GitLab From 486dcb6810069436b52a058656c000e8a3cdb44b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 11:36:03 +0200 Subject: [PATCH 066/811] add gettext dep for a2ps and use --with-gnu-gettext --- .../a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb | 13 +++++++++---- .../easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb | 13 +++++++++---- .../easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb | 13 +++++++++---- .../easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb | 13 +++++++++---- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb index e9367505bb..a93ac4e406 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb @@ -18,11 +18,16 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/a2ps'] -dependencies = [('gperf', '3.0.4')] +dependencies = [ + ('gettext', '0.18.2'), + ('gperf', '3.0.4'), +] + +configopts = '--with-gnu-gettext' sanity_check_paths = { - 'files': ['bin/a2ps'], - 'dirs': [] - } + 'files': ['bin/a2ps'], + 'dirs': [], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb index 094e4285fd..d6c1a43c1a 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb @@ -18,11 +18,16 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/a2ps'] -dependencies = [('gperf', '3.0.4')] +dependencies = [ + ('gettext', '0.18.2'), + ('gperf', '3.0.4'), +] + +configopts = '--with-gnu-gettext' sanity_check_paths = { - 'files': ['bin/a2ps'], - 'dirs': [] - } + 'files': ['bin/a2ps'], + 'dirs': [], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb index a96af70d8a..6b64a7af7a 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb @@ -18,11 +18,16 @@ toolchain = {'version': '4.0.6', 'name': 'ictce'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/a2ps'] -dependencies = [('gperf', '3.0.4')] +dependencies = [ + ('gettext', '0.18.2'), + ('gperf', '3.0.4'), +] + +configopts = '--with-gnu-gettext' sanity_check_paths = { - 'files': ['bin/a2ps'], - 'dirs': [] - } + 'files': ['bin/a2ps'], + 'dirs': [], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb index 3be8021e45..94e7fdc8bb 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb @@ -19,11 +19,16 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/a2ps'] -dependencies = [('gperf', '3.0.4')] +dependencies = [ + ('gettext', '0.18.2'), + ('gperf', '3.0.4'), +] + +configopts = '--with-gnu-gettext' sanity_check_paths = { - 'files': ['bin/a2ps'], - 'dirs': [] - } + 'files': ['bin/a2ps'], + 'dirs': [], +} moduleclass = 'tools' -- GitLab From 821847c0fcac6b137da4fe62c07c93d67a09a094 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 3 Oct 2013 17:57:47 +0200 Subject: [PATCH 067/811] added patches and diffs --- .../easyconfigs/m/motif/PrintableString.diff | 21 + .../m/motif/XmResizeHashTable.patch | 11 + easybuild/easyconfigs/m/motif/datadir.patch | 555 ++++++++++++ easybuild/easyconfigs/m/motif/mkdir.patch | 11 + .../easyconfigs/m/motif/openmotif-2.2.4.diff | 611 +++++++++++++ .../easyconfigs/m/motif/openmotif-uil.diff | 201 +++++ .../easyconfigs/m/motif/openmotif-xpm.diff | 808 ++++++++++++++++++ .../motif/openmotif22-add_LONG64_define.diff | 10 + .../m/motif/openmotif22-strcmp.diff | 20 + easybuild/easyconfigs/m/motif/sentinel.diff | 128 +++ easybuild/easyconfigs/m/motif/warn.patch | 89 ++ 11 files changed, 2465 insertions(+) create mode 100644 easybuild/easyconfigs/m/motif/PrintableString.diff create mode 100644 easybuild/easyconfigs/m/motif/XmResizeHashTable.patch create mode 100644 easybuild/easyconfigs/m/motif/datadir.patch create mode 100644 easybuild/easyconfigs/m/motif/mkdir.patch create mode 100644 easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff create mode 100644 easybuild/easyconfigs/m/motif/openmotif-uil.diff create mode 100644 easybuild/easyconfigs/m/motif/openmotif-xpm.diff create mode 100644 easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff create mode 100644 easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff create mode 100644 easybuild/easyconfigs/m/motif/sentinel.diff create mode 100644 easybuild/easyconfigs/m/motif/warn.patch diff --git a/easybuild/easyconfigs/m/motif/PrintableString.diff b/easybuild/easyconfigs/m/motif/PrintableString.diff new file mode 100644 index 0000000000..87691b5bc1 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/PrintableString.diff @@ -0,0 +1,21 @@ +--- lib/Xm/TextF.c ++++ lib/Xm/TextF.c +@@ -3723,15 +3723,15 @@ + cache_ptr = tmp = XmStackAlloc(buf_size, cache); + + tmp_str = (wchar_t *)str; +- ret_val = wctomb(tmp, *tmp_str); ++ ret_val = 0; + count = 0; +- while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) ++ while (count < n && buf_size >= MB_CUR_MAX && ++ (ret_val = wctomb(tmp, *tmp_str)) > 0) + { + count += 1; + tmp += ret_val; + buf_size -= ret_val; + tmp_str++; +- ret_val = wctomb(tmp, *tmp_str); + } + + if (ret_val == -1) /* bad character */ diff --git a/easybuild/easyconfigs/m/motif/XmResizeHashTable.patch b/easybuild/easyconfigs/m/motif/XmResizeHashTable.patch new file mode 100644 index 0000000000..5982f72249 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/XmResizeHashTable.patch @@ -0,0 +1,11 @@ +--- lib/Xm/Hash.c ++++ lib/Xm/Hash.c +@@ -198,6 +198,8 @@ + } else { + table -> buckets[index] = current; + } ++ } else { ++ last = current; + } + current = next; + } diff --git a/easybuild/easyconfigs/m/motif/datadir.patch b/easybuild/easyconfigs/m/motif/datadir.patch new file mode 100644 index 0000000000..64e4922111 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/datadir.patch @@ -0,0 +1,555 @@ +--- demos/programs/ButtonBox/Makefile.am ++++ demos/programs/ButtonBox/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/ButtonBox ++pkgdatadir = $(datadir)/Xm/ButtonBox + + bin_PROGRAMS = bboxdemo + EXTRA_DIST = Imakefile + bboxdemo_SOURCES = bboxdemo.c +-data_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/ColorSel/Makefile.am ++++ demos/programs/ColorSel/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Color ++pkgdatadir = $(datadir)/Xm/Color + + bin_PROGRAMS = colordemo + colordemo_SOURCES = bxutil-c.c colordemo.c + EXTRA_DIST = Imakefile +-data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Column/Makefile.am ++++ demos/programs/Column/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Column ++pkgdatadir = $(datadir)/Xm/Column + + bin_PROGRAMS = column + column_SOURCES = column.c + EXTRA_DIST = Imakefile Column.ad +-data_DATA = $(EXTRA_DIST) $(column_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(column_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/DropDown/Makefile.am ++++ demos/programs/DropDown/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/DropDown ++pkgdatadir = $(datadir)/Xm/DropDown + + bin_PROGRAMS = dropdown + EXTRA_DIST = DropDown.ad Imakefile + dropdown_SOURCES = dropdown.c +-data_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Exm/app_in_c/Makefile.am ++++ demos/programs/Exm/app_in_c/Makefile.am +@@ -1,10 +1,9 @@ + MAINTAINERCLEANFILES = Makefile.in + +-bindir = ${prefix}/share/Xm/Exm/app_in_c +-datadir = ${prefix}/share/Xm/Exm/app_in_c ++pkgdatadir = $(datadir)/Xm/Exm/app_in_c + + man_MANS = exm_in_c.man +-bin_PROGRAMS = exm_in_c ++pkgdata_PROGRAMS = exm_in_c + exm_in_c_SOURCES = exm_in_c.c + + EXTRA_DIST = exm_in_c.man Imakefile +--- demos/programs/Exm/simple_app/Makefile.am ++++ demos/programs/Exm/simple_app/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-bindir = ${prefix}/share/Xm/Exm/simple_app +-datadir = ${prefix}/share/Xm/Exm/simple_app ++bindir = @datadir@/Xm/Exm/simple_app ++datadir = @datadir@/Xm/Exm/simple_app + + data_DATA = README + man_MANS = simpleDemo.man +--- demos/programs/FontSel/Makefile.am ++++ demos/programs/FontSel/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/fontsel ++pkgdatadir = $(datadir)/Xm/fontsel + + bin_PROGRAMS = fontsel + fontsel_SOURCES = callbacks-c.c creation-c.c fontsel.c fontsel.h + EXTRA_DIST = Imakefile +-data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/IconB/Makefile.am ++++ demos/programs/IconB/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Icon ++pkgdatadir= $(datadir)/Xm/Icon + + EXTRA_DIST = Imakefile small.bm + bin_PROGRAMS = iconbuttondemo + iconbuttondemo_SOURCES = misc.c iconbuttondemo.c +-data_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/MultiList/Makefile.am ++++ demos/programs/MultiList/Makefile.am +@@ -1,13 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/MultiList ++pkgdatadir = $(datadir)/Xm/MultiList + + bin_PROGRAMS = multilist + SUBDIRS = pixmaps + multilist_SOURCES = bxutil-c.c callbacks-c.c creation.c multilist.c \ + extlist.h + EXTRA_DIST = Imakefile +-data_DATA = $(EXTRA_DIST) $(multilist_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(multilist_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/MultiList/pixmaps/Makefile.am ++++ demos/programs/MultiList/pixmaps/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/MultiList/pixmaps ++pkgdatadir = $(datadir)/Xm/MultiList/pixmaps + + EXTRA_DIST = clown.xbm crab.xpm eye.xpm porsche.xpm stopsign.xpm +-data_DATA = $(EXTRA_DIST) ++pkgdata_DATA = $(EXTRA_DIST) +--- demos/programs/Outline/Makefile.am ++++ demos/programs/Outline/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Outline ++pkgdatadir = $(datadir)/Xm/Outline + + EXTRA_DIST = Imakefile + bin_PROGRAMS = outline + outline_SOURCES = outline.c +-data_DATA = $(outline_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(outline_SOURCES) $(EXTRA_DIST) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Paned/Makefile.am ++++ demos/programs/Paned/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Paned2 ++pkgdatadir = $(datadir)/Xm/Paned2 + + EXTRA_DIST = Imakefile + bin_PROGRAMS = paned + paned_SOURCES = creation-c.c paned.c +-data_DATA = $(EXTRA_DIST) $(paned_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(paned_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/TabStack/Makefile.am ++++ demos/programs/TabStack/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Tabstack ++pkgdatadir = $(datadir)/Xm/Tabstack + + bin_PROGRAMS = tabstack + tabstack_SOURCES = bxutils.c callbacks.c creation.c main.c creation.h + EXTRA_DIST = Imakefile +-data_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/Tree/Makefile.am ++++ demos/programs/Tree/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Tree ++pkgdatadir = $(datadir)/Xm/Tree + + EXTRA_DIST = Imakefile + bin_PROGRAMS = tree + tree_SOURCES = bxutil-c.c tree.c +-data_DATA = $(EXTRA_DIST) $(tree_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(tree_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/airport/Makefile.am ++++ demos/programs/airport/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/airport ++pkgdatadir = $(datadir)/Xm/airport + + bin_PROGRAMS = airport + airport_SOURCES = main.c dragsource.c dropsite.c airport.h \ + dragsource.h dropsite.h main.h + EXTRA_DIST = Imakefile XmdAirport.ad README +-data_DATA = $(airport_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(airport_SOURCES) $(EXTRA_DIST) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/animate/Makefile.am ++++ demos/programs/animate/Makefile.am +@@ -1,6 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/animate ++pkgdatadir = $(datadir)/Xm/animate ++uiddir = $(datadir)/X11/uid + + EXTRA_DIST = dog.uil plane.uil superman.uil xmanimate.uil \ + superman1.xbm superman2.xbm superman3.xbm superman4.xbm \ +@@ -11,8 +12,8 @@ + + CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid + +-data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ +- $(EXTRA_DIST) ++pkgdata_DATA = $(xmanimate_SOURCES) $(EXTRA_DIST) ++uid_DATA = dog.uid plane.uid superman.uid xmanimate.uid + + bin_PROGRAMS = xmanimate + +--- demos/programs/draw/Makefile.am ++++ demos/programs/draw/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/draw ++pkgdatadir = $(datadir)/Xm/draw + + bin_PROGRAMS = draw + draw_SOURCES = draw.c + EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man +-data_DATA = $(EXTRA_DIST) $(draw_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(draw_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/earth/Makefile.am ++++ demos/programs/earth/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/earth ++pkgdatadir = $(datadir)/Xm/earth + + bin_PROGRAMS = earth + earth_SOURCES = earth.c + EXTRA_DIST = terre.xbm earth.man Imakefile README +-data_DATA = $(EXTRA_DIST) $(earth_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(earth_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/filemanager/Makefile.am ++++ demos/programs/filemanager/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/filemanager ++pkgdatadir = $(datadir)/Xm/filemanager + + bin_PROGRAMS = filemanager + filemanager_SOURCES = filemanager.c actions.c readdir.c convert.c \ +@@ -9,7 +9,7 @@ + Imakefile code.xpm dir.xpm exec.xpm file.xpm none.xpm \ + obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \ + s_none.xpm s_pix.xpm +-data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} + +--- demos/programs/fileview/Makefile.am ++++ demos/programs/fileview/Makefile.am +@@ -1,12 +1,14 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/fileview ++pkgdatadir = $(datadir)/Xm/fileview ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = fileview + fileview_SOURCES = main.c text.c file.c file.h fileE.h fileview.h main.h \ + mainE.h text.h textE.h + EXTRA_DIST = $(UILS) English.df French.df German.df README Fileview.ad +-data_DATA = French.uid German.uid English.uid $(fileview_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(fileview_SOURCES) $(EXTRA_DIST) ++uid_DATA = French.uid German.uid English.uid + + UILS= French.uil German.uil English.uil + +--- demos/programs/getsubres/Makefile.am ++++ demos/programs/getsubres/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/getsubres ++pkgdatadir = $(datadir)/Xm/getsubres + + bin_PROGRAMS = getsubres + EXTRA_DIST = getsubres.help getsubres.man README Imakefile + getsubres_SOURCES = getsubres.c +-data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/hellomotif/Makefile.am ++++ demos/programs/hellomotif/Makefile.am +@@ -1,11 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/hellomotif ++pkgdatadir = $(datadir)/Xm/hellomotif ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = hellomotif + EXTRA_DIST = hellomotif.uil Imakefile README + hellomotif_SOURCES = hellomotif.c +-data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid ++pkgdata_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) ++uid_DATA = hellomotif.uid + LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} + +--- demos/programs/hellomotifi18n/Makefile.am ++++ demos/programs/hellomotifi18n/Makefile.am +@@ -1,13 +1,15 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/helloint ++pkgdatadir = $(datadir)/Xm/helloint ++uiddir = $(datadir)/X11/uid + + SUBDIRS = C english french hebrew japan japanese swedish + EXTRA_DIST = README helloint.uil Imakefile helloint.man + CLEANFILES = helloint.uid + helloint_SOURCES = helloint.c + bin_PROGRAMS = helloint +-data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid ++pkgdata_DATA = $(EXTRA_DIST) $(helloint_SOURCES) ++uid_DATA = helloint.uid + helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid + + INCLUDES = -I$(top_srcdir)/lib ${X_CFLAGS} +--- demos/programs/i18ninput/Makefile.am ++++ demos/programs/i18ninput/Makefile.am +@@ -1,12 +1,12 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/i18ninput ++pkgdatadir = $(datadir)/Xm/i18ninput + + bin_PROGRAMS = i18ninput + i18ninput_SOURCES = i18ninput.c input.c + EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help \ + Imakefile +-data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/panner/Makefile.am ++++ demos/programs/panner/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/panner ++pkgdatadir = $(datadir)/Xm/panner + + bin_PROGRAMS = panner + panner_SOURCES = panner.c + EXTRA_DIST = README panner.man Imakefile +-data_DATA = $(EXTRA_DIST) $(panner_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(panner_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/periodic/Makefile.am ++++ demos/programs/periodic/Makefile.am +@@ -1,11 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/periodic ++pkgdatadir = $(datadir)/Xm/periodic ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = periodic + EXTRA_DIST = periodic.uil periodic_l.uil XmdPeriodic.ad Imakefile README + periodic_SOURCES = periodic.c +-data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid ++pkgdata_DATA = $(EXTRA_DIST) $(periodic_SOURCES) ++uid_DATA = periodic.uid + LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/piano/Makefile.am ++++ demos/programs/piano/Makefile.am +@@ -1,12 +1,12 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/piano ++pkgdatadir = $(datadir)/Xm/piano + + bin_PROGRAMS = piano + piano_SOURCES = piano.c + EXTRA_DIST = piano.images README Inv8_part1.piano Inv8_part2.piano \ + piano.man Imakefile +-data_DATA = $(EXTRA_DIST) $(piano_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(piano_SOURCES) + LDADD = ../../../lib/Xm/libXm.la -lm + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/pixmaps/Makefile.am ++++ demos/programs/pixmaps/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/pixmaps ++pkgdatadir = $(datadir)/Xm/pixmaps + + EXTRA_DIST = crab.xpm eye.xpm porsche.xpm stopsign.xpm clown.xbm + +-data_DATA = $(EXTRA_DIST) ++pkgdata_DATA = $(EXTRA_DIST) +--- demos/programs/popups/Makefile.am ++++ demos/programs/popups/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/autopopups ++pkgdatadir = $(datadir)/Xm/autopopups + + bin_PROGRAMS = autopopups + autopopups_SOURCES = autopopups.c + EXTRA_DIST = README autopopups.man Imakefile +-data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/sampler2_0/Makefile.am ++++ demos/programs/sampler2_0/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/sampler2_0 ++pkgdatadir = $(datadir)/Xm/sampler2_0 + + EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ + labir.xpm main.xpm pile.xpm prev.xpm spir.xpm stack.xpm \ +@@ -8,7 +8,7 @@ + XmdSampler2_0.ad + bin_PROGRAMS = sampler2_0 + sampler2_0_SOURCES = sampler2_0.c +-data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/setdate/Makefile.am ++++ demos/programs/setdate/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/setDate ++pkgdatadir = $(datadir)/Xm/setDate + + bin_PROGRAMS = setDate + EXTRA_DIST = XmdSetDate.ad README setDate.man Imakefile + setDate_SOURCES = setDate.c +-data_DATA = $(EXTRA_DIST) $(setDate_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(setDate_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/todo/Makefile.am ++++ demos/programs/todo/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/todo ++pkgdatadir = $(datadir)/Xm/todo + + EXTRA_DIST = README XmdTodo.ad example.todo todo.man todo.help Imakefile + bin_PROGRAMS = todo + todo_SOURCES = todo.c io.c actions.c page.h +-data_DATA = $(EXTRA_DIST) $(todo_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(todo_SOURCES) + + INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} + LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la +--- demos/programs/tooltips/Makefile.am ++++ demos/programs/tooltips/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/tooltips ++pkgdatadir = $(datadir)/Xm/tooltips + + EXTRA_DIST = Imakefile + bin_PROGRAMS = tooltips + tooltips_SOURCES = tooltips.c +-data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/workspace/Makefile.am ++++ demos/programs/workspace/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/wsm ++pkgdatadir = $(datadir)/Xm/wsm + + EXTRA_DIST = Imakefile README wsm.man + bin_PROGRAMS = wsm +@@ -8,6 +8,6 @@ + wsmSend.c wsmStruct.c wsm_cb.c wsm_create.c xrmLib.c \ + command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \ + wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h +-data_DATA = $(wsm_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(wsm_SOURCES) $(EXTRA_DIST) + INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} + LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm diff --git a/easybuild/easyconfigs/m/motif/mkdir.patch b/easybuild/easyconfigs/m/motif/mkdir.patch new file mode 100644 index 0000000000..ca5787bf45 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/mkdir.patch @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2004-10-13 19:58:10.000000000 +0200 ++++ Makefile.in 2013-08-02 12:20:30.518131626 +0200 +@@ -405,7 +405,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ ++mkdir_p = mkdir -p -- . + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ diff --git a/easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff b/easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff new file mode 100644 index 0000000000..9aa3db8a9c --- /dev/null +++ b/easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff @@ -0,0 +1,611 @@ +--- Makefile.am ++++ Makefile.am +@@ -28,6 +28,5 @@ + include \ + tools \ + clients \ +- doc \ +- demos +-AUTOMAKE_OPTIONS = 1.4 ++ doc ++AUTOMAKE_OPTIONS = 1.4 foreign +--- clients/uil/Makefile.am ++++ clients/uil/Makefile.am +@@ -6,7 +6,7 @@ + # + bin_PROGRAMS = uil + +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++libUil_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + + UilParser.lo: UilParser.c + $(LTCOMPILE) -DCALLABLE -c UilParser.c +@@ -42,7 +42,7 @@ + UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c + + SRCS = $(COMMON_SRC) +-SRCS2 = $(COMMON_SRC) UilMain.c ++SRCS2 = UilMain.c + + HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ + UilDef.h XmAppl.uil +@@ -72,6 +72,7 @@ + $(LN_S) $(srcdir)/../../tools/wml/UilDBDef.h UilDBDef.h + + uil_SOURCES = $(SRCS2) ++uil_LDADD += libUil.la + + if MessageCatalog + +--- config/cf/Imake.cf ++++ config/cf/Imake.cf +@@ -570,6 +570,9 @@ + # ifdef i386 + # define i386Architecture + # undef i386 ++# undef i486 ++# undef i586 ++# undef i686 + # endif /* i386 */ + # ifdef __i386__ + # ifndef i386Architecture +@@ -593,6 +596,32 @@ + # define PowerPCArchitecture + # undef powerpc + # endif ++# ifdef __s390__ ++# define s390Architecture ++# undef __s390__ ++# endif ++# ifdef __s390x__ ++# define s390xArchitecture ++# undef __s390x__ ++# endif ++# ifdef __x86_64__ ++# define x86_64Architecture ++# undef __x86_64__ ++# endif ++# ifdef mips ++# define MipsArchitecture ++# undef mips ++# endif ++# ifdef sparc ++# define SparcArchitecture ++# undef sparc ++# endif ++# ifdef __sparc__ ++# ifndef SparcArchitecture ++# define SparcArchitecture ++# endif ++# undef __sparc__ ++# endif + # if defined(arm) || defined(__arm__) + # define ArmArchitecture + # undef arm +@@ -607,6 +636,10 @@ + # undef __ARM_ARCH_3__ + # endif + # endif ++# ifdef __ia64__ ++# define ia64Architecture ++# undef __ia64__ ++# endif /* __ia64__ */ + #endif /* linux */ + + #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) +--- config/cf/Imake.tmpl ++++ config/cf/Imake.tmpl +@@ -502,14 +502,18 @@ + #define DefaultUsrBin /usr/bin + #endif + ++#ifndef LibDirName ++# define LibDirName lib ++#endif ++ + #ifndef UsrLibDir + #ifdef ProjectRoot +-#define UsrLibDir Concat(ProjectRoot,/lib) ++#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir /usr/lib ++#define UsrLibDir Concat(/usr/,LibDirName) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +--- config/cf/linux.cf ++++ config/cf/linux.cf +@@ -41,8 +41,9 @@ + /* Set some defaults for the Default* values in case imake doesn't find them */ + #ifndef DefaultLinuxCLibMajorVersion + #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ +- defined(SparcArchitecture) || defined(ArmArchitecure) || \ +- defined(i386Architecture) ++ defined(SparcArchitecture) || defined(ArmArchitecure) || defined(MipsArchitecure) || \ ++ defined(i386Architecture) || defined(ia64Architecture) || defined(s390Architecture) || \ ++ defined(s390xArchitecture) || defined(x86_64Architecture) + #define DefaultLinuxCLibMajorVersion 6 + #else + #define DefaultLinuxCLibMajorVersion 5 +@@ -159,7 +160,24 @@ + #define UseStaticTermcapLib NO + #endif + ++#ifndef HaveLib64 ++# if defined (x86_64Architecture) || defined (s390xArchitecture) ++# define HaveLib64 YES ++# else ++# define HaveLib64 NO ++# endif ++#endif ++ + #define MkdirHierCmd mkdir -p ++ ++#ifndef HaveLib64 ++# if defined (x86_64Architecture) || defined (s390xArchitecture) ++# define HaveLib64 YES ++# else ++# define HaveLib64 NO ++# endif ++#endif ++ + #if LinuxElfDefault + #if UseElfFormat + #define CcCmd gcc +@@ -234,7 +252,7 @@ + #endif + #define CppCmd /lib/cpp + #ifdef USE_BYACC +-#define YaccCmd byacc ++#define YaccCmd yacc + #else + #define YaccCmd bison -y + #endif +@@ -261,6 +279,35 @@ + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 + #endif /* AlphaArchitecture */ + ++#ifdef s390xArchitecture ++#define DefaultCCOptions -fsigned-char ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__s390x__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#else ++#ifdef s390Architecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__s390__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#endif /* s390Architecture */ ++#endif /* s390xArchitecture */ ++ ++#ifdef ia64Architecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__ia64__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* ia64Architecture */ ++ ++#ifdef x86_64Architecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__x86_64__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* ia64Architecture */ ++ + #ifdef Mc68020Architecture + #define OptimizedCDebugFlags -O2 + #define LinuxMachineDefines -D__mc68000__ +@@ -276,6 +323,14 @@ + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines + #endif /* PowerPCArchitecture */ + ++#ifdef MipsArchitecture ++#define DefaultCCOptions -fsigned-char ++#define OptimizedCDebugFlags -O2 -mips2 ++#define LinuxMachineDefines -D__mips__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#endif /* MipsArchitecture */ ++ + #ifdef ArmArchitecture + #define DefaultCCOptions -fsigned-char + #define OptimizedCDebugFlags -O2 +@@ -284,6 +339,19 @@ + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines + #endif /* Arm */ + ++#ifdef SparcArchitecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__sparc__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#define AsVISOption -Av9a ++#ifdef Sparc64Architecture ++#define AsOutputArchSize 64 ++#else ++#define AsOutputArchSize 32 ++#endif ++#endif ++ + #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines + + #ifndef TermcapLibrary +@@ -348,5 +416,11 @@ + #define MakeNamedTargetSubdir(dir,flags,subname)\ + $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname + ++#if HaveLib64 ++# ifndef LibDirName ++# define LibDirName lib64 ++# endif ++#endif ++ + #include + #include +--- config/imake/imakemdep.h ++++ config/imake/imakemdep.h +@@ -333,6 +333,18 @@ + # ifdef __i386__ + "-D__i386__", + # endif ++# ifdef __ia64__ ++ "-D__ia64__", ++# endif ++# ifdef __s390__ ++ "-D__s390__", ++# endif ++# ifdef __s390x__ ++ "-D__s390x__", ++# endif ++# ifdef __x86_64__ ++ "-D__x86_64__", ++# endif + # ifdef __sparc__ + "-D__sparc__", + # endif +@@ -936,6 +948,18 @@ + #ifdef __alpha__ + {"__alpha__", "1"}, + #endif ++#ifdef __ia64__ ++ {"__ia64__", "1"}, ++#endif ++#ifdef __x86_64__ ++ {"__x86_64__", "1"}, ++#endif ++#ifdef __s390__ ++ {"__s390__", "1"}, ++#endif ++#ifdef __s390x__ ++ {"__s390x__", "1"}, ++#endif + #ifdef __DECC + {"__DECC", "1"}, + #endif +--- configure.in ++++ configure.in +@@ -53,12 +53,13 @@ + save_CFLAGS="$CFLAGS" + LIBS="$X_LIBS $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" +-AC_CHECK_HEADERS(X11/Xmu/Editres.h, +-AC_CHECK_LIB(Xmu, _XEditResCheckMessages, ++AC_CHECK_HEADERS(X11/Xmu/Editres.h, [ ++AC_CHECK_LIB(Xmu, _XEditResCheckMessages, [ + X_XMU=-lXmu +-AC_DEFINE(HAVE_LIBXMU) +-, X_XMU="", -lXt -lX11) +-) ++AC_DEFINE(HAVE_LIBXMU, 1, [ ]) ++], X_XMU="", -lXt -lX11) ++], [], ++[#include ]) + AC_SUBST(X_XMU) + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +@@ -140,8 +141,8 @@ + AC_HEADER_STDC + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/malloc.h strings.h sys/file.h sys/time.h unistd.h wchar.h) +-AC_CHECK_HEADERS(wctype.h, AC_DEFINE(HAS_WIDECHAR_FUNCTIONS)) +-AC_CHECK_HEADER(langinfo.h,,AC_DEFINE(CSRG_BASED)) ++AC_CHECK_HEADERS(wctype.h, [AC_DEFINE(HAS_WIDECHAR_FUNCTIONS, 1, [Define if wctype.h is available])]) ++AC_CHECK_HEADER(langinfo.h,,[AC_DEFINE(CSRG_BASED, 1, [ ])]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +@@ -164,23 +165,23 @@ + AC_FUNC_VPRINTF + AM_FUNC_VOID_SPRINTF + AC_CHECK_FUNCS(wcslen wcscpy wcsncpy wcschr wcscat wcsncat getcwd gettimeofday mkdir re_comp regcmp select strcspn strerror strstr strtod strtol uname) +-AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP)) +-AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP)) +-AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV)) +-AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP)) +-AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE)) ++AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP, 1, [ ])) ++AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP, 1, [ ])) ++AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV, 1, [ ])) ++AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP, 1, [ ])) ++AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE, 1, [ ])) + + AC_ARG_ENABLE(message-catalog, [ --enable-message-catalog + Enable building of the message catalog (default=no)]) + if test "$enable_message_catalog" != "yes" + then +- AC_DEFINE(NO_MESSAGE_CATALOG) ++ AC_DEFINE(NO_MESSAGE_CATALOG, 1, [define to avoid building the message catalog]) + fi + AM_CONDITIONAL(MessageCatalog, test x$enable_message_catalog = xyes) + + if test -f $srcdir/lib/Xm/SlideC.h + then +- AC_DEFINE(HAVE_SLIDEC_H) ++ AC_DEFINE(HAVE_SLIDEC_H, 1, [ ]) + SLIDE_DIST="SlideC.c SlideC.h SlideCP.h" + fi + AC_SUBST(SLIDE_DIST) +@@ -190,7 +191,7 @@ + then + CFLAGS="$CFLAGS -Wall -Wno-unused -Wno-comment" + fi +-AC_DEFINE(NO_OL_COMPAT) ++AC_DEFINE(NO_OL_COMPAT, 1, [Define to disable OpenLook compatibility]) + + CDE_INSTALLATION_TOP="\${prefix}/dt" + AC_SUBST(CDE_INSTALLATION_TOP) +@@ -198,13 +199,13 @@ + CDE_CONFIGURATION_TOP="\${prefix}/etc/dt" + AC_SUBST(CDE_CONFIGURATION_TOP) + +-LIBDIR="${libdir}/X11" ++LIBDIR="${datadir}/X11" + AC_SUBST(LIBDIR) + + INCDIR="${includedir}/X11" + AC_SUBST(INCDIR) + +-XMBINDDIR_FALLBACK="${libdir}/X11/bindings" ++XMBINDDIR_FALLBACK="${datadir}/X11/bindings" + AC_SUBST(XMBINDDIR_FALLBACK) + + case "$target_os" in +--- demos/programs/Column/column.c ++++ demos/programs/Column/column.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + + #define phone_width 16 +--- demos/programs/DropDown/dropdown.c ++++ demos/programs/DropDown/dropdown.c +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + static int done = 0; + +--- demos/programs/getsubres/getsubres.c ++++ demos/programs/getsubres/getsubres.c +@@ -384,7 +384,8 @@ + } + + static String fallbacks[] = { +- "*help_manager.helpFile: getsubres" ++ "*help_manager.helpFile: getsubres", ++ NULL + }; + + #define APP_CLASS "XmdGetsubres" +--- lib/Mrm/Makefile.am ++++ lib/Mrm/Makefile.am +@@ -8,7 +8,7 @@ + + libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} + +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + + lib_LTLIBRARIES = libMrm.la + +--- lib/Mrm/MrmIheader.c ++++ lib/Mrm/MrmIheader.c +@@ -226,12 +226,7 @@ + file_id, NULL, MrmNOT_VALID); + } + +- { +- /* sscanf() may call ungetc(), which would write the XmConst string. */ +- char buf[XtNumber(idb__database_version) + 1]; +- strcpy(buf, idb__database_version); +- sscanf(buf, "URM %d.%d", &db_major, &db_minor); +- } ++ sscanf(idb__database_version, "URM %d.%d", &db_major, &db_minor); + + if ((file_major > db_major) || + ((file_major == db_major) && (file_minor > db_minor))) +--- lib/Mrm/MrmItop.c ++++ lib/Mrm/MrmItop.c +@@ -642,10 +642,12 @@ + * Local variables + */ + Cardinal result ; /* function results */ ++ IDBResource resource_id; + + if ( (result=Idb__FIL_Valid((IDBFile)file_id)) != MrmSUCCESS ) return result ; + result = Idb__RID_NextRID ((IDBFile)file_id, +- (IDBResource *)resource_id_return) ; ++ &resource_id) ; ++ *resource_id_return = resource_id; + return result ; + + } +--- lib/Xm/EditresCom.c ++++ lib/Xm/EditresCom.c +@@ -1772,7 +1772,7 @@ + XtFree((char *)widget_list); + } + +-#if 0 ++#if 1 + /************************************************************ + * + * All of the following routines are public. +@@ -1923,7 +1923,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGet8(stream, val) + ProtocolStream * stream; + unsigned char * val; +@@ -1943,7 +1943,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGet16(stream, val) + ProtocolStream * stream; + unsigned short * val; +@@ -1964,7 +1964,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGetSigned16(stream, val) + ProtocolStream * stream; + short * val; +@@ -1993,7 +1993,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGet32(stream, val) + ProtocolStream * stream; + unsigned long * val; +@@ -2015,7 +2015,7 @@ + * Returns: True if retrieval was successful. + */ + +-Boolean ++Bool + _XEditResGetString8(stream, str) + ProtocolStream * stream; + char ** str; +@@ -2048,7 +2048,7 @@ + * Returns: True if retrieval was successful. + */ + +-Boolean ++Bool + _XEditResGetWidgetInfo(stream, info) + ProtocolStream * stream; + WidgetInfo * info; +--- lib/Xm/FontS.c ++++ lib/Xm/FontS.c +@@ -2865,7 +2865,7 @@ + + XmFontS_use_scaling(fsw) = info->set; + if (!info->set) { +- Boolean map_bad = (map = SizeMapping(cf->point_size) == 0); ++ Boolean map_bad = (map = SizeMapping(cf->point_size)) == 0; + Boolean bad_75 = (CheckFlag(XmFontS_user_state(fsw), DPI_75) && + !CheckLongFlag(family->sizes_75, map)); + Boolean bad_100 = (CheckFlag(XmFontS_user_state(fsw), DPI_100) && +--- lib/Xm/Makefile.am ++++ lib/Xm/Makefile.am +@@ -9,7 +9,7 @@ + ${X_CFLAGS} + xmdir = $(includedir)/Xm + +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + + lib_LTLIBRARIES = libXm.la + +--- lib/Xm/Resolve.c ++++ lib/Xm/Resolve.c +@@ -149,11 +149,11 @@ + * Update the part size value (initially, it is the size of this part) + */ + w_class->core_class.widget_size = +- _ALIGN(w_class->core_class.widget_size) + super->core_class.widget_size; ++ _ALIGN(w_class->core_class.widget_size) + _ALIGN(super->core_class.widget_size); + if (cc && scc) + cc->constraint_class.constraint_size = + _ALIGN(cc->constraint_class.constraint_size) + +- scc->constraint_class.constraint_size; ++ _ALIGN(scc->constraint_class.constraint_size); + + /* + * Count the number of superclasses and allocate the offset record(s) +@@ -186,7 +186,7 @@ + scc = (ConstraintWidgetClass)(scc->core_class.superclass), i--) + if (IsConstraintClass((WidgetClass)scc)) + (*constraint_offset)[i] = +- scc->constraint_class.constraint_size; ++ _ALIGN(scc->constraint_class.constraint_size); + else + (*constraint_offset)[i] = 0; + +--- lib/Xm/XmRenderT.c ++++ lib/Xm/XmRenderT.c +@@ -1461,6 +1461,7 @@ + else { + union { + long longval; ++ int intval; + short shortval; + char charval; + char* charptr; +@@ -1468,6 +1469,7 @@ + } u; + char *p = (char*)&u; + if (size == sizeof(long)) u.longval = (long)src; ++ else if (size == sizeof(int)) u.longval = (int)src; + else if (size == sizeof(short)) u.shortval = (short)src; + else if (size == sizeof(char)) u.charval = (char)src; + else if (size == sizeof(XtPointer)) u.ptr = (XtPointer)src; +@@ -1486,6 +1488,7 @@ + * but preserve for compatibility as long as arglist contains NULL. + */ + if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src; ++ else if (size == sizeof(int)) *dst = (XtArgVal)*(int*)src; + else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src; + else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src; + else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src; +@@ -1496,6 +1499,7 @@ + else { + /* proper GetValues semantics: argval is pointer to destination */ + if (size == sizeof(long)) *((long*)*dst) = *(long*)src; ++ else if (size == sizeof(int)) *((int*)*dst) = *(int*)src; + else if (size == sizeof(short)) *((short*)*dst) = *(short*)src; + else if (size == sizeof(char)) *((char*)*dst) = *(char*)src; + else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src; +--- localized/util/mkcatdefs.c ++++ localized/util/mkcatdefs.c +@@ -76,9 +76,8 @@ + #include + #include + +-#ifndef NL_TEXTMAX ++#undef NL_TEXTMAX + #define NL_TEXTMAX 8192 +-#endif + + #ifndef PATH_MAX + #define PATH_MAX 1024 diff --git a/easybuild/easyconfigs/m/motif/openmotif-uil.diff b/easybuild/easyconfigs/m/motif/openmotif-uil.diff new file mode 100644 index 0000000000..9b09a41c9a --- /dev/null +++ b/easybuild/easyconfigs/m/motif/openmotif-uil.diff @@ -0,0 +1,201 @@ +--- clients/uil/UilDiags.c ++++ clients/uil/UilDiags.c +@@ -207,9 +207,9 @@ + va_list ap; /* ptr to variable length parameter */ + int severity; /* severity of message */ + int message_number; /* message number */ +- char msg_buffer[132]; /* buffer to construct message */ ++ char *msg_buffer = 0; /* buffer to construct message */ + char ptr_buffer[buf_size]; /* buffer to construct pointer */ +- char loc_buffer[132]; /* buffer to construct location */ ++ char *loc_buffer = 0; /* buffer to construct location */ + char src_buffer[buf_size]; /* buffer to hold source line */ + + /* +@@ -293,19 +293,18 @@ + va_start(ap, l_start_column); + + #ifndef NO_MESSAGE_CATALOG +- vsprintf( msg_buffer, ++ vasprintf(&msg_buffer, + catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ], + diag_rz_msg_table[ message_number ].ac_text), + ap ); + #else +- vsprintf( msg_buffer, ++ vasprintf(&msg_buffer, + diag_rz_msg_table[ message_number ].ac_text, + ap ); + #endif + va_end(ap); + + src_buffer[ 0 ] = 0; +- loc_buffer[ 0 ] = 0; + ptr_buffer[ 0 ] = 0; + + if (az_src_rec != diag_k_no_source) +@@ -317,13 +316,13 @@ + */ + + #ifndef NO_MESSAGE_CATALOG +- sprintf( loc_buffer, ++ asprintf(&loc_buffer, + catgets(uil_catd, UIL_SET_MISC, + UIL_MISC_0, "\t\t line: %d file: %s"), + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); + #else +- sprintf( loc_buffer, ++ asprintf(&loc_buffer, + "\t\t line: %d file: %s", + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); +@@ -371,7 +370,7 @@ + + if (l_start_column != diag_k_no_column) + #ifndef NO_MESSAGE_CATALOG +- sprintf(loc_buffer, ++ asprintf(&loc_buffer, + catgets(uil_catd, UIL_SET_MISC, + UIL_MISC_1, + "\t\t line: %d position: %d file: %s"), +@@ -379,7 +378,7 @@ + l_start_column + 1, + src_get_file_name( az_src_rec ) ); + #else +- sprintf(loc_buffer, ++ asprintf(&loc_buffer, + "\t\t line: %d position: %d file: %s", + az_src_rec->w_line_number, + l_start_column + 1, +@@ -387,13 +386,13 @@ + #endif + else + #ifndef NO_MESSAGE_CATALOG +- sprintf( loc_buffer, catgets(uil_catd, UIL_SET_MISC, ++ asprintf(&loc_buffer, catgets(uil_catd, UIL_SET_MISC, + UIL_MISC_0, + "\t\t line: %d file: %s"), + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); + #else +- sprintf( loc_buffer, ++ asprintf(&loc_buffer, + "\t\t line: %d file: %s", + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); +@@ -406,7 +405,8 @@ + */ + + write_msg_to_standard_error +- ( message_number, src_buffer, ptr_buffer, msg_buffer, loc_buffer ); ++ ( message_number, src_buffer, ptr_buffer, msg_buffer, ++ loc_buffer ? loc_buffer : ""); + + /* + ** if we have a listing, place message in the source structure +@@ -428,6 +428,8 @@ + uil_exit( uil_k_severe_status ); + } + ++ free (loc_buffer); ++ free (msg_buffer); + } + + /* +--- clients/uil/UilIODef.h ++++ clients/uil/UilIODef.h +@@ -75,7 +75,7 @@ + char *c_buffer; + boolean v_position_before_get; + z_key last_key; +- char expanded_name[ 256 ]; ++ char *expanded_name; + } uil_fcb_type; + + #endif /* UilIODef_h */ +--- clients/uil/UilSrcSrc.c ++++ clients/uil/UilSrcSrc.c +@@ -271,6 +271,7 @@ + diag_k_no_source, diag_k_no_column, + src_az_source_file_table[i]->expanded_name); + } ++ _free_memory (src_az_source_file_table[i]->expanded_name); + _free_memory ((char*)src_az_source_file_table [i]); + src_az_source_file_table[i] = NULL; + } +@@ -626,12 +627,13 @@ + static unsigned short main_dir_len = 0; + boolean main_file; + int i; /* loop index through include files */ +- char buffer[256]; ++ char *buffer; + + + /* place the file name in the expanded_name buffer */ + +- strcpy(buffer, c_file_name); ++ buffer = _get_memory (strlen (c_file_name) + 1); ++ strcpy (buffer, c_file_name); + + /* Determine if this is the main file or an include file. */ + +@@ -673,11 +675,10 @@ + } + + if (!specific_directory) { ++ buffer = XtRealloc (buffer, main_dir_len + strlen (c_file_name) + 1); + _move (buffer, main_fcb -> expanded_name, main_dir_len); + _move (& buffer [main_dir_len], + c_file_name, strlen (c_file_name) + 1); /* + NULL */ +- } else { +- strcpy (buffer, c_file_name); + } + + /* Open the include file. */ +@@ -700,6 +701,7 @@ + if (inc_dir_len == 0) { + search_user_include = False; + } ++ buffer = XtRealloc (buffer, inc_dir_len + strlen (c_file_name) + 1); + _move (buffer, Uil_cmd_z_command.ac_include_dir[i], inc_dir_len); + + /* Add '/' if not specified at end of directory */ +@@ -723,6 +725,7 @@ + + /* Look in the default include directory. */ + if (search_user_include) { ++ buffer = XtRealloc (buffer, sizeof c_include_dir - 1 + strlen (c_file_name) + 1); + _move(buffer, c_include_dir, sizeof c_include_dir - 1); /* no NULL */ + _move(&buffer[sizeof c_include_dir - 1], + c_file_name, strlen (c_file_name) + 1); /* + NULL */ +@@ -736,14 +739,16 @@ + + /* check the open status. */ + +- if (az_fcb->az_file_ptr == NULL) ++ if (az_fcb->az_file_ptr == NULL) { ++ _free_memory (buffer); + return src_k_open_error; ++ } + + /* open succeeded - place buffer address in fcb */ + + az_fcb->c_buffer = az_source_buffer->c_text; + az_fcb->c_buffer[ src_k_max_source_line_length ] = 0; +- strcpy(az_fcb->expanded_name, buffer); ++ az_fcb->expanded_name = buffer; + + return src_k_open_normal; + } +--- tools/wml/Uil.y ++++ tools/wml/Uil.y +@@ -559,7 +559,7 @@ + + object_specification + : CLASS_NAME +- { sar_set_object_class (&$1); } ++ { sar_set_object_class (&$1); $$ = gz_yynullval;} + opt_create_proc_ref + opt_variant + object_spec diff --git a/easybuild/easyconfigs/m/motif/openmotif-xpm.diff b/easybuild/easyconfigs/m/motif/openmotif-xpm.diff new file mode 100644 index 0000000000..90ee2fc48e --- /dev/null +++ b/easybuild/easyconfigs/m/motif/openmotif-xpm.diff @@ -0,0 +1,808 @@ +--- lib/Xm/XpmAttrib.c ++++ lib/Xm/XpmAttrib.c +@@ -41,7 +41,7 @@ + #include "XpmI.h" + + /* 3.2 backward compatibility code */ +-LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, ++LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, + XpmColor ***oldct)); + + LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); +@@ -52,15 +52,12 @@ + static int + CreateOldColorTable(ct, ncolors, oldct) + XpmColor *ct; +- unsigned int ncolors; ++ int ncolors; + XpmColor ***oldct; + { + XpmColor **colorTable, **color; + int a; + +- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) +- return XpmNoMemory; +- + colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); + if (!colorTable) { + *oldct = NULL; +--- lib/Xm/XpmCrBufFrI.c ++++ lib/Xm/XpmCrBufFrI.c +@@ -43,20 +43,20 @@ + + #include "XpmI.h" + +-LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size, +- unsigned int *used_size, XpmColor *colors, ++LFUNC(WriteColors, int, (char **dataptr, size_t *data_size, ++ size_t *used_size, XpmColor *colors, + unsigned int ncolors, unsigned int cpp)); + +-LFUNC(WritePixels, void, (char *dataptr, unsigned int *used_size, ++LFUNC(WritePixels, void, (char *dataptr, size_t *used_size, + unsigned int width, unsigned int height, + unsigned int cpp, unsigned int *pixels, + XpmColor *colors)); + +-LFUNC(WriteExtensions, void, (char *dataptr, unsigned int *used_size, ++LFUNC(WriteExtensions, void, (char *dataptr, size_t *used_size, + XpmExtension *ext, unsigned int num)); + +-LFUNC(ExtensionsSize, int, (XpmExtension *ext, unsigned int num)); +-LFUNC(CommentsSize, int, (XpmInfo *info)); ++LFUNC(ExtensionsSize, size_t, (XpmExtension *ext, unsigned int num)); ++LFUNC(CommentsSize, size_t, (XpmInfo *info)); + + int + XpmCreateBufferFromImage(display, buffer_return, image, shapeimage, attributes) +@@ -113,10 +113,11 @@ + /* calculation variables */ + int ErrorStatus; + char buf[BUFSIZ]; +- unsigned int cmts, extensions, ext_size = 0; +- unsigned int l, cmt_size = 0; ++ unsigned int cmts, extensions; ++ size_t ext_size = 0; ++ size_t l, cmt_size = 0; + char *ptr = NULL, *p; +- unsigned int ptr_size, used_size; ++ size_t ptr_size, used_size; + + *buffer_return = NULL; + +@@ -253,8 +254,8 @@ + static int + WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) + char **dataptr; +- unsigned int *data_size; +- unsigned int *used_size; ++ size_t *data_size; ++ size_t *used_size; + XpmColor *colors; + unsigned int ncolors; + unsigned int cpp; +@@ -299,7 +300,7 @@ + static void + WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) + char *dataptr; +- unsigned int *used_size; ++ size_t *used_size; + unsigned int width; + unsigned int height; + unsigned int cpp; +@@ -329,12 +330,13 @@ + *used_size += s - dataptr; + } + +-static int ++static size_t + ExtensionsSize(ext, num) + XpmExtension *ext; + unsigned int num; + { +- unsigned int x, y, a, size; ++ unsigned int x, y, a; ++ size_t size; + char **line; + + size = 0; +@@ -353,7 +355,7 @@ + static void + WriteExtensions(dataptr, used_size, ext, num) + char *dataptr; +- unsigned int *used_size; ++ size_t *used_size; + XpmExtension *ext; + unsigned int num; + { +@@ -384,11 +386,11 @@ + *used_size += s - dataptr + 13; + } + +-static int ++static size_t + CommentsSize(info) + XpmInfo *info; + { +- int size = 0; ++ size_t size = 0; + + /* 5 = 2 (for "/_*") + 3 (for "*_/\n") */ + if (info->hints_cmt) +--- lib/Xm/XpmCrDatFrI.c ++++ lib/Xm/XpmCrDatFrI.c +@@ -134,8 +134,6 @@ + */ + header_nlines = 1 + image->ncolors; + header_size = sizeof(char *) * header_nlines; +- if (header_size >= SIZE_MAX / sizeof(char *)) +- return (XpmNoMemory); + header = (char **) XpmCalloc(header_size, sizeof(char *)); + if (!header) + return (XpmNoMemory); +--- lib/Xm/XpmI.h ++++ lib/Xm/XpmI.h +@@ -179,26 +179,14 @@ + boundCheckingCalloc((long)(nelem),(long) (elsize)) + #endif + +-#if defined(SCO) || defined(__USLC__) +-#include /* For SIZE_MAX */ +-#endif +-#include +-#ifndef SIZE_MAX +-# ifdef ULONG_MAX +-# define SIZE_MAX ULONG_MAX +-# else +-# define SIZE_MAX UINT_MAX +-# endif +-#endif +- + #define XPMMAXCMTLEN BUFSIZ + typedef struct { + unsigned int type; + union { + FILE *file; +- char **data; ++ unsigned char **data; + } stream; +- char *cptr; ++ unsigned char *cptr; + unsigned int line; + int CommentLength; + char Comment[XPMMAXCMTLEN]; +@@ -288,9 +276,9 @@ + } *xpmHashAtom; + + typedef struct { +- unsigned int size; +- unsigned int limit; +- unsigned int used; ++ int size; ++ int limit; ++ int used; + xpmHashAtom *atomTable; + } xpmHashTable; + +--- lib/Xm/XpmRdFToI.c ++++ lib/Xm/XpmRdFToI.c +@@ -124,6 +124,27 @@ + return (ErrorStatus); + } + ++ ++/* Quote filename and prepend prefix. */ ++static char *quote_file(prefix, filename, len) ++ const char *prefix, *filename; ++ size_t len; ++{ ++ char *buf = XpmMalloc(strlen(prefix) + len * 2 + 1); ++ char *p = buf, *q; ++ ++ if (!buf) ++ return 0; ++ strcpy(p, prefix); ++ p += strlen(p); ++ for (q = filename; *q; q++) { ++ *p++ = '\\'; ++ *p++ = *q; ++ } ++ return buf; ++} ++ ++ + /* + * open the given file to be read as an xpmData which is returned. + */ +@@ -133,7 +154,7 @@ + xpmData *mdata; + { + #ifndef NO_ZPIPE +- char *compressfile, buf[(2*MAXPATHLEN) + 1]; ++ char *compressfile, *buf; + # ifdef STAT_ZFILE + struct stat status; + # endif +@@ -144,17 +165,25 @@ + mdata->type = XPMFILE; + } else { + #ifndef NO_ZPIPE +- int len = strlen(filename); ++ size_t len = strlen(filename); + if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { + mdata->type = XPMPIPE; +- sprintf(buf, "uncompress -c \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "r"))) ++ buf = quote_file("uncompress -c ", filename, len); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { + mdata->type = XPMPIPE; +- sprintf(buf, "gunzip -qc \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "r"))) ++ buf = quote_file("gunzip -qc ", filename, len); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + } else { +@@ -164,28 +193,32 @@ + + sprintf(compressfile, "%s.Z", filename); + if (!stat(compressfile, &status)) { +- sprintf(buf, "uncompress -c \"%s\"", compressfile); +- if (!(mdata->stream.file = popen(buf, "r"))) { +- XpmFree(compressfile); ++ buf = quote_file("uncompress -c ", compressfile, len + 2); ++ XpmFree(compressfile); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); +- } + mdata->type = XPMPIPE; + } else { + sprintf(compressfile, "%s.gz", filename); + if (!stat(compressfile, &status)) { +- sprintf(buf, "gunzip -c \"%s\"", compressfile); +- if (!(mdata->stream.file = popen(buf, "r"))) { +- XpmFree(compressfile); ++ buf = quote_file("gunzip -c ", compressfile, len + 3); ++ XpmFree(compressfile); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); +- } + mdata->type = XPMPIPE; + } else { ++ XpmFree(compressfile); + # endif + #endif + if (!(mdata->stream.file = fopen(filename, "r"))) { +-#if !defined(NO_ZPIPE) && defined(STAT_ZFILE) +- XpmFree(compressfile); +-#endif + return (XpmOpenFailed); + } + mdata->type = XPMFILE; +@@ -193,7 +226,6 @@ + # ifdef STAT_ZFILE + } + } +- XpmFree(compressfile); + # endif + } + #endif +--- lib/Xm/XpmWrFFrI.c ++++ lib/Xm/XpmWrFFrI.c +@@ -117,7 +117,8 @@ + #endif + /* let's try to make a valid C syntax name */ + if ((dot = index(name, '.'))) { +- strcpy(new_name, name); ++ strncpy(new_name, name, sizeof(new_name)); ++ new_name[sizeof(new_name) - 1] = 0; + /* change '.' to '_' */ + name = s = new_name; + while ((dot = index(s, '.'))) { +@@ -127,7 +128,8 @@ + } + if ((dot = index(name, '-'))) { + if (name != new_name) { +- strcpy(new_name, name); ++ strncpy(new_name, name, sizeof(new_name)); ++ new_name[sizeof(new_name) - 1] = 0; + name = new_name; + } + /* change '-' to '_' */ +@@ -243,10 +245,13 @@ + char *s, *p, *buf; + unsigned int x, y, h; + ++ if (height == 0) ++ return XpmFileInvalid; ++ + h = height - 1; +- if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) ++ if (cpp != 0 && width >= ((size_t)-1 - 3)/cpp) + return XpmNoMemory; +- p = buf = (char *) XpmMalloc(width * cpp + 3); ++ p = buf = (char *) XpmMalloc((size_t)width * cpp + 3); + if (!buf) + return (XpmNoMemory); + *buf = '"'; +@@ -293,6 +298,25 @@ + fprintf(file, ",\n\"XPMENDEXT\""); + } + ++/* Quote filename and prepend prefix. */ ++static char *quote_file(prefix, filename, len) ++ const char *prefix, *filename; ++ size_t len; ++{ ++ char *buf = XpmMalloc(strlen(prefix) + len * 2 + 1); ++ char *p = buf, *q; ++ ++ if (!buf) ++ return 0; ++ strcpy(p, prefix); ++ p += strlen(p); ++ for (q = filename; *q; q++) { ++ *p++ = '\\'; ++ *p++ = *q; ++ } ++ return buf; ++} ++ + /* + * open the given file to be written as an xpmData which is returned + */ +@@ -302,7 +326,7 @@ + xpmData *mdata; + { + #ifndef NO_ZPIPE +- char buf[BUFSIZ]; ++ char *buf; + + #endif + +@@ -311,16 +335,24 @@ + mdata->type = XPMFILE; + } else { + #ifndef NO_ZPIPE +- int len = strlen(filename); ++ size_t len = strlen(filename); + if (len > 2 && !strcmp(".Z", filename + (len - 2))) { +- sprintf(buf, "compress > \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "w"))) ++ buf = quote_file("compress > ", filename, len); ++ if (!buf) ++ return XpmNoMemory; ++ mdata->stream.file = popen(buf, "w"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + mdata->type = XPMPIPE; + } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { +- sprintf(buf, "gzip -q > \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "w"))) ++ buf = quote_file("gzip -q > ", filename, len); ++ if (!buf) ++ return XpmNoMemory; ++ mdata->stream.file = popen(buf, "w"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + mdata->type = XPMPIPE; +--- lib/Xm/Xpmcreate.c ++++ lib/Xm/Xpmcreate.c +@@ -804,9 +804,6 @@ + + ErrorStatus = XpmSuccess; + +- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) +- return (XpmNoMemory); +- + /* malloc pixels index tables */ + image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); + if (!image_pixels) +@@ -950,8 +947,6 @@ + return (XpmNoMemory); + + #ifndef FOR_MSW +- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) +- return (XpmNoMemory); + /* now that bytes_per_line must have been set properly alloc data */ + (*image_return)->data = + (char *) XpmMalloc((*image_return)->bytes_per_line * height); +@@ -1997,9 +1992,6 @@ + xpmGetCmt(data, &colors_cmt); + + /* malloc pixels index tables */ +- if (ncolors >= SIZE_MAX / sizeof(Pixel)) +- return XpmNoMemory; +- + image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); + if (!image_pixels) + RETURN(XpmNoMemory); +@@ -2215,9 +2207,6 @@ + { + unsigned short colidx[256]; + +- if (ncolors > 256) +- return (XpmFileInvalid); +- + bzero((char *)colidx, 256 * sizeof(short)); + for (a = 0; a < ncolors; a++) + colidx[(unsigned char)colorTable[a].string[0]] = a + 1; +@@ -2316,9 +2305,6 @@ + char *s; + char buf[BUFSIZ]; + +- if (cpp >= sizeof(buf)) +- return (XpmFileInvalid); +- + buf[cpp] = '\0'; + if (USE_HASHTABLE) { + xpmHashAtom *slot; +--- lib/Xm/Xpmdata.c ++++ lib/Xm/Xpmdata.c +@@ -297,7 +297,7 @@ + + if (!mdata->type || mdata->type == XPMBUFFER) { + if (mdata->cptr) { +- char *start = mdata->cptr; ++ unsigned char *start = mdata->cptr; + while ((c = *mdata->cptr) && c != mdata->Eos) + mdata->cptr++; + n = mdata->cptr - start + 1; +@@ -376,7 +376,7 @@ + { + if (!mdata->type) + *cmt = NULL; +- else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) { ++ else if (mdata->CommentLength) { + *cmt = (char *) XpmMalloc(mdata->CommentLength + 1); + strncpy(*cmt, mdata->Comment, mdata->CommentLength); + (*cmt)[mdata->CommentLength] = '\0'; +--- lib/Xm/Xpmhashtab.c ++++ lib/Xm/Xpmhashtab.c +@@ -141,17 +141,17 @@ + xpmHashTable *table; + { + xpmHashAtom *atomTable = table->atomTable; +- unsigned int size = table->size; ++ int size = table->size; + xpmHashAtom *t, *p; + int i; + int oldSize = size; + + t = atomTable; + HASH_TABLE_GROWS +- table->size = size; +- table->limit = size / 3; +- if (size >= SIZE_MAX / sizeof(*atomTable)) ++ if (size <= 0) + return (XpmNoMemory); ++ table->size = size; ++ table->limit = size / 3; + atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); + if (!atomTable) + return (XpmNoMemory); +@@ -212,8 +212,6 @@ + table->size = INITIAL_HASH_SIZE; + table->limit = table->size / 3; + table->used = 0; +- if (table->size >= SIZE_MAX / sizeof(*atomTable)) +- return (XpmNoMemory); + atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); + if (!atomTable) + return (XpmNoMemory); +--- lib/Xm/Xpmmisc.c ++++ lib/Xm/Xpmmisc.c +@@ -52,7 +52,7 @@ + char *s1; + { + char *s2; +- int l = strlen(s1) + 1; ++ size_t l = strlen(s1) + 1; + + if (s2 = (char *) XpmMalloc(l)) + strcpy(s2, s1); +--- lib/Xm/Xpmparse.c ++++ lib/Xm/Xpmparse.c +@@ -46,25 +46,6 @@ + + #include "XpmI.h" + #include +-#include +- +-#ifdef HAS_STRLCAT +-# define STRLCAT(dst, src, dstsize) { \ +- if (strlcat(dst, src, dstsize) >= (dstsize)) \ +- return (XpmFileInvalid); } +-# define STRLCPY(dst, src, dstsize) { \ +- if (strlcpy(dst, src, dstsize) >= (dstsize)) \ +- return (XpmFileInvalid); } +-#else +-# define STRLCAT(dst, src, dstsize) { \ +- if ((strlen(dst) + strlen(src)) < (dstsize)) \ +- strcat(dst, src); \ +- else return (XpmFileInvalid); } +-# define STRLCPY(dst, src, dstsize) { \ +- if (strlen(src) < (dstsize)) \ +- strcpy(dst, src); \ +- else return (XpmFileInvalid); } +-#endif + + LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, + unsigned int height, unsigned int ncolors, +@@ -234,7 +215,7 @@ + unsigned int *extensions; + { + unsigned int l; +- char buf[BUFSIZ + 1]; ++ char buf[BUFSIZ]; + + if (!data->format) { /* XPM 2 or 3 */ + +@@ -332,6 +313,17 @@ + *hotspot = 0; + *extensions = 0; + } ++ ++ /* Do some plausibility checks. */ ++ if (*width == 0 || *height == 0 || *ncolors == 0 || *cpp == 0) ++ return XpmFileInvalid; ++ if (*cpp > 8) ++ return XpmFileInvalid; ++ if (*width > (1 << (sizeof(int) * 8 - 4)) / *height) ++ return XpmFileInvalid; ++ if (*ncolors > (1 << (sizeof(int) * 8 - 4)) / (*width * *height)) ++ return XpmFileInvalid; ++ + return (XpmSuccess); + } + +@@ -343,10 +335,10 @@ + XpmColor **colorTablePtr; + xpmHashTable *hashtable; + { +- unsigned int key, l, a, b, len; ++ unsigned int key, l, a, b; + unsigned int curkey; /* current color key */ + unsigned int lastwaskey; /* key read */ +- char buf[BUFSIZ + 1]; ++ char buf[BUFSIZ]; + char curbuf[BUFSIZ]; /* current buffer */ + char **sptr, *s; + XpmColor *color; +@@ -354,8 +346,6 @@ + char **defaults; + int ErrorStatus; + +- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) +- return (XpmNoMemory); + colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); + if (!colorTable) + return (XpmNoMemory); +@@ -367,10 +357,6 @@ + /* + * read pixel value + */ +- if (cpp >= SIZE_MAX - 1) { +- xpmFreeColorTable(colorTable, ncolors); +- return (XpmNoMemory); +- } + color->string = (char *) XpmMalloc(cpp + 1); + if (!color->string) { + xpmFreeColorTable(colorTable, ncolors); +@@ -408,14 +394,13 @@ + } + if (!lastwaskey && key < NKEYS) { /* open new key */ + if (curkey) { /* flush string */ +- len = strlen(curbuf) + 1; +- s = (char *) XpmMalloc(len); ++ s = (char *) XpmMalloc(strlen(curbuf) + 1); + if (!s) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } + defaults[curkey] = s; +- memcpy(s, curbuf, len); ++ strcpy(s, curbuf); + } + curkey = key + 1; /* set new key */ + *curbuf = '\0'; /* reset curbuf */ +@@ -425,10 +410,14 @@ + xpmFreeColorTable(colorTable, ncolors); + return (XpmFileInvalid); + } ++ if (strlen(curbuf) + l + 2 >= sizeof(curbuf)) { ++ xpmFreeColorTable(colorTable, ncolors); ++ return (XpmNoMemory); ++ } + if (!lastwaskey) +- STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ ++ strcat(curbuf, " "); /* append space */ + buf[l] = '\0'; +- STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ ++ strcat(curbuf, buf);/* append buf */ + lastwaskey = 0; + } + } +@@ -436,13 +425,12 @@ + xpmFreeColorTable(colorTable, ncolors); + return (XpmFileInvalid); + } +- len = strlen(curbuf) + 1; +- s = defaults[curkey] = (char *) XpmMalloc(len); ++ s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); + if (!s) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } +- memcpy(s, curbuf, len); ++ strcpy(s, curbuf); + } + } else { /* XPM 1 */ + /* get to the beginning of the first string */ +@@ -455,10 +443,6 @@ + /* + * read pixel value + */ +- if (cpp >= SIZE_MAX - 1) { +- xpmFreeColorTable(colorTable, ncolors); +- return (XpmNoMemory); +- } + color->string = (char *) XpmMalloc(cpp + 1); + if (!color->string) { + xpmFreeColorTable(colorTable, ncolors); +@@ -486,18 +470,21 @@ + xpmNextString(data); /* get to the next string */ + *curbuf = '\0'; /* init curbuf */ + while ((l = xpmNextWord(data, buf, BUFSIZ))) { ++ if (strlen(curbuf) + l + 2 >= sizeof(curbuf)) { ++ xpmFreeColorTable(colorTable, ncolors); ++ return (XpmNoMemory); ++ } + if (*curbuf != '\0') +- STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ ++ strcat(curbuf, " ");/* append space */ + buf[l] = '\0'; +- STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ ++ strcat(curbuf, buf); /* append buf */ + } +- len = strlen(curbuf) + 1; +- s = (char *) XpmMalloc(len); ++ s = (char *) XpmMalloc(strlen(curbuf) + 1); + if (!s) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } +- memcpy(s, curbuf, len); ++ strcpy(s, curbuf); + color->c_color = s; + *curbuf = '\0'; /* reset curbuf */ + if (a < ncolors - 1) +@@ -522,9 +509,6 @@ + unsigned int *iptr, *iptr2; + unsigned int a, x, y; + +- if ((height > 0 && width >= SIZE_MAX / height) || +- width * height >= SIZE_MAX / sizeof(unsigned int)) +- return XpmNoMemory; + #ifndef FOR_MSW + iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); + #else +@@ -548,9 +532,6 @@ + { + unsigned short colidx[256]; + +- if (ncolors > 256) +- return (XpmFileInvalid); +- + bzero((char *)colidx, 256 * sizeof(short)); + for (a = 0; a < ncolors; a++) + colidx[(unsigned char)colorTable[a].string[0]] = a + 1; +@@ -585,7 +566,7 @@ + + bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ + for (a = 0; a < ncolors; a++) { +- char1 = colorTable[a].string[0]; ++ char1 = (unsigned char)colorTable[a].string[0]; + if (cidx[char1] == NULL) { /* get new memory */ + cidx[char1] = (unsigned short *) + XpmCalloc(256, sizeof(unsigned short)); +@@ -628,9 +609,6 @@ + char *s; + char buf[BUFSIZ]; + +- if (cpp >= sizeof(buf)) +- return (XpmFileInvalid); +- + buf[cpp] = '\0'; + if (USE_HASHTABLE) { + xpmHashAtom *slot; +--- lib/Xm/Xpmscan.c ++++ lib/Xm/Xpmscan.c +@@ -98,8 +98,7 @@ + LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, + XpmAttributes *attributes)); + +-LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, +- unsigned int ncolors, ++LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, + Pixel *pixels, unsigned int mask, + unsigned int cpp, XpmAttributes *attributes)); + +@@ -226,17 +225,11 @@ + else + cpp = 0; + +- if ((height > 0 && width >= SIZE_MAX / height) || +- width * height >= SIZE_MAX / sizeof(unsigned int)) +- RETURN(XpmNoMemory); + pmap.pixelindex = + (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); + if (!pmap.pixelindex) + RETURN(XpmNoMemory); + +- if (pmap.size >= SIZE_MAX / sizeof(Pixel)) +- RETURN(XpmNoMemory); +- + pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); + if (!pmap.pixels) + RETURN(XpmNoMemory); +@@ -291,8 +284,7 @@ + * get rgb values and a string of char, and possibly a name for each + * color + */ +- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) +- RETURN(XpmNoMemory); ++ + colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); + if (!colorTable) + RETURN(XpmNoMemory); +@@ -340,8 +332,6 @@ + + /* first get a character string */ + a = 0; +- if (cpp >= SIZE_MAX - 1) +- return (XpmNoMemory); + if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) + return (XpmNoMemory); + *s++ = printable[c = a % MAXPRINTABLE]; +@@ -389,7 +379,7 @@ + ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) + Display *display; + XpmColor *colors; +- unsigned int ncolors; ++ int ncolors; + Pixel *pixels; + unsigned int mask; + unsigned int cpp; +@@ -433,8 +423,6 @@ + } + + /* first get character strings and rgb values */ +- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) +- return (XpmNoMemory); + xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); + if (!xcolors) + return (XpmNoMemory); diff --git a/easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff b/easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff new file mode 100644 index 0000000000..eb9d5c035c --- /dev/null +++ b/easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff @@ -0,0 +1,10 @@ +--- lib/Xm/XpmI.h ++++ lib/Xm/XpmI.h +@@ -110,6 +110,7 @@ + + #include + #include ++#include + /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ + #ifdef sequent + extern FILE *popen(); diff --git a/easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff b/easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff new file mode 100644 index 0000000000..2501561137 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff @@ -0,0 +1,20 @@ +--- lib/Xm/XmString.c ++++ lib/Xm/XmString.c +@@ -7707,7 +7707,7 @@ + case XmMULTIBYTE_TEXT: + /* Non-NULL values (except _MOTIF_DEFAULT_LOCALE) + are not accepted in Motif 2.0. */ +- if (tag != NULL && !(tag == _MOTIF_DEFAULT_LOCALE || ++ if (tag != NULL && !(/* tag == _MOTIF_DEFAULT_LOCALE || */ + strcmp(tag, _MOTIF_DEFAULT_LOCALE) == 0)) + { + _XmProcessUnlock(); +@@ -8317,7 +8317,7 @@ + _XmProcessUnlock(); + return NULL; + } +- if ((value != _MOTIF_DEFAULT_LOCALE) && ++ if (/* (value != _MOTIF_DEFAULT_LOCALE) && */ + (strcmp((char*) value, _MOTIF_DEFAULT_LOCALE) != 0)) { + _XmProcessUnlock(); + return NULL; diff --git a/easybuild/easyconfigs/m/motif/sentinel.diff b/easybuild/easyconfigs/m/motif/sentinel.diff new file mode 100644 index 0000000000..d633b67211 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/sentinel.diff @@ -0,0 +1,128 @@ +--- clients/mwm/WmFunction.c ++++ clients/mwm/WmFunction.c +@@ -1124,12 +1124,12 @@ + directory, then we must call execlp and not execl + */ + shellname = shell; +- execlp (shell, shellname, "-c", args, 0); ++ execlp (shell, shellname, "-c", args, (char *) 0); + } + else + { + shellname++; +- execl (shell, shellname, "-c", args, 0); ++ execl (shell, shellname, "-c", args, (char *) 0); + } + } + +@@ -1138,9 +1138,9 @@ + * Try /bin/sh . + */ + #ifdef SVR4 +- execl ("/usr/bin/sh", "sh", "-c", args, 0); ++ execl ("/usr/bin/sh", "sh", "-c", args, (char *) 0); + #else +- execl ("/bin/sh", "sh", "-c", args, 0); ++ execl ("/bin/sh", "sh", "-c", args, (char *) 0); + #endif + + +--- demos/lib/Xmd/onHelp.c ++++ demos/lib/Xmd/onHelp.c +@@ -66,7 +66,7 @@ + Widget dismiss; + + toplevel = XtVaAppInitialize(&app_context, "HelpOnHelp", NULL, 0, +- &argc, argv, NULL, 0); ++ &argc, argv, NULL, NULL); + n = 0; + XtSetArg(args[n], XmdNhelpFile, "helpOn"); n++; + help = XmdCreateHelp(toplevel, "help", args, n); +--- demos/programs/Exm/simple_app/simpleDemo.c ++++ demos/programs/Exm/simple_app/simpleDemo.c +@@ -162,7 +162,7 @@ + + menu = XmCreatePulldownMenu(menuBar, "FileMenu", NULL, 0); + +- XtVaSetValues(cascade, XmNsubMenuId, menu, 0); ++ XtVaSetValues(cascade, XmNsubMenuId, menu, NULL); + + str = XmStringCreateLocalized("Quit"); + menuitem = XtVaCreateManagedWidget("item", xmPushButtonWidgetClass, +--- demos/programs/filemanager/actions.c ++++ demos/programs/filemanager/actions.c +@@ -91,7 +91,7 @@ + XtVaSetValues(fileviewer, + XmNlayoutType, spatial, + XmNentryViewType, size, +- 0, 0); ++ NULL); + + fixViewerSize(XtParent(fileviewer), NULL, NULL); + +--- demos/programs/filemanager/filemanager.c ++++ demos/programs/filemanager/filemanager.c +@@ -118,7 +118,7 @@ + + XtSetArg(args[n], XmNallowShellResize, True); n++; + toplevel = XtVaAppInitialize(&app_context, APP_CLASS, NULL, 0, &argc, argv, +- fallback_resources, 0); ++ fallback_resources, NULL); + + app_class_quark = XrmStringToQuark(APP_CLASS); + app_quark = XrmStringToQuark(argv[0]); +--- demos/programs/fileview/text.c ++++ demos/programs/fileview/text.c +@@ -160,7 +160,7 @@ + XtSetValues(XtParent(new->text), args, n); + XmTextSetTopCharacter(new->text, + XmTextGetTopCharacter(this->current_pane->text)); +- XtVaSetValues(target, XmNheight, (Dimension) height/2); ++ XtVaSetValues(target, XmNheight, (Dimension) height/2, NULL); + } + printf("source text set\n"); + XtManageChild(new->text); +--- demos/programs/popups/autopopups.c ++++ demos/programs/popups/autopopups.c +@@ -83,7 +83,7 @@ + XmString str, tmp1, tmp2; + + shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv, +- NULL, 0); ++ NULL, NULL); + + frame1 = XmCreateFrame(shell, "outerframe", NULL, 0); + XtManageChild(frame1); +--- demos/programs/setdate/setDate.c ++++ demos/programs/setdate/setDate.c +@@ -95,7 +95,7 @@ + char *str; + + shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv, +- fallback_resources, 0); ++ fallback_resources, NULL); + + time(&timer); + thetime = localtime(&timer); +--- demos/programs/todo/todo.c ++++ demos/programs/todo/todo.c +@@ -150,7 +150,7 @@ + shell = XtVaAppInitialize(&context, APP_CLASS, + optionDesc, XtNumber(optionDesc), + &argc, argv, +- fallback_resources, 0); ++ fallback_resources, NULL); + + XtGetApplicationResources(shell, (XtPointer) &options, + resources, XtNumber(resources), (Arg *) NULL, 0); +--- lib/Xm/Label.c ++++ lib/Xm/Label.c +@@ -2595,7 +2595,7 @@ + { + XmString value; + +- XtVaGetValues(w, XmNlabelString, &value, 0); ++ XtVaGetValues(w, XmNlabelString, &value, NULL); + + if (type == XmFORMAT_XmSTRING) + { diff --git a/easybuild/easyconfigs/m/motif/warn.patch b/easybuild/easyconfigs/m/motif/warn.patch new file mode 100644 index 0000000000..a2dc641774 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/warn.patch @@ -0,0 +1,89 @@ +--- demos/programs/ButtonBox/bboxdemo.c ++++ demos/programs/ButtonBox/bboxdemo.c +@@ -668,4 +668,5 @@ + XtRealizeWidget(top); + + XtAppMainLoop(app); ++ return 0; + } +--- demos/programs/ColorSel/bxutil-c.c ++++ demos/programs/ColorSel/bxutil-c.c +@@ -3471,6 +3471,7 @@ + default: + return -1; + } ++ abort(); + } + + +@@ -3494,6 +3495,7 @@ + default: + return -1; + } ++ abort(); + } + + /* +--- demos/programs/FontSel/fontsel.c ++++ demos/programs/FontSel/fontsel.c +@@ -68,6 +68,7 @@ + * Returns: nothing + * + */ ++void + InitializeDemoForm(Widget form) + { + Widget w; +@@ -119,5 +120,6 @@ + XtRealizeWidget(top); + + XtAppMainLoop(app); ++ return 0; + } + +--- demos/programs/MultiList/bxutil-c.c ++++ demos/programs/MultiList/bxutil-c.c +@@ -3469,6 +3469,7 @@ + } + return (c); + } ++ abort(); + } + + +@@ -3490,6 +3491,7 @@ + mdata->InsideString = !mdata->InsideString; + return (ungetc(c, mdata->stream.file)); + } ++ abort(); + } + + /* +--- demos/programs/Tree/bxutil-c.c ++++ demos/programs/Tree/bxutil-c.c +@@ -3471,6 +3471,7 @@ + default: + return -1; + } ++ abort(); + } + + +@@ -3494,6 +3495,7 @@ + default: + return -1; + } ++ abort(); + } + + /* +--- tools/wml/wmlresolve.c ++++ tools/wml/wmlresolve.c +@@ -69,6 +69,7 @@ + + #if defined(__STDC__) + #include ++#include + #endif + #include + -- GitLab From d2d7a3a09b1175918494b482d8ea2dcf51623581 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 3 Oct 2013 18:01:53 +0200 Subject: [PATCH 068/811] better description for libXmu --- .../l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb | 20 ++++++++++++++----- .../l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb | 3 ++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb index 90518eb8e5..df0822e479 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb @@ -2,7 +2,8 @@ name = 'libXmu' version = '1.1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """libXmu""" +description = """libXmu provides a set of miscellaneous utility convenience functions for X libraries to use. + libXmuu is a lighter-weight version that does not depend on libXt or libXext""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} @@ -10,13 +11,22 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +#builddependencies = [ +# ('xextproto', '7.2.1'), +# ('printproto', '1.0.5'), +#] + dependencies = [ +# ('libX11', '1.6.1'), +# ('libXext', '1.3.2'), ('libXt', '1.1.4'), - ('libXpm', '3.5.11'), ] sanity_check_paths = { - 'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']], - 'dirs': [], + 'files': ['lib/%s' % x for x in [ + '%(name)s.a', '%(name)s.so', + ] + ], + 'dirs': [] } -moduleclass = 'vis' +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb index fd1b63af98..464057cb9c 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb @@ -2,7 +2,8 @@ name = 'libXmu' version = '1.1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """libXmu""" +description = """libXmu provides a set of miscellaneous utility convenience functions for X libraries to use. + libXmuu is a lighter-weight version that does not depend on libXt or libXext""" toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} -- GitLab From e4b7b6deafcf2cb4638e9531a51b13d1805ef9e1 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 3 Oct 2013 18:25:26 +0200 Subject: [PATCH 069/811] fixed remarks --- ...MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb | 26 +++++++++++++++++++ .../m/motif/motif-2.2.4-goolf-1.4.10.eb | 22 +++++++++------- .../m/motif/motif-2.2.4-ictce-4.1.13.eb | 24 ++++++++++------- .../m/motif/motif-2.3.4-goolf-1.4.10.eb | 12 +++------ .../m/motif/motif-2.3.4-ictce-4.1.13.eb | 14 ++++------ .../ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb | 8 +++--- .../printproto-1.0.5-goolf-1.4.10.eb | 1 - .../printproto-1.0.5-ictce-4.1.13.eb | 5 ++-- easybuild/easyconfigs/p/test.pl | 8 ++++++ .../x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb | 4 +-- .../x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb | 6 ++--- ...xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb | 9 ++++--- .../xextproto/xextproto-7.2.1-ictce-4.1.13.eb | 4 +-- .../x/xproto/xproto-7.0.23-ictce-4.1.13.eb | 19 +++++++------- .../x/xtrans/xtrans-1.2-goolf-1.4.10.eb | 3 ++- .../x/xtrans/xtrans-1.2-ictce-4.1.13.eb | 5 ++-- 16 files changed, 99 insertions(+), 71 deletions(-) create mode 100644 easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/p/test.pl diff --git a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..1d9f7f914e --- /dev/null +++ b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,26 @@ +easyblock = "PythonPackage" + +name = 'MySQLdb' +version = '1.2.4' + +homepage = 'https://github.com/farcepest/MySQLdb1' +description = """ +MySQLdb is a Python DB API-2.0-compliant interface; see PEP-249 for details. +""" +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['https://github.com/farcepest/MySQLdb1/archive'] +sources = ['%s-%s.tar.gz' % (name.lower(), version)] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.7'), + ('OpenSSL', '1.0.0'), +] +moduleclass = "database" diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index c7dee065cd..b47a0a4c09 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -1,10 +1,11 @@ name = 'motif' -version = '2.2.4' # this version provides libXm.so.3 +version = '2.2.4' # this version provides libXm.so.3 easyblock = 'ConfigureMake' homepage = 'http://motif.ics.com/' description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building -applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" + applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. + It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} @@ -18,14 +19,13 @@ patches = [ 'XmResizeHashTable.patch', ] - dependencies = [ ('libtool', '2.4.2'), ('libXt', '1.1.4'), ('xbitmaps', '1.1.1'), ('flex', '2.5.35'), ('Bison', '2.7'), - ('Automake','1.13.4'), + ('Automake', '1.13.4'), ('gettext', '0.18.2'), ('libXp', '1.0.2'), ('libX11', '1.6.1'), @@ -36,15 +36,17 @@ builddependencies = [ ('printproto', '1.0.5'), ] +premakeopts = "LANG=C " +# motif ships a broken automake and libtool +preconfigopts = """rm -f libtool install-sh missing depcomp config.guess config.sub && \ +cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && """ +configopts = "--enable-shared" +# make is not parallel safe +parallel = 1 + sanity_check_paths = { 'files': ['lib/libXm.so.3'], 'dirs': [] } -premakeopts = "LANG=C " -# motif ships a broken automake and libtool -preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " -configopts = "--enable-shared" moduleclass = 'vis' -# make is not parallel safe -parallel = 1 diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index d19f899d12..73c4d18939 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -1,23 +1,23 @@ name = 'motif' -version = '2.2.4' # this version provides libXm.so.3 +version = '2.2.4' # this version provides libXm.so.3 easyblock = 'ConfigureMake' homepage = 'http://motif.ics.com/' description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building -applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" +applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. +It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" + toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True, 'pic': True} -# from the source rpm +# from the source rpm http://motif.ics.com/sites/default/files/openmotif-2.2.4-0.1.src__0.rpm sources = ['open%(name)s-%(version)s.tar.bz2'] -source_urls = [SOURCEFORGE_SOURCE] patches = [ 'datadir.patch', 'openmotif-2.2.4.diff', 'openmotif22-add_LONG64_define.diff', 'openmotif22-strcmp.diff', 'openmotif-uil.diff', 'openmotif-xpm.diff', 'PrintableString.diff', 'sentinel.diff', 'warn.patch', 'XmResizeHashTable.patch', ] - builddependencies = [ ('printproto', '1.0.5'), ] @@ -34,13 +34,17 @@ dependencies = [ ('libX11', '1.6.1'), ('libXext', '1.3.2'), ] + +premakeopts = "LANG=C " +# motif ships a broken automake and libtool +preconfigopts = """rm -f libtool install-sh missing depcomp config.guess config.sub && \ +cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && """ +configopts = "--enable-shared" +parallel = 1 + sanity_check_paths = { 'files': ['lib/libXm.so.3'], 'dirs': [] } -premakeopts = "LANG=C " -# motif ships a broken automake and libtool -preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " -configopts = "--enable-shared" + moduleclass = 'vis' -parallel = 1 diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb index d7cd1f8b2e..c34eb6a755 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb @@ -3,7 +3,8 @@ version = '2.3.4' homepage = 'http://motif.ics.com/' description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building -applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" +applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. +It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} @@ -17,13 +18,8 @@ dependencies = [ ('flex', '2.5.35'), ('Bison', '2.7'), ] -# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories -#sanity_check_paths = { -# 'files': [], -# 'dirs': ["."] -#} -# You SHOULD change the following line; Kindly consult other easyconfigs for possible options preconfigopts = "./autogen.sh && " -moduleclass = 'vis' +# makefile is not parallel safe parallel = 1 +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb index 4455b33349..f3f21cb8e6 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb @@ -3,8 +3,10 @@ version = '2.3.4' homepage = 'http://motif.ics.com/' description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building -applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems. + It was the standard toolkit for the Common Desktop Environment and thus for Unix.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['%(name)s-%(version)s-src.tgz'] source_urls = [SOURCEFORGE_SOURCE] @@ -16,13 +18,7 @@ dependencies = [ ('flex', '2.5.35'), ('Bison', '2.7'), ] -# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories -#sanity_check_paths = { -# 'files': [], -# 'dirs': ["."] -#} -# You SHOULD change the following line; Kindly consult other easyconfigs for possible options preconfigopts = "./autogen.sh && " -moduleclass = 'vis' parallel = 1 +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb index 3b70d88927..1509c39d22 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb @@ -9,12 +9,10 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'GCC', 'version': '4.7.2'} toolchainopts = {'optarch': True, 'pic': True} -sources = [ - 'ncurses-5.9.tar.gz', -] +sources = ['ncurses-5.9.tar.gz'] source_urls = [ - 'http://ftpmirror.gnu.org/%s' % name, - 'ftp://invisible-island.net/ncurses/5.9', + 'http://ftpmirror.gnu.org/%(name)s', + 'ftp://invisible-island.net/ncurses/5.9', # for patch file below ] patches = ['ncurses-5.9-20130406.patch.gz'] diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb index 062ad8ceb8..7be5764ef6 100644 --- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb @@ -9,7 +9,6 @@ sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'goolf', 'version': '1.4.10'} - sanity_check_paths = { 'files': ['include/X11/extensions/Print.h', 'include/X11/extensions/Printstr.h'], 'dirs': [] diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb index 0d1af06991..f66766ca39 100644 --- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb @@ -4,10 +4,9 @@ version = '1.0.5' homepage = 'http://xorg.freedesktop.org/' description = """X.org PrintProto protocol headers.""" -source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] sources = [SOURCELOWER_TAR_GZ] -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) - +toolchain = {'name': 'ictce', 'version': '4.1.13'} sanity_check_paths = { 'files': ['include/X11/extensions/Print.h', 'include/X11/extensions/Printstr.h'], diff --git a/easybuild/easyconfigs/p/test.pl b/easybuild/easyconfigs/p/test.pl new file mode 100644 index 0000000000..84d595528c --- /dev/null +++ b/easybuild/easyconfigs/p/test.pl @@ -0,0 +1,8 @@ +use strict; + use Test::More; +use Config; + my $tainted_path = substr($^X,0,0) . "/no/such/file"; + my $err; + # $! is used in a tainted expression, so gets tainted + open my $fh, $tainted_path or $err= "$!"; + unlike($err, qr/^\d+$/, 'tainted $!'); diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb index 6be0e5d58e..efca87d195 100644 --- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb @@ -2,9 +2,7 @@ name = 'xbitmaps' version = '1.1.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ -provides bitmaps for x -""" +description = """provides bitmaps for x""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb index 8d01c7c711..ae60178976 100644 --- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb @@ -2,10 +2,8 @@ name = 'xbitmaps' version = '1.1.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ -provides bitmaps for x -""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +description = """provides bitmaps for x""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/data/'] diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb index 44f01127f7..d24f9eabc0 100644 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb @@ -7,7 +7,8 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} python = 'Python' pyver = '2.7.3' @@ -17,8 +18,8 @@ dependencies = [(python, pyver)] pyshortver = '.'.join(pyver.split('.')[0:2]) sanity_check_paths = { - 'files': ['lib/pkgconfig/xcb-proto.pc'], - 'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver] - } + 'files': ['lib/pkgconfig/xcb-proto.pc'], + 'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver] +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb index f39b1a0905..69a6696766 100644 --- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb @@ -3,13 +3,13 @@ version = '7.2.1' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """XExtProto protocol headers.""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] - sanity_check_paths = { 'files': ['include/X11/extensions/%s' % x for x in [ 'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h', diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb index 823fd1b838..5a3a786cfe 100644 --- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb @@ -2,20 +2,21 @@ name = 'xproto' version = '7.0.23' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = "X protocol and ancillary headers" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.6'}) +description = "X protocol and ancillary headers" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] sanity_check_paths = { - 'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h', - 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', - 'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h', - 'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h', - 'XWDFile.h', 'Xwinsock.h']], - 'dirs' : [] - } + 'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h', + 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', + 'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h', + 'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h', + 'XWDFile.h', 'Xwinsock.h']], + 'dirs': [] +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb index 5e1f6186bc..423e0c0171 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb @@ -3,7 +3,8 @@ version = '1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """ -xtrans includes a number of routines to make X implementations transport-independent; at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. + xtrans includes a number of routines to make X implementations transport-independent; + at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb index 073287d887..429bb549e4 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb @@ -3,9 +3,10 @@ version = '1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" description = """ -xtrans includes a number of routines to make X implementations transport-independent; at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. + xtrans includes a number of routines to make X implementations transport-independent; + at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. """ -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -- GitLab From 4cec69272f74a3b794dfbb55e9245c4ee21a51de Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 3 Oct 2013 18:26:43 +0200 Subject: [PATCH 070/811] more remarks fixed --- easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb index df0822e479..b4346e2304 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb @@ -11,14 +11,8 @@ toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -#builddependencies = [ -# ('xextproto', '7.2.1'), -# ('printproto', '1.0.5'), -#] dependencies = [ -# ('libX11', '1.6.1'), -# ('libXext', '1.3.2'), ('libXt', '1.1.4'), ] sanity_check_paths = { -- GitLab From 6421c314e41afc2cfaa5c6d4e5dc55a7a5d60728 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 18:30:58 +0200 Subject: [PATCH 071/811] can no longer download DB without registering --- easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/d/DB/DB-5.3.21-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/d/DB/DB-6.0.20-goolf-1.4.10.eb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb b/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb index de84ff33a6..bebd111842 100644 --- a/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """Berkeley DB enables the development of custom data management s toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://download.oracle.com/berkeley-db/'] +# download via http://www.oracle.com/technetwork/products/berkeleydb/downloads/, requires registration sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/d/DB/DB-5.3.21-goolf-1.4.10.eb b/easybuild/easyconfigs/d/DB/DB-5.3.21-goolf-1.4.10.eb index a6c81259e4..21966bc11e 100644 --- a/easybuild/easyconfigs/d/DB/DB-5.3.21-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/DB/DB-5.3.21-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """Berkeley DB enables the development of custom data management s toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://download.oracle.com/berkeley-db/'] +# download via http://www.oracle.com/technetwork/products/berkeleydb/downloads/, requires registration sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/d/DB/DB-6.0.20-goolf-1.4.10.eb b/easybuild/easyconfigs/d/DB/DB-6.0.20-goolf-1.4.10.eb index a63fd7886e..7c5219a47a 100644 --- a/easybuild/easyconfigs/d/DB/DB-6.0.20-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/DB/DB-6.0.20-goolf-1.4.10.eb @@ -7,8 +7,8 @@ description = """Berkeley DB enables the development of custom data management s toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://download.oracle.com/berkeley-db/'] -sources = [SOURCE_TAR_GZ] +# download via http://www.oracle.com/technetwork/products/berkeleydb/downloads/, requires registration +sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { 'files': ["include/db.h"], -- GitLab From c92ed47f5978f9095edb3a31f74767d3a0011c66 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 21:40:33 +0200 Subject: [PATCH 072/811] update release notes, bump to v1.8.0.0 --- RELEASE_NOTES | 18 ++++++++++++++++++ setup.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 53cfbb8221..ec7a5cf8ba 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,6 +4,24 @@ For more detailed information, please see the git log. The latest version of easybuild-easyconfig provides 1,631 easyconfig files, for 329 different software packages and 25 different (compiler) toolchains. +v1.8.0.0 (October 4th 2013) +--------------------------- + +feature + bugfix release +- added example easyconfig files for N new software packages: + - BOINC (#436), DB (#343, #449), fastahack (#374), FDTD Solutions (#387), FoldX (#440, #442), Mathematica (#394), + Mesquite (#447), MUMPS (#447), ParMGridGen (#447) +- added additional easyconfigs for goalf, gompi, ClangGCC, cgmvapich2, cgmvolf toolchains (#350, #441) +- added additional easyconfigs for various software packages: + - ATLAS, Bison, bzip2, Clang, CMake, cURL, EasyBuild, expat, FFTW, GDB, gettext, git, HPL, LAPACK, libreadline, + M4, METIS, MVAPICH2, Mercurial, ncurses, OpenBLAS, OpenMPI, ParMETIS, Python, ScaLAPACK, SCOTCH, Valgrind, zlib +- various 'bug' fixes, including: + - fix source URL for lockfile in Python easyconfigs (#428) + - correct dependency specifications w.r.t. versionsuffix and toolchain (#431) + - this is required to support building the affected easyconfigs with a custom module naming scheme + - correct PSI patch file to avoid errors w.r.t. memcpy not being in scope (#446) + - fix gettext build with adding --without-emacs configure options, add gettext as dependency for a2ps (#448) + v1.7.0.0 (September 2nd 2013) ----------------------------- diff --git a/setup.py b/setup.py index 75477e9dca..b4af8975bb 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.8.0.0dev" +VERSION = "1.8.0.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 85761b32e8f345966aea534f2fde782ce19c4b0a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 22:11:26 +0200 Subject: [PATCH 073/811] fix/update counts --- RELEASE_NOTES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ec7a5cf8ba..7794008176 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,14 +1,14 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 1,631 easyconfig files, for 329 different software packages +The latest version of easybuild-easyconfig provides 1,699 easyconfig files, for 338 different software packages and 25 different (compiler) toolchains. v1.8.0.0 (October 4th 2013) --------------------------- feature + bugfix release -- added example easyconfig files for N new software packages: +- added example easyconfig files for 9 new software packages: - BOINC (#436), DB (#343, #449), fastahack (#374), FDTD Solutions (#387), FoldX (#440, #442), Mathematica (#394), Mesquite (#447), MUMPS (#447), ParMGridGen (#447) - added additional easyconfigs for goalf, gompi, ClangGCC, cgmvapich2, cgmvolf toolchains (#350, #441) -- GitLab From 9ac214da0f63977aa1da6ff9f4c52952f956e2b1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Oct 2013 22:42:09 +0200 Subject: [PATCH 074/811] fix typos in CONTRIBUTING file --- CONTRIBUTING.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0a0a7bff57..4e760643ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,17 +3,17 @@ We'd love you to contribute back to EasyBuild, and here's how you can do it: the ## Preperation -### Fork easybuild-easyconfings +### Fork easybuild-easyconfigs -First, you'll need to fork [easybuild-easyconfings on GitHub](http://github.com/hpcugent/easybuild-easyconfigs). +First, you'll need to fork [easybuild-easyconfigs on GitHub](http://github.com/hpcugent/easybuild-easyconfigs). If you do not have a (free) GitHub account yet, you'll need to get one. You should also register an SSH public key, so you can easily clone, push to and pull from your repository. -### Clone your easybuild-easyconfings repository +### Clone your easybuild-easyconfigs repository -Clone your fork of the easybuild-easyconfings repository to your favorite workstation. +Clone your fork of the easybuild-easyconfigs repository to your favorite workstation. ```bash git clone git@github.com:YOUR\_GITHUB\_LOGIN/easybuild-easyconfigs.git @@ -21,7 +21,7 @@ git clone git@github.com:YOUR\_GITHUB\_LOGIN/easybuild-easyconfigs.git ### Pull in the develop branch -Pull the _develop_ branch from the main easybuild-easyconfings repository: +Pull the _develop_ branch from the main easybuild-easyconfigs repository: ```bash cd easybuild @@ -33,7 +33,7 @@ git pull github_hpcugent develop ### Keep develop up-to-date -The _develop_ branch hosts the latest bleeding-edge version of easybuild-easyconfings, and is merged into _master_ regularly (after thorough testing). +The _develop_ branch hosts the latest bleeding-edge version of easybuild-easyconfigs, and is merged into _master_ regularly (after thorough testing). Make sure you update it every time you create a feature branch (see below): @@ -85,11 +85,11 @@ If you are working on several things at the same time, try and keep things isola ## Pull request -When you've finished the implementation of a particular contribution, here's how to get it into the main easybuild-easyconfings repository (also see https://help.github.com/articles/using-pull-requests/) +When you've finished the implementation of a particular contribution, here's how to get it into the main easybuild-easyconfigs repository (also see https://help.github.com/articles/using-pull-requests/) ### Push your branch -Push your branch to your easybuild-easyconfings repository on GitHub: +Push your branch to your easybuild-easyconfigs repository on GitHub: ```bash git push origin @@ -98,11 +98,11 @@ git push origin ### Issue a pull request -Issue a pull request for your branch into the main easybuild-easyconfings repository, as follows: +Issue a pull request for your branch into the main easybuild-easyconfigs repository, as follows: * go to github.com/YOUR\_GITHUB\_LOGIN/easybuild-easyconfigs, and make sure the branch you just pushed is selected (not _master_, but __) - * issue a pull request (see button at the top of the page) for your branch to the **_develop_** branch of the main easybuild-easyconfings repository; **note**: don't issue a pull request to the _master_ branch, as it will be simply closed by the EasyBuild team + * issue a pull request (see button at the top of the page) for your branch to the **_develop_** branch of the main easybuild-easyconfigs repository; **note**: don't issue a pull request to the _master_ branch, as it will be simply closed by the EasyBuild team * make sure to reference the corresponding issue number in the pull request, using the notation # followed by a number, e.g. `#83` @@ -129,6 +129,6 @@ Try and act on the remarks made, either by commiting additional changes to your ### Aftermath -Once your pull request has been reviewed and remarks have been processed, your contribution will be merged into the _develop_ branch of the main easybuild-easyconfings repository. +Once your pull request has been reviewed and remarks have been processed, your contribution will be merged into the _develop_ branch of the main easybuild-easyconfigs repository. On frequent occasions, the _develop_ branch is merged into the _master_ branch and a new version is tagged, and your contribution truly becomes part of EasyBuild. -- GitLab From da67b2b98dbe62394a53b92b5ca34636e38f4d40 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Oct 2013 09:49:00 +0200 Subject: [PATCH 075/811] fix typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4e760643ad..84580039c4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ We'd love you to contribute back to EasyBuild, and here's how you can do it: the branch - hack - pull request cycle. -## Preperation +## Praperation ### Fork easybuild-easyconfigs -- GitLab From cb03391fcf086d4c5a270b7f347c262dbea7dd91 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 4 Oct 2013 11:04:47 +0200 Subject: [PATCH 076/811] Added arpack-ng-3.1.3 with ictce-5.5.0 without MPI --- .../arpack-ng-3.1.3-ictce-5.5.0-mt.eb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb new file mode 100644 index 0000000000..b1b9520fb2 --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb @@ -0,0 +1,21 @@ +name = 'arpack-ng' +version = '3.1.3' +versionsuffix = '-mt' + +homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/' +description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': False} + +source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = '--with-pic --with-blas="$LIBLAS_MT" --with-lapack="$LIBLAPACK_MT"' + +sanity_check_paths = { + 'files': ["lib/libarpack.a", "lib/libarpack.so"], + 'dirs': [] +} + +moduleclass = 'numlib' -- GitLab From 04349c61039f837fe19bacf85e1ea69ed1d8a846 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Oct 2013 11:57:50 +0200 Subject: [PATCH 077/811] exclude EMACS support in a2ps because of build failures --- easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb | 1 + easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb | 1 + easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb | 1 + easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb | 1 + 4 files changed, 4 insertions(+) diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb index a93ac4e406..aae867d2af 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb @@ -23,6 +23,7 @@ dependencies = [ ('gperf', '3.0.4'), ] +preconfigopts = 'EMACS=no' configopts = '--with-gnu-gettext' sanity_check_paths = { diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb index d6c1a43c1a..85c12af224 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb @@ -23,6 +23,7 @@ dependencies = [ ('gperf', '3.0.4'), ] +preconfigopts = 'EMACS=no' configopts = '--with-gnu-gettext' sanity_check_paths = { diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb index 6b64a7af7a..5f8b190cff 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb @@ -23,6 +23,7 @@ dependencies = [ ('gperf', '3.0.4'), ] +preconfigopts = 'EMACS=no' configopts = '--with-gnu-gettext' sanity_check_paths = { diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb index 94e7fdc8bb..442f9c380e 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb @@ -24,6 +24,7 @@ dependencies = [ ('gperf', '3.0.4'), ] +preconfigopts = 'EMACS=no' configopts = '--with-gnu-gettext' sanity_check_paths = { -- GitLab From 324c5f95979ace1841bd16bae08c3ae7f260071f Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 4 Oct 2013 12:58:54 +0200 Subject: [PATCH 078/811] Added arpack-ng-3.1.3 with ictce-5.5.0 with MPI --- .../arpack-ng-3.1.3-configure-mpi.patch | 11 ++++++++++ .../arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb | 22 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch new file mode 100644 index 0000000000..1163049e8d --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch @@ -0,0 +1,11 @@ +--- configure.orig 2013-04-02 10:33:44.000000000 +0200 ++++ configure 2013-10-04 12:53:16.314182265 +0200 +@@ -12052,7 +12052,7 @@ + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) ++ icc* | ifort* | mpif77*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fPIC' + lt_prog_compiler_static_F77='-static' diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..4d8ff60f8f --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb @@ -0,0 +1,22 @@ +name = 'arpack-ng' +version = '3.1.3' + +homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/' +description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True} + +source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['arpack-ng-3.1.3-configure-mpi.patch'] + +configopts = '--enable-mpi --with-pic --with-blas="$LIBLAS" --with-lapack="$LIBLAPACK"' + +sanity_check_paths = { + 'files': ["lib/libarpack.a", "lib/libarpack.so"], + 'dirs': [] +} + +moduleclass = 'numlib' -- GitLab From ba6c5a511ed0440790ea97703e82993b00733ce6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Oct 2013 14:20:19 +0200 Subject: [PATCH 079/811] add easyconfigs for NCL with ictce + deps --- .../c/cURL/cURL-7.28.1-ictce-4.1.13.eb | 22 ++++++++++ .../e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb | 26 ++++++++++++ .../f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb | 17 ++++++++ .../g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb | 22 ++++++++++ .../g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb | 20 +++++++++ .../h/HDF/HDF-4.2.8-ictce-4.1.13.eb | 21 ++++++++++ .../h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb | 25 +++++++++++ .../n/NCL/NCL-6.1.2-ictce-4.1.13.eb | 37 +++++++++++++++++ .../netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb | 22 ++++++++++ .../u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb | 41 +++++++++++++++++++ 10 files changed, 253 insertions(+) create mode 100644 easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb create mode 100644 easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..0b0ea92016 --- /dev/null +++ b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb @@ -0,0 +1,22 @@ +name = 'cURL' +version = '7.28.1' + +homepage = 'http://curl.haxx.se' +description = """libcurl is a free and easy-to-use client-side URL transfer library, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports + SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, + proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, + Kerberos), file transfer resume, http proxy tunneling and more.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://curl.haxx.se/download/'] + +sanity_check_paths = { + 'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..f76aa98e59 --- /dev/null +++ b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb @@ -0,0 +1,26 @@ +name = 'ESMF' +version = '6.1.1' + +homepage = 'http://sourceforge.net/projects/esmf' +description = """The Earth System Modeling Framework (ESMF) is software for building and coupling weather, + climate, and related models.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%s_%s_src.tar.gz' % (name.lower(), '_'.join(version.split('.')))] + +dependencies = [ + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('netCDF-C++', '4.2'), +] + +# LDFLAGS has to be unset to avoid linking issues +preinstallopts = "unset LDFLAGS && " + +# too parallel causes the build to become really slow +maxparallel = 8 + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..e473bccccb --- /dev/null +++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'freeglut' +version = '2.8.1' + +homepage = 'http://freeglut.sourceforge.net/' +description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(name)s'] + +sanity_check_paths = { + 'files': ['lib/libglut.a', 'lib/libglut.so'], + 'dirs': ['include/GL'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..8f1faabe98 --- /dev/null +++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb @@ -0,0 +1,22 @@ +name = 'GDAL' +version = '1.9.2' + +homepage = 'http://www.gdal.org/' +description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style + Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model + to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for + data translation and processing.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://download.osgeo.org/gdal/'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +sanity_check_paths = { + 'files': ['lib/libgdal.so', 'lib/libgdal.a'], + 'dirs': ['bin', 'include'] +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..73e2caf3fb --- /dev/null +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb @@ -0,0 +1,20 @@ +name = 'g2lib' +version = '1.4.0' + +homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' +description = """Library contains GRIB2 encoder/decoder and search/indexing routines.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True} + +dependencies = [('JasPer', '1.900.1')] + +sources = ['%s-%s.tar' % (name, version)] +source_urls = [homepage] + +patches = ['fix_makefile.patch'] + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb new file mode 100644 index 0000000000..29e1c9b8d8 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'HDF' +version = '4.2.8' + +homepage = 'http://www.hdfgroup.org/products/hdf4/' +description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True, 'pic': True} + +dependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), + ] + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] + +configopts = "--with-szip=$EBROOTSZIP" + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb new file mode 100644 index 0000000000..8fec53bc83 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb @@ -0,0 +1,25 @@ +name = 'HDF5' +version = '1.8.10' +versionsuffix = '-no-mpi' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'HDF5_%(version)s_configure_ictce.patch', + 'configure_libtool.patch', +] + +dependencies = [ + ('zlib', '1.2.7'), + ('Szip', '2.1'), +] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..6006d25573 --- /dev/null +++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb @@ -0,0 +1,37 @@ +name = 'NCL' +version = '6.1.2' + +homepage = 'http://www.ncl.ucar.edu' +description = """NCL is an interpreted language designed specifically for scientific data analysis and + visualization.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True, 'pic': True, 'usempi': True} + +sources = ['%(namelower)s_ncarg-%(version)s.tar.gz'] + +patches = [ + 'NCL-6.1_fix-HDF-includes.patch', +] + +dependencies = [ + ('cURL', '7.28.1'), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('JasPer', '1.900.1'), + ('g2lib', '1.4.0'), + ('g2clib', '1.4.0'), + ('HDF', '4.2.8'), + ('Szip', '2.1'), + ('freetype', '2.4.11'), + ('zlib', '1.2.7'), + ('GDAL', '1.9.2'), + ('UDUNITS', '2.1.24'), + ('ESMF', '6.1.1'), + ('bzip2', '1.0.6'), +] +builddependencies = [('makedepend', '1.0.4')] + +osdependencies = ['cairo-devel'] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..7c205aa876 --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb @@ -0,0 +1,22 @@ +name = 'netCDF-C++' +version = '4.2' + +homepage = 'http://www.unidata.ucar.edu/software/netcdf/' +description = """NetCDF (network Common Data Form) is a set of software libraries + and machine-independent data formats that support the creation, access, and sharing of array-oriented + scientific data.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True} + +sources = ['netcdf-cxx-%(version)s.tar.gz'] +source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] + +dependencies = [('netCDF', '4.2.1.1')] + +sanity_check_paths = { + 'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'], + 'dirs': [], +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb new file mode 100644 index 0000000000..de58c80ab6 --- /dev/null +++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb @@ -0,0 +1,41 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg, Ghent University +# Authors:: Fotis Georgatos , Kenneth Hoste (Ghent University) +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-97.html +## + +name = 'UDUNITS' +version = '2.1.24' + +homepage = 'http://www.unidata.ucar.edu/software/udunits/' +description = """UDUNITS supports conversion of unit specifications between formatted and binary forms, + arithmetic manipulation of units, and conversion of values between compatible scales of measurement.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True, 'pic': True} + +# eg. ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.24.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits'] + +sanity_check_paths = { + 'files': [ + 'bin/udunits2', + 'include/converter.h', + 'include/udunits2.h', + 'include/udunits.h', + 'lib/libudunits2.a', + 'lib/libudunits2.so', + ], + 'dirs': ['share'], +} + +parallel = 1 + +moduleclass = 'phys' -- GitLab From 2ec9f558d6e55e0dd25892971351cc2c07d58010 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Oct 2013 14:37:32 +0200 Subject: [PATCH 080/811] add missing g2clib dep for NCL --- .../g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..42f32bafc7 --- /dev/null +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb @@ -0,0 +1,18 @@ +name = 'g2clib' +version = '1.4.0' + +homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' +description = """Library contains GRIB2 encoder/decoder ("C" version).""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True} + +dependencies = [('JasPer', '1.900.1')] + +sources = ['%s-%s.tar' % (name, version)] +source_urls = [homepage] + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'data' -- GitLab From 2fe25c8a3ca68501e4f4cf1b048538e53dfd9404 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Oct 2013 14:45:52 +0200 Subject: [PATCH 081/811] last edits to release notes --- RELEASE_NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 7794008176..112abdf7e6 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -21,6 +21,7 @@ feature + bugfix release - this is required to support building the affected easyconfigs with a custom module naming scheme - correct PSI patch file to avoid errors w.r.t. memcpy not being in scope (#446) - fix gettext build with adding --without-emacs configure options, add gettext as dependency for a2ps (#448) + - exclude EMACS support in a2ps because of build failures (#452) v1.7.0.0 (September 2nd 2013) ----------------------------- -- GitLab From 3a041bcf665b59ba67e0914b08ff5667e1380e10 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Oct 2013 14:58:23 +0200 Subject: [PATCH 082/811] add missing JasPer dep for HDF --- .../b/Bison/Bison-2.5-iqacml-3.7.3.eb | 20 +++++++++++++++++++ .../f/flex/flex-2.5.35-iqacml-3.7.3.eb | 14 +++++++++++++ .../HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb | 9 +++++---- .../h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb | 9 +++++---- .../h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb | 9 +++++---- .../h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb | 9 +++++---- .../h/HDF/HDF-4.2.8-ictce-4.1.13.eb | 9 +++++---- .../h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 9 +++++---- 8 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb create mode 100644 easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb new file mode 100644 index 0000000000..1b1d714087 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.5' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar + into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'iqacml', 'version': '3.7.3'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb new file mode 100644 index 0000000000..e1c44104d5 --- /dev/null +++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb @@ -0,0 +1,14 @@ +name = 'flex' +version = '2.5.35' + +homepage = 'http://flex.sourceforge.net/' +description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, + sometimes called a tokenizer, is a program which recognizes lexical patterns in text.""" + +toolchain = {'name': 'iqacml', 'version': '3.7.3'} +toolchainopts = {'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb index 77aaf88b28..6c4821a391 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb @@ -8,10 +8,11 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), + ('JasPer', '1.900.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb index beeac81a9f..1ca5d08181 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb @@ -7,10 +7,11 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), + ('JasPer', '1.900.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb index 4cfefc2018..d71e54280e 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb @@ -8,10 +8,11 @@ toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), + ('JasPer', '1.900.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb index 0bbde1cc9d..df3727db52 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb @@ -9,10 +9,11 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), + ('JasPer', '1.900.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb index 29e1c9b8d8..12c89a77b4 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb @@ -8,10 +8,11 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.37'), - ('Bison', '2.7'), - ('Szip', '2.1'), - ] + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), + ('JasPer', '1.900.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index 652ae87480..a3407d071e 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -8,10 +8,11 @@ toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.37'), - ('Bison', '2.7'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), + ('JasPer', '1.900.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -- GitLab From 6079c25a231e12a9818bf1f7b72ebafacc861929 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 26 Sep 2013 15:30:03 +0200 Subject: [PATCH 083/811] Update Python-2.7.5 to the goalf-1.5.12-no-OFED toolchain --- .../bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb | 15 +++++ .../libreadline-6.2-goalf-1.5.12-no-OFED.eb | 24 ++++++++ .../ncurses-5.9-goalf-1.5.12-no-OFED.eb | 15 +++++ .../Python-2.7.5-goalf-1.5.12-no-OFED.eb | 61 +++++++++++++++++++ .../z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb | 20 ++++++ 5 files changed, 135 insertions(+) create mode 100644 easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..de5433b28f --- /dev/null +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,15 @@ +name = 'bzip2' +version = '1.0.6' + +homepage = 'http://www.bzip.org/' +description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically + compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical + compressors), whilst being around twice as fast at compression and six times faster at decompression.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'pic': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.bzip.org/%(version)s/'] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..641658be88 --- /dev/null +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,24 @@ +name = 'libreadline' +version = '6.2' + +homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html' +description = """The GNU Readline library provides a set of functions for use by applications that + allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. + The Readline library includes additional functions to maintain a list of previously-entered command lines, + to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} + +sources = ['readline-%(version)s.tar.gz'] +source_urls = ['http://ftpmirror.gnu.org/readline/'] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h', + 'rlstdc.h', 'rltypedefs.h', 'tilde.h']], + 'dirs' : [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..ec0e28d989 --- /dev/null +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,15 @@ +name = 'ncurses' +version = '5.9' + +homepage = 'http://www.gnu.org/software/ncurses/' +description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, + and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and + function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..61eaa9350c --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,61 @@ +name = 'Python' +version = '2.7.5' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.0' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python-%(version)s_libffi_int128_icc.patch'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.8'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '0.6c11', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..ae12b8259f --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,20 @@ +name = 'zlib' +version = '1.2.8' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, + not covered by any patents -- lossless data-compression library for use on virtually any + computer hardware and operating system.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 1a733e6433bad83109508a1632c5bfa839b4883c Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 26 Sep 2013 19:16:39 +0200 Subject: [PATCH 084/811] Added PSI 4.0b5 with goalf-1.5.12-no-OFED --- ....53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb | 26 ++++++++++++++++++ .../p/PSI/PSI-4.0b5-failed-test.patch | 12 +++++++++ .../p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb | 27 +++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-failed-test.patch create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb new file mode 100644 index 0000000000..ac4dad53b0 --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb @@ -0,0 +1,26 @@ +name = 'Boost' +version = '1.53.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +pythonversion = '2.7.5' +versionsuffix = '-Python-%s' % pythonversion + +dependencies = [ + ('bzip2', '1.0.6'), + ('Python', pythonversion), +] + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-failed-test.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-failed-test.patch new file mode 100644 index 0000000000..cd7f6b5885 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-failed-test.patch @@ -0,0 +1,12 @@ +diff -ur psi4.0b5.orig/tests/Makefile.in psi4.0b5/tests/Makefile.in +--- psi4.0b5.orig/tests/Makefile.in 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/tests/Makefile.in 2013-09-11 16:40:22.672796277 +0200 +@@ -33,7 +33,7 @@ + + opt_subdirs = opt1 opt1-fd opt2 opt2-fd opt3 opt4 opt5 opt6 opt7 pywrap-opt-sowreap + +-freq_subdirs = fd-gradient fd-freq-energy fd-freq-gradient dft-freq gibbs pywrap-freq-e-sowreap ++freq_subdirs = fd-gradient fd-freq-gradient dft-freq gibbs pywrap-freq-e-sowreap + + mp2_subdirs = mp2-1 omp2-1 omp2-2 omp2-3 omp2-4 omp2-5 omp3-1 omp3-2 omp3-3 omp3-4 omp3-5 ocepa1 ocepa2 ocepa3 omp2_5-1 omp2_5-2 omp2-grad1 omp2-grad2 omp3-grad1 omp3-grad2 omp2_5-grad1 omp2_5-grad2 ocepa-grad1 ocepa-grad2 mp2-grad1 mp2-grad2 mp3-grad1 mp3-grad2 mp2_5-grad1 mp2_5-grad2 cepa0-grad1 cepa0-grad2 ocepa-freq1 + diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..eb824cecd8 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,27 @@ +name = 'PSI' +version = '4.0b5' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +# not using MPI results in a build relying on multithreaded BLAS solely +toolchainopts = {'usempi': False} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +# The test works but it segfaults on exit +patches = ['PSI-4.0b5-failed-test.patch'] + +python = 'Python' +pyver = '2.7.5' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' -- GitLab From b0dd763baca8a3a303b2d41b10d90d039979d269 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 27 Sep 2013 09:49:43 +0200 Subject: [PATCH 085/811] Added thread pool patch to PSI-4.0b5-goalf-1.5.12-no-OFED --- .../p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb | 6 ++++-- .../p/PSI/PSI-4.0b5-thread-pool.patch | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb index eb824cecd8..50693306ba 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb @@ -13,8 +13,10 @@ toolchainopts = {'usempi': False} source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] -# The test works but it segfaults on exit -patches = ['PSI-4.0b5-failed-test.patch'] +patches = [ + 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-thread-pool.patch', +] python = 'Python' pyver = '2.7.5' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch new file mode 100644 index 0000000000..fe03b68857 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch @@ -0,0 +1,20 @@ +diff -ur psi4.0b5.orig/src/bin/detci/tpool.cc psi4.0b5/src/bin/detci/tpool.cc +--- psi4.0b5.orig/src/bin/detci/tpool.cc 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/src/bin/detci/tpool.cc 2013-09-24 16:00:34.584896769 +0200 +@@ -78,7 +78,7 @@ + tpool->queue_tail = NULL; + tpool->queue_closed = 0; + tpool->shutdown = 0; +- tpool->threads_awake = 0; ++ tpool->threads_awake = num_worker_threads; + if ((rtn = pthread_mutex_init(&(tpool->queue_lock), NULL)) != 0){ + str = "pthread_mutex_init "; + str += strerror(rtn); +@@ -115,7 +115,6 @@ + str += boost::lexical_cast( rtn) ; + throw PsiException(str,__FILE__,__LINE__); + } +- tpool->threads_awake++; + } + + *tpoolp = tpool; -- GitLab From 1824b9ec2d7354a496c602233fb9b6b22399816c Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 1 Oct 2013 14:55:21 +0200 Subject: [PATCH 086/811] Added patch to PSI for new-plugin I've added two env vars to the configure script: one for the install directory for the source and one for the install directory of the objects. --- .../p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb | 1 + .../p/PSI/PSI-4.0b5-new-plugin.patch | 12074 ++++++++++++++++ 2 files changed, 12075 insertions(+) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb index 50693306ba..0bc53b7daa 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb @@ -16,6 +16,7 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', + 'PSI-4.0b5-new-plugin.patch', ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch new file mode 100644 index 0000000000..c3f18f8ce5 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch @@ -0,0 +1,12074 @@ +diff -urN psi4.0b5.org/configure psi4.0b5/configure +--- psi4.0b5.org/configure 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/configure 2013-09-20 18:01:52.468070030 +0200 +@@ -1,20 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for psi 4.0.0-beta5. ++# Generated by GNU Autoconf 2.69 for psi 4.0.0-beta5. + # + # Report bugs to . + # +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -22,23 +24,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -46,7 +40,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -57,7 +57,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -80,13 +80,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -96,15 +89,16 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++as_myself= ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -116,12 +110,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -133,330 +131,345 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ++# Use a proper internal environment variable to ensure we don't fall ++ # into an infinite loop, continuously re-executing ourselves. ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then ++ _as_can_reexec=no; export _as_can_reexec; ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++as_fn_exit 255 ++ fi ++ # We don't want this to propagate to other subprocesses. ++ { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1 ++test -x / || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : + else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : +-else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- ++ if test "x$CONFIG_SHELL" != x; then : ++ export CONFIG_SHELL ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++exit 255 ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and psicode@users.sourceforge.net ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 ++fi + fi +- +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS + ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ + +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi ++} # as_fn_mkdir_p + +-if as_func_ret_success; then +- : ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' + else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' + else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +-fi +- +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } +-fi +- +- +-fi +- +-fi +- ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error + +-exitcode=0 +-if as_func_success; then +- : ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. ++ as_expr=false + fi + +-if as_func_ret_success; then +- : ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename + else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -473,9 +486,12 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have ++ # already done that, so ensure we don't try to do so again and fall ++ # in an infinite loop. This has already happened in practice. ++ _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). +@@ -484,29 +500,18 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -521,49 +526,29 @@ + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -572,11 +557,11 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +- +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -591,7 +576,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='psi' +@@ -599,6 +583,7 @@ + PACKAGE_VERSION='4.0.0-beta5' + PACKAGE_STRING='psi 4.0.0-beta5' + PACKAGE_BUGREPORT='psicode@users.sourceforge.net' ++PACKAGE_URL='' + + ac_default_prefix=/usr/local/psi4 + # Factoring default headers for most tests. +@@ -751,6 +736,8 @@ + build_vendor + build_cpu + build ++PSI_SRC_INSTALL_DIR ++PSI_OBJ_INSTALL_DIR + abs_top_builddir + abs_top_srcdir + PSI_BUGREPORT +@@ -786,6 +773,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -831,6 +819,8 @@ + ac_precious_vars='build_alias + host_alias + target_alias ++PSI_OBJ_INSTALL_DIR ++PSI_SRC_INSTALL_DIR + CC + CFLAGS + LDFLAGS +@@ -906,8 +896,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -952,8 +943,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -979,8 +969,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1184,8 +1173,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1201,8 +1189,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1232,17 +1219,17 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + +@@ -1251,7 +1238,7 @@ + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +@@ -1259,15 +1246,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1290,8 +1275,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1305,8 +1289,6 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1321,11 +1303,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1364,13 +1344,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1410,7 +1388,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1535,107 +1513,671 @@ + --with-plugins Compiles PSI4 to be compatible with plugins. + --with-insanely-strict --with-insanely-strict=yes to turn on strict compiler warnings (cover your eyes, it ain't pretty, for now) + +-Some influential environment variables: +- CC C compiler command +- CFLAGS C compiler flags +- LDFLAGS linker flags, e.g. -L if you have libraries in a +- nonstandard directory +- LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if +- you have headers in a nonstandard directory +- CXX C++ compiler command +- CXXFLAGS C++ compiler flags +- F77 Fortran 77 compiler command +- FFLAGS Fortran 77 compiler flags +- CPP C preprocessor +- CXXCPP C++ preprocessor +- PYTHON The `Python' interpreter to use. Defaults to the first program +- found out of: `python', `python2', `python2.6', `python2.5', +- `python2.4'. Make sure you have installed the developer +- libraries, too. ++Some influential environment variables: ++ PSI_OBJ_INSTALL_DIR ++ Directory where to place the psi object files ++ PSI_SRC_INSTALL_DIR ++ Directory where to place the psi source files ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L if you have libraries in a ++ nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory ++ CXX C++ compiler command ++ CXXFLAGS C++ compiler flags ++ F77 Fortran 77 compiler command ++ FFLAGS Fortran 77 compiler flags ++ CPP C preprocessor ++ CXXCPP C++ preprocessor ++ PYTHON The `Python' interpreter to use. Defaults to the first program ++ found out of: `python', `python2', `python2.6', `python2.5', ++ `python2.4'. Make sure you have installed the developer ++ libraries, too. ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++Report bugs to . ++_ACEOF ++ac_status=$? ++fi ++ ++if test "$ac_init_help" = "recursive"; then ++ # If there are subdirs, report their specific --help. ++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive ++ else ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } ++ done ++fi ++ ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++psi configure 4.0.0-beta5 ++generated by GNU Autoconf 2.69 ++ ++Copyright (C) 2012 Free Software Foundation, Inc. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit ++fi ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_cxx_try_compile LINENO ++# ---------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_compile ++ ++# ac_fn_f77_try_compile LINENO ++# ---------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_f77_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_f77_try_compile ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_cpp ++ ++# ac_fn_cxx_try_cpp LINENO ++# ------------------------ ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_cpp ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ test -x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_link ++ ++# ac_fn_cxx_try_link LINENO ++# ------------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ test -x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + +-Use these variables to override the choices made by `configure' or to help +-it to find libraries and programs with nonstandard names/locations. ++} # ac_fn_cxx_try_link + +-Report bugs to . ++# ac_fn_cxx_check_func LINENO FUNC VAR ++# ------------------------------------ ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_cxx_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} + _ACEOF +-ac_status=$? ++if ac_fn_cxx_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +-if test "$ac_init_help" = "recursive"; then +- # If there are subdirs, report their specific --help. +- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || +- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || +- continue +- ac_builddir=. ++} # ac_fn_cxx_check_func + +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; ++# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES ++# --------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_cxx_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if eval \${$3+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( $as_echo "## -------------------------------------------- ## ++## Report this to psicode@users.sourceforge.net ## ++## -------------------------------------------- ##" ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; + esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++} # ac_fn_cxx_check_header_mongrel ++ ++# ac_fn_cxx_try_run LINENO ++# ------------------------ ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_cxx_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; + esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- cd "$ac_dir" || { ac_status=$?; continue; } +- # Check for guested configure. +- if test -f "$ac_srcdir/configure.gnu"; then +- echo && +- $SHELL "$ac_srcdir/configure.gnu" --help=recursive +- elif test -f "$ac_srcdir/configure"; then +- echo && +- $SHELL "$ac_srcdir/configure" --help=recursive +- else +- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi || ac_status=$? +- cd "$ac_pwd" || { ac_status=$?; break; } +- done ++ ac_retval=$ac_status + fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + +-test -n "$ac_init_help" && exit $ac_status +-if $ac_init_version; then +- cat <<\_ACEOF +-psi configure 4.0.0-beta5 +-generated by GNU Autoconf 2.63 ++} # ac_fn_cxx_try_run + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-This configure script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it. ++# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES ++# --------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_cxx_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> + _ACEOF +- exit ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_cxx_check_header_compile ++ ++# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES ++# ----------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. ++ac_fn_cxx_check_decl () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_cxx_check_decl + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by psi $as_me 4.0.0-beta5, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +@@ -1671,8 +2213,8 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +-done ++ $as_echo "PATH: $as_dir" ++ done + IFS=$as_save_IFS + + } >&5 +@@ -1709,9 +2251,9 @@ + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1727,13 +2269,13 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args '$ac_arg'" ++ as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done + done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there +@@ -1745,11 +2287,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -1758,13 +2298,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -1783,11 +2323,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -1800,11 +2338,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -1818,11 +2354,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -1836,46 +2370,53 @@ + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h ++ + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -1886,19 +2427,23 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; +@@ -1906,7 +2451,7 @@ + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 + $as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -1921,11 +2466,11 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; +@@ -1935,17 +2480,17 @@ + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 + $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 + $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 + $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac +@@ -1957,43 +2502,20 @@ + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done +-if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -2013,17 +2535,11 @@ + + + +-cat >>confdefs.h <<\_ACEOF +-#define PSI_VERSION "4.0.0-beta5" +-_ACEOF ++$as_echo "#define PSI_VERSION \"4.0.0-beta5\"" >>confdefs.h + +-cat >>confdefs.h <<\_ACEOF +-#define PSI_BUILDID "alpha" +-_ACEOF ++$as_echo "#define PSI_BUILDID \"alpha\"" >>confdefs.h + +-cat >>confdefs.h <<\_ACEOF +-#define PSI_BUGREPORT "psicode@users.sourceforge.net" +-_ACEOF ++$as_echo "#define PSI_BUGREPORT \"psicode@users.sourceforge.net\"" >>confdefs.h + + + +@@ -2046,6 +2562,26 @@ + _ACEOF + + ++if test -z $PSI_OBJ_INSTALL_DIR; then ++ PSI_OBJ_INSTALL_DIR=`pwd` ++fi ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PSI_OBJ_INSTALL_DIR "$PSI_OBJ_INSTALL_DIR" ++_ACEOF ++ ++ ++if test -z $PSI_SRC_INSTALL_DIR; then ++ PSI_SRC_INSTALL_DIR=`pwd` ++fi ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PSI_SRC_INSTALL_DIR "$PSI_SRC_INSTALL_DIR" ++_ACEOF ++ ++ + ac_aux_dir= + for ac_dir in bin "$srcdir"/bin; do + if test -f "$ac_dir/install-sh"; then +@@ -2063,9 +2599,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in bin \"$srcdir\"/bin" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in bin \"$srcdir\"/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in bin \"$srcdir\"/bin" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2081,35 +2615,27 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -2125,28 +2651,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -2162,28 +2684,24 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking target system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 + $as_echo_n "checking target system type... " >&6; } +-if test "${ac_cv_target+set}" = set; then ++if ${ac_cv_target+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host + else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 + $as_echo "$ac_cv_target" >&6; } + case $ac_cv_target in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +-$as_echo "$as_me: error: invalid value of canonical target" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; + esac + target=$ac_cv_target + ac_save_IFS=$IFS; IFS='-' +@@ -2207,11 +2725,11 @@ + program_prefix=${target_alias}- + + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2219,7 +2737,7 @@ + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -2229,11 +2747,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2290,7 +2808,7 @@ + LIBINT_OPT_AM=5 + + # Check whether --with-max-am-eri was given. +-if test "${with_max_am_eri+set}" = set; then ++if test "${with_max_am_eri+set}" = set; then : + withval=$with_max_am_eri; + LIBINT_NEW_AM=$((2*($withval))) + LIBINT_OPT_AM=$(($withval)) +@@ -2304,7 +2822,7 @@ + LIBDERIV_NEW_AM1=8 + + # Check whether --with-max-am-deriv1 was given. +-if test "${with_max_am_deriv1+set}" = set; then ++if test "${with_max_am_deriv1+set}" = set; then : + withval=$with_max_am_deriv1; + LIBDERIV_NEW_AM1=$((2*($withval))) + +@@ -2314,7 +2832,7 @@ + LIBDERIV_NEW_AM2=6 + + # Check whether --with-max-am-deriv2 was given. +-if test "${with_max_am_deriv2+set}" = set; then ++if test "${with_max_am_deriv2+set}" = set; then : + withval=$with_max_am_deriv2; + LIBDERIV_NEW_AM2=$((2*($withval))) + +@@ -2347,7 +2865,7 @@ + + + # Check whether --with-cc was given. +-if test "${with_cc+set}" = set; then ++if test "${with_cc+set}" = set; then : + withval=$with_cc; + CC=$withval + +@@ -2363,9 +2881,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2376,24 +2894,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2407,9 +2925,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -2420,24 +2938,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2450,7 +2968,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2459,57 +2977,37 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2525,8 +3023,8 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -2542,17 +3040,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -2569,7 +3067,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -2588,84 +3086,41 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } +- fi +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -2680,32 +3135,83 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } + fi +- +-rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2717,17 +3223,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -2740,31 +3246,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2778,37 +3276,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -2817,20 +3294,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2841,35 +3314,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2880,36 +3329,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2920,42 +3345,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -2972,23 +3372,18 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +-#include +-#include ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -3040,32 +3435,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3076,17 +3448,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3097,7 +3471,7 @@ + + + # Check whether --with-cxx was given. +-if test "${with_cxx+set}" = set; then ++if test "${with_cxx+set}" = set; then : + withval=$with_cxx; + CXX=$withval + +@@ -3117,9 +3491,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CXX+set}" = set; then ++if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -3130,24 +3504,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 + $as_echo "$CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3161,9 +3535,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then ++if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then +@@ -3174,24 +3548,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 + $as_echo "$ac_ct_CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3204,7 +3578,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3215,53 +3589,36 @@ + fi + fi + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 + $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then ++if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3275,37 +3632,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 + $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GXX=yes +@@ -3314,20 +3650,16 @@ + fi + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 + $as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if test "${ac_cv_prog_cxx_g+set}" = set; then ++if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3338,35 +3670,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CXXFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3377,36 +3685,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_compile "$LINENO"; then : + +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3417,42 +3701,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_cxx_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 + $as_echo "$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +@@ -3478,7 +3737,7 @@ + + + # Check whether --with-fc was given. +-if test "${with_fc+set}" = set; then ++if test "${with_fc+set}" = set; then : + withval=$with_fc; + case $withval in + no) +@@ -3498,13 +3757,13 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_F77+set}" = set; then ++if ${ac_cv_prog_F77+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$F77"; then +@@ -3515,24 +3774,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + F77=$ac_cv_prog_F77 + if test -n "$F77"; then +- { $as_echo "$as_me:$LINENO: result: $F77" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 + $as_echo "$F77" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3542,13 +3801,13 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then ++if ${ac_cv_prog_ac_ct_F77+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_F77"; then +@@ -3559,24 +3818,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_F77="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_F77=$ac_cv_prog_ac_ct_F77 + if test -n "$ac_ct_F77"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 + $as_echo "$ac_ct_F77" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3589,7 +3848,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3599,54 +3858,41 @@ + + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + rm -f a.out + + # If we don't use `.F' as extension, the preprocessor is not run on the + # input file. (Note that this only needs to work for GNU compilers.) + ac_save_ext=$ac_ext + ac_ext=F +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 + $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } +-if test "${ac_cv_f77_compiler_gnu+set}" = set; then ++if ${ac_cv_f77_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ cat > conftest.$ac_ext <<_ACEOF + program main + #ifndef __GNUC__ + choke me +@@ -3654,83 +3900,41 @@ + + end + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_f77_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_f77_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 + $as_echo "$ac_cv_f77_compiler_gnu" >&6; } + ac_ext=$ac_save_ext + ac_test_FFLAGS=${FFLAGS+set} + ac_save_FFLAGS=$FFLAGS + FFLAGS= +-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 + $as_echo_n "checking whether $F77 accepts -g... " >&6; } +-if test "${ac_cv_prog_f77_g+set}" = set; then ++if ${ac_cv_prog_f77_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + FFLAGS=-g +-cat >conftest.$ac_ext <<_ACEOF ++cat > conftest.$ac_ext <<_ACEOF + program main + + end + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_f77_try_compile "$LINENO"; then : + ac_cv_prog_f77_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_prog_f77_g=no ++ ac_cv_prog_f77_g=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 + $as_echo "$ac_cv_prog_f77_g" >&6; } + if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS +@@ -3769,7 +3973,7 @@ + + + # Check whether --with-f77symbol was given. +-if test "${with_f77symbol+set}" = set; then ++if test "${with_f77symbol+set}" = set; then : + withval=$with_f77symbol; + case $withval in + lc) +@@ -3785,7 +3989,7 @@ + FC_SYMBOL=4 + ;; + *) +- { $as_echo "$as_me:$LINENO: WARNING: did not recognize value $withval. will assume lower-case with underscore" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: did not recognize value $withval. will assume lower-case with underscore" >&5 + $as_echo "$as_me: WARNING: did not recognize value $withval. will assume lower-case with underscore" >&2;} + FC_SYMBOL=2 + ;; +@@ -3795,7 +3999,7 @@ + + + if test -z "$FC_SYMBOL"; then +- { $as_echo "$as_me:$LINENO: checking Fortran symbols" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Fortran symbols" >&5 + $as_echo_n "checking Fortran symbols... " >&6; } + if test -n "$F77" ; then + /bin/rm -f ffunc.f flink.c +@@ -3805,32 +4009,30 @@ + $F77 -c ffunc.f 1>/dev/null 2>/dev/null + echo "main(){ FF(); return 0; }" > flink.c + if $CC -o flink -DFF=ffunc flink.c ffunc.o $LDFLAGS $LIBS 1>/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: same as C" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: same as C" >&5 + $as_echo "same as C" >&6; } + FC_SYMBOL=1 + elif $CC -o flink -DFF=ffunc_ flink.c ffunc.o $LDFLAGS $LIBS 1>/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: lowercase with underscore" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: lowercase with underscore" >&5 + $as_echo "lowercase with underscore" >&6; } + FC_SYMBOL=2 + elif $CC -o flink -DFF=FFUNC flink.c ffunc.o $LDFLAGS $LIBS 1>/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: uppercase" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: uppercase" >&5 + $as_echo "uppercase" >&6; } + FC_SYMBOL=3 + elif $CC -o flink -DFF=FFUNC_ flink.c ffunc.o $LDFLAGS $LIBS 1>/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: uppercase with underscore" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: uppercase with underscore" >&5 + $as_echo "uppercase with underscore" >&6; } + FC_SYMBOL=4 + else +- { $as_echo "$as_me:$LINENO: result: giving up" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: giving up" >&5 + $as_echo "giving up" >&6; } +- { { $as_echo "$as_me:$LINENO: error: could not determine fortran symbol names" >&5 +-$as_echo "$as_me: error: could not determine fortran symbol names" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "could not determine fortran symbol names" "$LINENO" 5 + fi + /bin/rm -f ffunc.f ffunc.o flink flink.c flink.o ffunc + else + FC_SYMBOL=2 +- { $as_echo "$as_me:$LINENO: result: No Fortran compiler provided; guessing lowercase with underscore" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: No Fortran compiler provided; guessing lowercase with underscore" >&5 + $as_echo "No Fortran compiler provided; guessing lowercase with underscore" >&6; } + fi + fi +@@ -3841,9 +4043,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then ++if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -3854,24 +4056,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3881,9 +4083,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -3894,24 +4096,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3920,7 +4122,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3935,14 +4137,14 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -3957,11 +4159,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -3970,78 +4168,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : + break + fi + +@@ -4053,7 +4207,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -4064,11 +4218,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -4077,87 +4227,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +@@ -4171,10 +4274,10 @@ + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 + $as_echo_n "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then +- if test "${ac_cv_prog_CXXCPP+set}" = set; then ++ if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CXXCPP needs to be expanded +@@ -4189,11 +4292,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -4202,78 +4301,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : + break + fi + +@@ -4285,7 +4340,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 + $as_echo "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -4296,11 +4351,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -4309,87 +4360,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +@@ -4412,10 +4416,10 @@ + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then ++if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -4423,11 +4427,11 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -4435,7 +4439,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -4464,7 +4468,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -4480,7 +4484,7 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 + $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -4491,14 +4495,14 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + +@@ -4506,9 +4510,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_QHELPGENERATOR+set}" = set; then ++if ${ac_cv_prog_QHELPGENERATOR+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$QHELPGENERATOR"; then +@@ -4519,24 +4523,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_QHELPGENERATOR="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + QHELPGENERATOR=$ac_cv_prog_QHELPGENERATOR + if test -n "$QHELPGENERATOR"; then +- { $as_echo "$as_me:$LINENO: result: $QHELPGENERATOR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QHELPGENERATOR" >&5 + $as_echo "$QHELPGENERATOR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4548,9 +4552,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -4561,24 +4565,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4590,9 +4594,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then ++if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -4603,24 +4607,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4631,7 +4635,7 @@ + + + # Check whether --with-ar was given. +-if test "${with_ar+set}" = set; then ++if test "${with_ar+set}" = set; then : + withval=$with_ar; AR=$withval + + fi +@@ -4647,19 +4651,15 @@ + + # I need the restrict keyword, this test handles the language set by AC_LANG + +-{ $as_echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 + $as_echo_n "checking for C/C++ restrict keyword... " >&6; } +-if test "${ac_cv_c_restrict+set}" = set; then ++if ${ac_cv_c_restrict+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_c_restrict=no + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + typedef int * int_ptr; + int foo (int_ptr $ac_kw ip) { +@@ -4676,46 +4676,20 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_c_restrict=$ac_kw +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_restrict" != no && break + done + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 + $as_echo "$ac_cv_c_restrict" >&6; } + +- + case $ac_cv_c_restrict in + restrict) ;; +- no) cat >>confdefs.h <<\_ACEOF +-#define restrict /**/ +-_ACEOF ++ no) $as_echo "#define restrict /**/" >>confdefs.h + ;; + *) cat >>confdefs.h <<_ACEOF + #define restrict $ac_cv_c_restrict +@@ -4727,7 +4701,7 @@ + ARFLAGS=r + + # Check whether --with-ar-flags was given. +-if test "${with_ar_flags+set}" = set; then ++if test "${with_ar_flags+set}" = set; then : + withval=$with_ar_flags; ARFLAGS=$withval + + fi +@@ -4741,7 +4715,7 @@ + + + # Check whether --with-ld was given. +-if test "${with_ld+set}" = set; then ++if test "${with_ld+set}" = set; then : + withval=$with_ld; LD=$withval + + fi +@@ -4752,10 +4726,10 @@ + CPPFLAGS= + + # Check whether --with-incdirs was given. +-if test "${with_incdirs+set}" = set; then ++if test "${with_incdirs+set}" = set; then : + withval=$with_incdirs; EXTRAINCDIRS=$withval + CPPFLAGS=$withval +-{ $as_echo "$as_me:$LINENO: result: Using extra include directories: $withval" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using extra include directories: $withval" >&5 + $as_echo "Using extra include directories: $withval" >&6; } + + fi +@@ -4765,9 +4739,9 @@ + + + # Check whether --with-libs was given. +-if test "${with_libs+set}" = set; then ++if test "${with_libs+set}" = set; then : + withval=$with_libs; LDLIBS=$withval +-{ $as_echo "$as_me:$LINENO: result: Using extra libraries: $withval" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using extra libraries: $withval" >&5 + $as_echo "Using extra libraries: $withval" >&6; } + + fi +@@ -4780,10 +4754,10 @@ + LIBDIRS= + + # Check whether --with-libdirs was given. +-if test "${with_libdirs+set}" = set; then ++if test "${with_libdirs+set}" = set; then : + withval=$with_libdirs; LIBDIRS=$withval + LDFLAGS=$withval +-{ $as_echo "$as_me:$LINENO: result: Using extra library directories: $withval" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using extra library directories: $withval" >&5 + $as_echo "Using extra library directories: $withval" >&6; } + + fi +@@ -4796,9 +4770,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_PERL+set}" = set; then ++if ${ac_cv_prog_PERL+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$PERL"; then +@@ -4809,24 +4783,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PERL="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + PERL=$ac_cv_prog_PERL + if test -n "$PERL"; then +- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 + $as_echo "$PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4850,7 +4824,7 @@ + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.6" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.6" >&5 + $as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; } + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros +@@ -4865,21 +4839,18 @@ + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ (exit $ac_status); }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: too old" >&5 +-$as_echo "$as_me: error: too old" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "too old" "$LINENO" 5 + fi +- + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies VERSION +- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.6" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.6" >&5 + $as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; } +-if test "${am_cv_pathless_PYTHON+set}" = set; then ++if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -4898,13 +4869,12 @@ + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ (exit $ac_status); }; then : + break + fi +- + done + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 + $as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute pather of $am_cv_pathless_PYTHON + if test "$am_cv_pathless_PYTHON" = none; then +@@ -4912,9 +4882,9 @@ + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. + set dummy $am_cv_pathless_PYTHON; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PYTHON+set}" = set; then ++if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $PYTHON in +@@ -4927,14 +4897,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4942,10 +4912,10 @@ + fi + PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then +- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 + $as_echo "$PYTHON" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4956,42 +4926,40 @@ + + + if test "$PYTHON" = :; then +- { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 + else +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 + $as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if test "${am_cv_python_version+set}" = set; then ++if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON include statements" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON include statements" >&5 + $as_echo_n "checking for $am_display_PYTHON include statements... " >&6; } +-if test "${am_cv_python_include+set}" = set; then ++if ${am_cv_python_include+:} false; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_include=`${PYTHON}-config --includes` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_include" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_include" >&5 + $as_echo "$am_cv_python_include" >&6; } + PYTHON_INCLUDE=$am_cv_python_include + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON linker flags" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON linker flags" >&5 + $as_echo_n "checking for $am_display_PYTHON linker flags... " >&6; } +-if test "${am_cv_python_ldflags+set}" = set; then ++if ${am_cv_python_ldflags+:} false; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_ldflags=`${PYTHON}-config --ldflags` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_ldflags" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_ldflags" >&5 + $as_echo "$am_cv_python_ldflags" >&6; } + PYTHON_LDFLAGS=$am_cv_python_ldflags + +@@ -4999,7 +4967,7 @@ + # + # final check to see if everything compiles alright + # +- { $as_echo "$as_me:$LINENO: checking consistency of all components of python development environment" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5 + $as_echo_n "checking consistency of all components of python development environment... " >&6; } + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5010,11 +4978,7 @@ + # save current global flags + LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_INCLUDE" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -5029,55 +4993,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + pythonexists=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- pythonexists=no ++ pythonexists=no + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- +- { $as_echo "$as_me:$LINENO: result: $pythonexists" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5 + $as_echo "$pythonexists" >&6; } + + if test ! "$pythonexists" = "yes"; then +- { { $as_echo "$as_me:$LINENO: error: +- Could not link test program to Python. Maybe the main Python library has been +- installed in some non-standard library path. If so, pass it to configure, +- via the LDFLAGS environment variable. +- Example: ./configure LDFLAGS=\"-L/usr/non-standard-path/python/lib\" +- ============================================================================ +- ERROR! +- You probably have to install the development version of the Python package +- for your distribution. The exact name of this package varies among them. +- ============================================================================ +- " >&5 +-$as_echo "$as_me: error: ++ as_fn_error $? " + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LDFLAGS environment variable. +@@ -5087,8 +5015,7 @@ + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ +- " >&2;} +- { (exit 1); exit 1; }; } ++ " "$LINENO" 5 + PYTHON_VERSION="" + fi + ac_ext=cpp +@@ -5105,12 +5032,10 @@ + fi + + # Check whether --enable-python-module was given. +-if test "${enable_python_module+set}" = set; then ++if test "${enable_python_module+set}" = set; then : + enableval=$enable_python_module; + MAKE_PYTHON_MODULE=1 +- cat >>confdefs.h <<\_ACEOF +-#define MAKE_PYTHON_MODULE 1 +-_ACEOF ++ $as_echo "#define MAKE_PYTHON_MODULE 1" >>confdefs.h + + + +@@ -5120,9 +5045,9 @@ + + # Extract the first word of "pdflatex", so it can be a program name with args. + set dummy pdflatex; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_PDFLATEX+set}" = set; then ++if ${ac_cv_prog_PDFLATEX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$PDFLATEX"; then +@@ -5133,24 +5058,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PDFLATEX="pdflatex" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + PDFLATEX=$ac_cv_prog_PDFLATEX + if test -n "$PDFLATEX"; then +- { $as_echo "$as_me:$LINENO: result: $PDFLATEX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5 + $as_echo "$PDFLATEX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5159,9 +5084,9 @@ + + # Extract the first word of "latex", so it can be a program name with args. + set dummy latex; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LATEX+set}" = set; then ++if ${ac_cv_prog_LATEX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LATEX"; then +@@ -5172,24 +5097,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LATEX="latex" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LATEX=$ac_cv_prog_LATEX + if test -n "$LATEX"; then +- { $as_echo "$as_me:$LINENO: result: $LATEX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LATEX" >&5 + $as_echo "$LATEX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5198,9 +5123,9 @@ + + # Extract the first word of "latex2html", so it can be a program name with args. + set dummy latex2html; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LATEX2HTML+set}" = set; then ++if ${ac_cv_prog_LATEX2HTML+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LATEX2HTML"; then +@@ -5211,24 +5136,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LATEX2HTML="latex2html" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LATEX2HTML=$ac_cv_prog_LATEX2HTML + if test -n "$LATEX2HTML"; then +- { $as_echo "$as_me:$LINENO: result: $LATEX2HTML" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LATEX2HTML" >&5 + $as_echo "$LATEX2HTML" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5237,9 +5162,9 @@ + + # Extract the first word of "dvips", so it can be a program name with args. + set dummy dvips; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DVIPS+set}" = set; then ++if ${ac_cv_prog_DVIPS+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DVIPS"; then +@@ -5250,24 +5175,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DVIPS="dvips" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DVIPS=$ac_cv_prog_DVIPS + if test -n "$DVIPS"; then +- { $as_echo "$as_me:$LINENO: result: $DVIPS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DVIPS" >&5 + $as_echo "$DVIPS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5276,9 +5201,9 @@ + + # Extract the first word of "ps2pdf", so it can be a program name with args. + set dummy ps2pdf; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_PS2PDF+set}" = set; then ++if ${ac_cv_prog_PS2PDF+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$PS2PDF"; then +@@ -5289,24 +5214,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PS2PDF="ps2pdf" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + PS2PDF=$ac_cv_prog_PS2PDF + if test -n "$PS2PDF"; then +- { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS2PDF" >&5 + $as_echo "$PS2PDF" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5315,9 +5240,9 @@ + + # Extract the first word of "bibtex", so it can be a program name with args. + set dummy bibtex; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_BIBTEX+set}" = set; then ++if ${ac_cv_prog_BIBTEX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$BIBTEX"; then +@@ -5328,24 +5253,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_BIBTEX="bibtex" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + BIBTEX=$ac_cv_prog_BIBTEX + if test -n "$BIBTEX"; then +- { $as_echo "$as_me:$LINENO: result: $BIBTEX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BIBTEX" >&5 + $as_echo "$BIBTEX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5354,9 +5279,9 @@ + + # Extract the first word of "sphinx-build", so it can be a program name with args. + set dummy sphinx-build; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_SPHINX+set}" = set; then ++if ${ac_cv_prog_SPHINX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$SPHINX"; then +@@ -5367,24 +5292,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_SPHINX="sphinx-build" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + SPHINX=$ac_cv_prog_SPHINX + if test -n "$SPHINX"; then +- { $as_echo "$as_me:$LINENO: result: $SPHINX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPHINX" >&5 + $as_echo "$SPHINX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5400,9 +5325,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DOXYGEN+set}" = set; then ++if ${ac_cv_prog_DOXYGEN+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DOXYGEN"; then +@@ -5413,24 +5338,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DOXYGEN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DOXYGEN=$ac_cv_prog_DOXYGEN + if test -n "$DOXYGEN"; then +- { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 + $as_echo "$DOXYGEN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5442,7 +5367,7 @@ + DOT=yes + + # Check whether --with-dot was given. +-if test "${with_dot+set}" = set; then ++if test "${with_dot+set}" = set; then : + withval=$with_dot; DOT=$withval + + fi +@@ -5453,9 +5378,9 @@ + elif test X$DOT = Xyes; then + # Extract the first word of "dot", so it can be a program name with args. + set dummy dot; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_HAVE_DOT+set}" = set; then ++if ${ac_cv_prog_HAVE_DOT+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$HAVE_DOT"; then +@@ -5466,14 +5391,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_DOT="YES" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_DOT" && ac_cv_prog_HAVE_DOT="NO" +@@ -5481,10 +5406,10 @@ + fi + HAVE_DOT=$ac_cv_prog_HAVE_DOT + if test -n "$HAVE_DOT"; then +- { $as_echo "$as_me:$LINENO: result: $HAVE_DOT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOT" >&5 + $as_echo "$HAVE_DOT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5508,38 +5433,21 @@ + ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to get verbose linking output from $F77" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 + $as_echo_n "checking how to get verbose linking output from $F77... " >&6; } +-if test "${ac_cv_prog_f77_v+set}" = set; then ++if ${ac_cv_prog_f77_v+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ cat > conftest.$ac_ext <<_ACEOF + program main + + end + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_f77_try_compile "$LINENO"; then : + ac_cv_prog_f77_v= + # Try some options frequently used verbose output + for ac_verb in -v -verbose --verbose -V -\#\#\#; do +- cat >conftest.$ac_ext <<_ACEOF ++ cat > conftest.$ac_ext <<_ACEOF + program main + + end +@@ -5553,11 +5461,12 @@ + FFLAGS="$FFLAGS $ac_verb" + eval "set x $ac_link" + shift +-$as_echo "$as_me:$LINENO: $*" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 + # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, + # LIBRARY_PATH; skip all such settings. + ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | +- grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` ++ sed '/^Driving:/d; /^Configured with:/d; ++ '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"` + $as_echo "$ac_f77_v_output" >&5 + FFLAGS=$ac_save_FFLAGS + +@@ -5574,9 +5483,16 @@ + # that detects unbalanced quotes in FLIBS should be implemented + # and (ugh) tested at some point. + case $ac_f77_v_output in +- # If we are using xlf then replace all the commas with spaces. ++ # With xlf replace commas with spaces, ++ # and remove "-link" and closing parenthesis. + *xlfentry*) +- ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;; ++ ac_f77_v_output=`echo $ac_f77_v_output | ++ sed ' ++ s/,/ /g ++ s/ -link / /g ++ s/) *$// ++ ' ++ ` ;; + + # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted + # $LIBS confuse us, and the libraries appear later in the output anyway). +@@ -5588,9 +5504,19 @@ + # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". + *-cmdline\ * | *-ignore\ * | *-def\ *) + ac_f77_v_output=`echo $ac_f77_v_output | sed "\ +- s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g +- s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g +- s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; ++ s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g ++ s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g ++ s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; ++ ++ # If we are using fort77 (the f2c wrapper) then filter output and delete quotes. ++ *fort77*f2c*gcc*) ++ ac_f77_v_output=`echo "$ac_f77_v_output" | sed -n ' ++ /:[ ]\+Running[ ]\{1,\}"gcc"/{ ++ /"-c"/d ++ /[.]c"*/d ++ s/^.*"gcc"/"gcc"/ ++ s/"//gp ++ }'` ;; + + # If we are using Cray Fortran then delete quotes. + *cft90*) +@@ -5601,39 +5527,35 @@ + # look for -l* and *.a constructs in the output + for ac_arg in $ac_f77_v_output; do + case $ac_arg in +- [\\/]*.a | ?:[\\/]*.a | -[lLRu]*) +- ac_cv_prog_f77_v=$ac_verb +- break 2 ;; ++ [\\/]*.a | ?:[\\/]*.a | -[lLRu]*) ++ ac_cv_prog_f77_v=$ac_verb ++ break 2 ;; + esac + done + done + if test -z "$ac_cv_prog_f77_v"; then +- { $as_echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $F77" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 + $as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} +-fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { $as_echo "$as_me:$LINENO: WARNING: compilation failed" >&5 ++fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 + $as_echo "$as_me: WARNING: compilation failed" >&2;} + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_v" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 + $as_echo "$ac_cv_prog_f77_v" >&6; } +-{ $as_echo "$as_me:$LINENO: checking for Fortran 77 libraries of $F77" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 + $as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } +-if test "${ac_cv_f77_libs+set}" = set; then ++if ${ac_cv_f77_libs+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "x$FLIBS" != "x"; then + ac_cv_f77_libs="$FLIBS" # Let the user override the test. + else + +-cat >conftest.$ac_ext <<_ACEOF ++cat > conftest.$ac_ext <<_ACEOF + program main + + end +@@ -5647,11 +5569,12 @@ + FFLAGS="$FFLAGS $ac_cv_prog_f77_v" + eval "set x $ac_link" + shift +-$as_echo "$as_me:$LINENO: $*" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 + # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, + # LIBRARY_PATH; skip all such settings. + ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | +- grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` ++ sed '/^Driving:/d; /^Configured with:/d; ++ '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"` + $as_echo "$ac_f77_v_output" >&5 + FFLAGS=$ac_save_FFLAGS + +@@ -5668,9 +5591,16 @@ + # that detects unbalanced quotes in FLIBS should be implemented + # and (ugh) tested at some point. + case $ac_f77_v_output in +- # If we are using xlf then replace all the commas with spaces. ++ # With xlf replace commas with spaces, ++ # and remove "-link" and closing parenthesis. + *xlfentry*) +- ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;; ++ ac_f77_v_output=`echo $ac_f77_v_output | ++ sed ' ++ s/,/ /g ++ s/ -link / /g ++ s/) *$// ++ ' ++ ` ;; + + # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted + # $LIBS confuse us, and the libraries appear later in the output anyway). +@@ -5682,9 +5612,19 @@ + # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". + *-cmdline\ * | *-ignore\ * | *-def\ *) + ac_f77_v_output=`echo $ac_f77_v_output | sed "\ +- s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g +- s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g +- s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; ++ s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g ++ s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g ++ s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; ++ ++ # If we are using fort77 (the f2c wrapper) then filter output and delete quotes. ++ *fort77*f2c*gcc*) ++ ac_f77_v_output=`echo "$ac_f77_v_output" | sed -n ' ++ /:[ ]\+Running[ ]\{1,\}"gcc"/{ ++ /"-c"/d ++ /[.]c"*/d ++ s/^.*"gcc"/"gcc"/ ++ s/"//gp ++ }'` ;; + + # If we are using Cray Fortran then delete quotes. + *cft90*) +@@ -5703,8 +5643,8 @@ + shift + ac_arg=$1 + case $ac_arg in +- [\\/]*.a | ?:[\\/]*.a) +- ac_exists=false ++ [\\/]*.a | ?:[\\/]*.a) ++ ac_exists=false + for ac_i in $ac_cv_f77_libs; do + if test x"$ac_arg" = x"$ac_i"; then + ac_exists=true +@@ -5712,15 +5652,14 @@ + fi + done + +- if test x"$ac_exists" = xtrue; then +- : ++ if test x"$ac_exists" = xtrue; then : ++ + else + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + fi +- +- ;; +- -bI:*) +- ac_exists=false ++ ;; ++ -bI:*) ++ ac_exists=false + for ac_i in $ac_cv_f77_libs; do + if test x"$ac_arg" = x"$ac_i"; then + ac_exists=true +@@ -5728,8 +5667,8 @@ + fi + done + +- if test x"$ac_exists" = xtrue; then +- : ++ if test x"$ac_exists" = xtrue; then : ++ + else + if test "$ac_compiler_gnu" = yes; then + for ac_link_opt in $ac_arg; do +@@ -5739,18 +5678,22 @@ + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + fi + fi +- +- ;; +- # Ignore these flags. +- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) +- ;; +- -lkernel32) +- test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" +- ;; +- -[LRuYz]) +- # These flags, when seen by themselves, take an argument. +- # We remove the space between option and argument and re-iterate +- # unless we find an empty arg or a new option (starting with -) ++ ;; ++ # Ignore these flags. ++ -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ ++ |-LANG:=* | -LIST:* | -LNO:* | -link) ++ ;; ++ -lkernel32) ++ case $host_os in ++ *cygwin*) ;; ++ *) ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" ++ ;; ++ esac ++ ;; ++ -[LRuYz]) ++ # These flags, when seen by themselves, take an argument. ++ # We remove the space between option and argument and re-iterate ++ # unless we find an empty arg or a new option (starting with -) + case $2 in + "" | -*);; + *) +@@ -5759,10 +5702,10 @@ + set X $ac_arg "$@" + ;; + esac +- ;; +- -YP,*) +- for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do +- ac_exists=false ++ ;; ++ -YP,*) ++ for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do ++ ac_exists=false + for ac_i in $ac_cv_f77_libs; do + if test x"$ac_j" = x"$ac_i"; then + ac_exists=true +@@ -5770,17 +5713,16 @@ + fi + done + +- if test x"$ac_exists" = xtrue; then +- : ++ if test x"$ac_exists" = xtrue; then : ++ + else + ac_arg="$ac_arg $ac_j" +- ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" ++ ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" + fi +- +- done +- ;; +- -[lLR]*) +- ac_exists=false ++ done ++ ;; ++ -[lLR]*) ++ ac_exists=false + for ac_i in $ac_cv_f77_libs; do + if test x"$ac_arg" = x"$ac_i"; then + ac_exists=true +@@ -5788,17 +5730,16 @@ + fi + done + +- if test x"$ac_exists" = xtrue; then +- : ++ if test x"$ac_exists" = xtrue; then : ++ + else + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + fi +- +- ;; ++ ;; + -zallextract*| -zdefaultextract) + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + ;; +- # Ignore everything else. ++ # Ignore everything else. + esac + done + # restore positional arguments +@@ -5810,9 +5751,9 @@ + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + ac_ld_run_path=`$as_echo "$ac_f77_v_output" | +- sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` ++ sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` + test "x$ac_ld_run_path" != x && +- if test "$ac_compiler_gnu" = yes; then ++ if test "$ac_compiler_gnu" = yes; then + for ac_link_opt in $ac_ld_run_path; do + ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" + done +@@ -5824,7 +5765,7 @@ + fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_libs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 + $as_echo "$ac_cv_f77_libs" >&6; } + FLIBS="$ac_cv_f77_libs" + +@@ -5837,19 +5778,14 @@ + + fi + # This just implicitly checks that FLIBS can co-exist with the C linker +- +-{ $as_echo "$as_me:$LINENO: checking for exit in -lc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lc" >&5 + $as_echo_n "checking for exit in -lc... " >&6; } +-if test "${ac_cv_lib_c_exit+set}" = set; then ++if ${ac_cv_lib_c_exit+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lc $FLIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5867,43 +5803,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_c_exit=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_c_exit=no ++ ac_cv_lib_c_exit=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_exit" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_exit" >&5 + $as_echo "$ac_cv_lib_c_exit" >&6; } +-if test "x$ac_cv_lib_c_exit" = x""yes; then ++if test "x$ac_cv_lib_c_exit" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBC 1 + _ACEOF +@@ -5913,7 +5824,7 @@ + else + + FLIBS= +-{ $as_echo "$as_me:$LINENO: WARNING: F77 libraries don't seem to link with C programs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: F77 libraries don't seem to link with C programs" >&5 + $as_echo "$as_me: WARNING: F77 libraries don't seem to link with C programs" >&2;} + + fi +@@ -5921,7 +5832,7 @@ + + + # Check whether --with-blas was given. +-if test "${with_blas+set}" = set; then ++if test "${with_blas+set}" = set; then : + withval=$with_blas; + case $withval in + yes) +@@ -5940,7 +5851,7 @@ + + + # Check whether --with-lapack was given. +-if test "${with_lapack+set}" = set; then ++if test "${with_lapack+set}" = set; then : + withval=$with_lapack; + case $withval in + yes) +@@ -5988,18 +5899,14 @@ + if test -z "$BLAS"; then + if test $CC = icc; then + as_ac_Lib=`$as_echo "ac_cv_lib_mkl_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lmkl" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lmkl" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lmkl... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmkl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6017,47 +5924,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lmkl" + fi + +@@ -6066,18 +5945,14 @@ + # Otherwise, run through a list of possibilities + if test -z "$BLAS"; then + as_ac_Lib=`$as_echo "ac_cv_lib_essl_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lessl" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lessl" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lessl... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lessl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6095,65 +5970,33 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lessl" + fi + + fi + if test -z "$BLAS"; then + as_ac_Lib=`$as_echo "ac_cv_lib_scs_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lscs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lscs" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lscs... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lscs $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6171,47 +6014,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lscs" + fi + +@@ -6221,18 +6036,14 @@ + SAVE_LIBS2=$LIBS + LIBS="-lpthread $LIBS" + as_ac_Lib=`$as_echo "ac_cv_lib_goto_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lgoto" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lgoto" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lgoto... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgoto $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6250,47 +6061,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lgoto -lpthread" + fi + +@@ -6300,18 +6083,14 @@ + SAVE_LIBS2=$LIBS + LIBS="-latlas $LIBS" + as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lf77blas" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lf77blas" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lf77blas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lf77blas $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6329,47 +6108,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lf77blas -latlas" + fi + +@@ -6377,18 +6128,14 @@ + fi + if test -z "$BLAS"; then + as_ac_Lib=`$as_echo "ac_cv_lib_mkl_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lmkl" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lmkl" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lmkl... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmkl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6406,65 +6153,33 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lmkl" + fi + + fi + if test -z "$BLAS"; then + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$DGEMM_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEMM_SYMBOL in -lblas" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEMM_SYMBOL in -lblas" >&5 + $as_echo_n "checking for $DGEMM_SYMBOL in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lblas $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6482,47 +6197,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS="-lblas" + fi + +@@ -6532,18 +6219,16 @@ + apple) + BLAS="-altivec -framework vecLib" + AUTOAPPLE="yes" +- { $as_echo "$as_me:$LINENO: result: No BLAS specified and vendor is Apple: Assuming vecLib is available!" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: No BLAS specified and vendor is Apple: Assuming vecLib is available!" >&5 + $as_echo "No BLAS specified and vendor is Apple: Assuming vecLib is available!" >&6; } + ;; + esac + fi + if test -z "$BLAS"; then +- { { $as_echo "$as_me:$LINENO: error: \"Did not find a BLAS library.\"" >&5 +-$as_echo "$as_me: error: \"Did not find a BLAS library.\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "\"Did not find a BLAS library.\"" "$LINENO" 5 + fi + +-{ $as_echo "$as_me:$LINENO: result: BLAS library is $BLAS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: BLAS library is $BLAS" >&5 + $as_echo "BLAS library is $BLAS" >&6; } + LIBS=$SAVE_LIBS + +@@ -6555,102 +6240,14 @@ + LIBS="$BLAS $LIBS $CLIBS $FLIBS" + if test -z "$LAPACK"; then + if test ! -z "$AUTOAPPLE"; then +- { $as_echo "$as_me:$LINENO: result: Assuming vecLib for LAPACK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Assuming vecLib for LAPACK" >&5 + $as_echo "Assuming vecLib for LAPACK" >&6; } + LAPACK="$BLAS" + LAPACK_IN_BLAS=yes + else + as_ac_var=`$as_echo "ac_cv_func_$DGEEV_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEEV_SYMBOL" >&5 +-$as_echo_n "checking for $DGEEV_SYMBOL... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $DGEEV_SYMBOL to an innocuous variant, in case declares $DGEEV_SYMBOL. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $DGEEV_SYMBOL innocuous_$DGEEV_SYMBOL +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $DGEEV_SYMBOL (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $DGEEV_SYMBOL +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $DGEEV_SYMBOL (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$DGEEV_SYMBOL || defined __stub___$DGEEV_SYMBOL +-choke me +-#endif +- +-int +-main () +-{ +-return $DGEEV_SYMBOL (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_fn_cxx_check_func "$LINENO" "$DGEEV_SYMBOL" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + LAPACK_IN_BLAS=yes + fi + +@@ -6661,18 +6258,14 @@ + if test $CC = icc; then + # Intel's libmkl_lapack64 contains the double-precision routines + as_ac_Lib=`$as_echo "ac_cv_lib_mkl_lapack64_$DGEEV_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEEV_SYMBOL in -lmkl_lapack64" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEEV_SYMBOL in -lmkl_lapack64" >&5 + $as_echo_n "checking for $DGEEV_SYMBOL in -lmkl_lapack64... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmkl_lapack64 $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6690,47 +6283,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LAPACK="-lmkl_lapack64" + fi + +@@ -6738,18 +6303,14 @@ + fi + if test -z "$LAPACK"; then + as_ac_Lib=`$as_echo "ac_cv_lib_lapack_$DGEEV_SYMBOL" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $DGEEV_SYMBOL in -llapack" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGEEV_SYMBOL in -llapack" >&5 + $as_echo_n "checking for $DGEEV_SYMBOL in -llapack... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-llapack $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6767,78 +6328,44 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LAPACK="-llapack" + fi + + fi + if test -z "$LAPACK"; then +- { { $as_echo "$as_me:$LINENO: error: \"Did not find a LAPACK library.\"" >&5 +-$as_echo "$as_me: error: \"Did not find a LAPACK library.\"" >&2;} +- { (exit 1); exit 1; }; }; ++ as_fn_error $? "\"Did not find a LAPACK library.\"" "$LINENO" 5; + fi +- { $as_echo "$as_me:$LINENO: result: LAPACK library is $LAPACK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: LAPACK library is $LAPACK" >&5 + $as_echo "LAPACK library is $LAPACK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: LAPACK library is included in BLAS+LIBS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: LAPACK library is included in BLAS+LIBS" >&5 + $as_echo "LAPACK library is included in BLAS+LIBS" >&6; } + fi + + LIBS=$SAVE_LIBS + + +-{ $as_echo "$as_me:$LINENO: checking for MKL_Free_Buffers in -lm" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MKL_Free_Buffers in -lm" >&5 + $as_echo_n "checking for MKL_Free_Buffers in -lm... " >&6; } +-if test "${ac_cv_lib_m_MKL_Free_Buffers+set}" = set; then ++if ${ac_cv_lib_m_MKL_Free_Buffers+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $BLAS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6856,46 +6383,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_m_MKL_Free_Buffers=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_MKL_Free_Buffers=no ++ ac_cv_lib_m_MKL_Free_Buffers=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_MKL_Free_Buffers" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_MKL_Free_Buffers" >&5 + $as_echo "$ac_cv_lib_m_MKL_Free_Buffers" >&6; } +-if test "x$ac_cv_lib_m_MKL_Free_Buffers" = x""yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MKL 1 +-_ACEOF ++if test "x$ac_cv_lib_m_MKL_Free_Buffers" = xyes; then : ++ $as_echo "#define HAVE_MKL 1" >>confdefs.h + + fi + +@@ -6909,9 +6409,9 @@ + + # check for header files + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -6922,10 +6422,10 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ as_fn_executable_p "$ac_path_GREP" || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -6942,7 +6442,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -6957,26 +6457,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -6990,10 +6488,10 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ as_fn_executable_p "$ac_path_EGREP" || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -7010,7 +6508,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -7025,12 +6523,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -7038,21 +6534,17 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -7067,48 +6559,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7118,18 +6585,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7139,14 +6602,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -7173,118 +6632,33 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -7294,158 +6668,11 @@ + done + + +- +- +- +- +- +- +- +- +- +- + for ac_header in errno.h fcntl.h unistd.h stdint.h sys/types.h sys/param.h sys/times.h sys/time.h utime.h time.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------- ## +-## Report this to psicode@users.sourceforge.net ## +-## -------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -7455,7 +6682,7 @@ + done + + # check for C++ headers +-{ $as_echo "$as_me:$LINENO: checking for cmath" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmath" >&5 + $as_echo_n "checking for cmath... " >&6; } + cat > conftest.cc < +@@ -7464,13 +6691,13 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_CMATH=1 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_CMATH=0 +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* +@@ -7480,7 +6707,7 @@ + #define HAVE_CMATH $HAVE_CMATH + _ACEOF + +-{ $as_echo "$as_me:$LINENO: checking for cstdio" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cstdio" >&5 + $as_echo_n "checking for cstdio... " >&6; } + cat > conftest.cc < +@@ -7489,13 +6716,13 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_CSTDIO=1 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_CSTDIO=0 +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* +@@ -7505,7 +6732,7 @@ + #define HAVE_CSTDIO $HAVE_CSTDIO + _ACEOF + +-{ $as_echo "$as_me:$LINENO: checking for cstdlib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cstdlib" >&5 + $as_echo_n "checking for cstdlib... " >&6; } + cat > conftest.cc < +@@ -7514,13 +6741,13 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_CSTDLIB=1 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_CSTDLIB=0 +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* +@@ -7530,7 +6757,7 @@ + #define HAVE_CSTDLIB $HAVE_CSTDLIB + _ACEOF + +-{ $as_echo "$as_me:$LINENO: checking for cstring" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cstring" >&5 + $as_echo_n "checking for cstring... " >&6; } + cat > conftest.cc < +@@ -7539,13 +6766,13 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_CSTRING=1 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_CSTRING=0 +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* +@@ -7555,7 +6782,7 @@ + #define HAVE_CSTRING $HAVE_CSTRING + _ACEOF + +-{ $as_echo "$as_me:$LINENO: checking for cstddef" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cstddef" >&5 + $as_echo_n "checking for cstddef... " >&6; } + cat > conftest.cc < +@@ -7564,13 +6791,13 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_CSTDDEF=1 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_CSTDDEF=0 +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* +@@ -7582,7 +6809,7 @@ + + + # Check for dlfcn.h +-{ $as_echo "$as_me:$LINENO: checking for dlfcn.h" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlfcn.h" >&5 + $as_echo_n "checking for dlfcn.h... " >&6; } + cat > conftest.cc < +@@ -7591,13 +6818,13 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_DLFCN_H=1 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_DLFCN_H=0 +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* +@@ -7609,7 +6836,7 @@ + + + HAVE_MPI="0" +- { $as_echo "$as_me:$LINENO: checking for mpi.h" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpi.h" >&5 + $as_echo_n "checking for mpi.h... " >&6; } + cat > conftest.cc < +@@ -7618,24 +6845,20 @@ + if eval $CXX $CPPFLAGS conftest.cc >/dev/null 2>&1; then + rm -rf conftest* + HAVE_MPI="1" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + else + rm -rf conftest* + HAVE_MPI="0" +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + rm -f conftest* + +- { $as_echo "$as_me:$LINENO: checking if we can link to MPI" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link to MPI" >&5 + $as_echo_n "checking if we can link to MPI... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -7646,40 +6869,15 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- HAVE_MPI="1"; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++if ac_fn_cxx_try_link "$LINENO"; then : ++ HAVE_MPI="1"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- HAVE_MPI="0"; { $as_echo "$as_me:$LINENO: result: no" >&5 ++ HAVE_MPI="0"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + if test $HAVE_MPI == "1"; then + cat >>confdefs.h <<_ACEOF +@@ -7708,14 +6906,10 @@ + + + #check to see if void* is allowed +-{ $as_echo "$as_me:$LINENO: checking for void pointers" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void pointers" >&5 + $as_echo_n "checking for void pointers... " >&6; } + psi_ac_voidptr=yes +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7729,34 +6923,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_compile "$LINENO"; then : + +- psi_ac_voidptr=no ++else ++ psi_ac_voidptr=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $psi_ac_voidptr" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $psi_ac_voidptr" >&5 + $as_echo "$psi_ac_voidptr" >&6; } + if test $psi_ac_voidptr = "no"; then + CDEF="$CDEF -DNO_VOID_PTR" +@@ -7797,18 +6970,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for exit in -lm" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lm" >&5 + $as_echo_n "checking for exit in -lm... " >&6; } +-if test "${ac_cv_lib_m_exit+set}" = set; then ++if ${ac_cv_lib_m_exit+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -7826,58 +6995,29 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_m_exit=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_exit=no ++ ac_cv_lib_m_exit=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_exit" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exit" >&5 + $as_echo "$ac_cv_lib_m_exit" >&6; } +-if test "x$ac_cv_lib_m_exit" = x""yes; then ++if test "x$ac_cv_lib_m_exit" = xyes; then : + CLIBS="$CLIBS -lm" + fi + +-{ $as_echo "$as_me:$LINENO: checking for exit in -lbsd" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lbsd" >&5 + $as_echo_n "checking for exit in -lbsd... " >&6; } +-if test "${ac_cv_lib_bsd_exit+set}" = set; then ++if ${ac_cv_lib_bsd_exit+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -7895,62 +7035,33 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_bsd_exit=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_bsd_exit=no ++ ac_cv_lib_bsd_exit=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_exit" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_exit" >&5 + $as_echo "$ac_cv_lib_bsd_exit" >&6; } +-if test "x$ac_cv_lib_bsd_exit" = x""yes; then ++if test "x$ac_cv_lib_bsd_exit" = xyes; then : + CLIBS="$CLIBS -lbsd" + fi + +-{ $as_echo "$as_me:$LINENO: result: c libs: $CLIBS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: c libs: $CLIBS" >&5 + $as_echo "c libs: $CLIBS" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking for exit in -lm" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lm" >&5 + $as_echo_n "checking for exit in -lm... " >&6; } +-if test "${ac_cv_lib_m_exit+set}" = set; then ++if ${ac_cv_lib_m_exit+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -7968,47 +7079,22 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_m_exit=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_exit=no ++ ac_cv_lib_m_exit=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_exit" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exit" >&5 + $as_echo "$ac_cv_lib_m_exit" >&6; } +-if test "x$ac_cv_lib_m_exit" = x""yes; then ++if test "x$ac_cv_lib_m_exit" = xyes; then : + CXXLIBS="$CXXLIBS -lm" + fi + +-{ $as_echo "$as_me:$LINENO: result: c++ libs: $CXXLIBS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: c++ libs: $CXXLIBS" >&5 + $as_echo "c++ libs: $CXXLIBS" >&6; } + + +@@ -8018,7 +7104,7 @@ + + + # Check whether --with-boost was given. +-if test "${with_boost+set}" = set; then ++if test "${with_boost+set}" = set; then : + withval=$with_boost; + if test "$withval" = "no"; then + want_boost="no" +@@ -8038,15 +7124,13 @@ + + + # Check whether --with-boost-libdir was given. +-if test "${with_boost_libdir+set}" = set; then ++if test "${with_boost_libdir+set}" = set; then : + withval=$with_boost_libdir; + if test -d "$withval" + then + ac_boost_lib_path="$withval" + else +- { { $as_echo "$as_me:$LINENO: error: --with-boost-libdir expected directory name" >&5 +-$as_echo "$as_me: error: --with-boost-libdir expected directory name" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5 + fi + + else +@@ -8065,7 +7149,7 @@ + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` +- { $as_echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5 + $as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; } + succeeded=no + +@@ -8115,11 +7199,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -8138,38 +7218,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + succeeded=yes + found_system=yes + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -8229,7 +7285,7 @@ + stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then +- { $as_echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5 + $as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" +@@ -8249,11 +7305,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -8272,38 +7324,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + succeeded=yes + found_system=yes + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -8315,10 +7343,10 @@ + + if test "$succeeded" != "yes" ; then + if test "$_version" = "0" ; then +- { $as_echo "$as_me:$LINENO: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 + $as_echo "$as_me: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&6;} + else +- { $as_echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5 + $as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} + fi + # execute ACTION-IF-NOT-FOUND (if present): +@@ -8329,9 +7357,7 @@ + + + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST /**/" >>confdefs.h + + # execute ACTION-IF-FOUND (if present): + +@@ -8341,7 +7367,7 @@ + + + # Check whether --with-boost-filesystem was given. +-if test "${with_boost_filesystem+set}" = set; then ++if test "${with_boost_filesystem+set}" = set; then : + withval=$with_boost_filesystem; + if test "$withval" = "no"; then + want_boost="no" +@@ -8373,9 +7399,9 @@ + LIBS="$LIBS $BOOST_SYSTEM_LIB" + export LIBS + +- { $as_echo "$as_me:$LINENO: checking whether the Boost::Filesystem library is available" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Filesystem library is available" >&5 + $as_echo_n "checking whether the Boost::Filesystem library is available... " >&6; } +-if test "${ax_cv_boost_filesystem+set}" = set; then ++if ${ax_cv_boost_filesystem+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=cpp +@@ -8384,11 +7410,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -8401,32 +7423,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_filesystem=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ax_cv_boost_filesystem=no ++ ax_cv_boost_filesystem=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -8436,31 +7437,25 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_filesystem" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_filesystem" >&5 + $as_echo "$ax_cv_boost_filesystem" >&6; } + if test "x$ax_cv_boost_filesystem" = "xyes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST_FILESYSTEM /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST_FILESYSTEM /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + if test "x$ax_boost_user_filesystem_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -8474,51 +7469,23 @@ + main () + { + return exit (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break + else + link_filesystem="no" +@@ -8529,18 +7496,14 @@ + for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -8558,47 +7521,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break + else + link_filesystem="no" +@@ -8609,18 +7544,14 @@ + else + for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -8638,47 +7569,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break + else + link_filesystem="no" +@@ -8688,14 +7591,10 @@ + + fi + if test "x$ax_lib" = "x"; then +- { { $as_echo "$as_me:$LINENO: error: Could not find a version of the library!" >&5 +-$as_echo "$as_me: error: Could not find a version of the library!" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_filesystem" != "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 +-$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + +@@ -8707,9 +7606,9 @@ + if test "x${ax_cv_boost_filesystem}" != "xyes"; then + have_boost=0 + fi +- { $as_echo "$as_me:$LINENO: checking whether the Boost::Python library is available" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Python library is available" >&5 + $as_echo_n "checking whether the Boost::Python library is available... " >&6; } +-if test "${ac_cv_boost_python+set}" = set; then ++if ${ac_cv_boost_python+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -8723,11 +7622,7 @@ + CPPFLAGS="$PYTHON_INCLUDE $CPPFLAGS" + LDFLAGS_SAVE="$LDFLAGS" + LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -8741,32 +7636,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_boost_python=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_boost_python=no ++ ac_cv_boost_python=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -8778,19 +7652,17 @@ + LDFLAGS="$LDFLAGS_SAVE" + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_boost_python" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_boost_python" >&5 + $as_echo "$ac_cv_boost_python" >&6; } + if test "$ac_cv_boost_python" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST_PYTHON /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST_PYTHON /**/" >>confdefs.h + + LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS" + ax_python_lib=boost_python + + # Check whether --with-boost-python was given. +-if test "${with_boost_python+set}" = set; then ++if test "${with_boost_python+set}" = set; then : + withval=$with_boost_python; if test "x$with_boost_python" != "xno"; then + ax_python_lib=$with_boost_python + ax_boost_python_lib=boost_python-$with_boost_python +@@ -8799,18 +7671,14 @@ + + for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python boost_python-mt; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -8828,47 +7696,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_PYTHON_LIB=-l$ax_lib ac_cv_boost_python_found_exit=yes break + fi + +@@ -8886,7 +7726,7 @@ + + + # Check whether --with-boost-regex was given. +-if test "${with_boost_regex+set}" = set; then ++if test "${with_boost_regex+set}" = set; then : + withval=$with_boost_regex; + if test "$withval" = "no"; then + want_boost="no" +@@ -8914,9 +7754,9 @@ + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + +- { $as_echo "$as_me:$LINENO: checking whether the Boost::Regex library is available" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Regex library is available" >&5 + $as_echo_n "checking whether the Boost::Regex library is available... " >&6; } +-if test "${ax_cv_boost_regex+set}" = set; then ++if ${ax_cv_boost_regex+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=cpp +@@ -8925,11 +7765,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + +@@ -8941,32 +7777,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_regex=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ax_cv_boost_regex=no ++ ax_cv_boost_regex=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -8976,31 +7791,25 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_regex" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_regex" >&5 + $as_echo "$ax_cv_boost_regex" >&6; } + if test "x$ax_cv_boost_regex" = "xyes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST_REGEX /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST_REGEX /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + if test "x$ax_boost_user_regex_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9018,47 +7827,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_REGEX_LIB="-l$ax_lib"; link_regex="yes"; break + else + link_regex="no" +@@ -9069,18 +7850,14 @@ + for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9098,47 +7875,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_REGEX_LIB="-l$ax_lib"; link_regex="yes"; break + else + link_regex="no" +@@ -9150,18 +7899,14 @@ + else + for ax_lib in $ax_boost_user_regex_lib boost_regex-$ax_boost_user_regex_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 + $as_echo_n "checking for main in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + +@@ -9173,47 +7918,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_REGEX_LIB="-l$ax_lib"; link_regex="yes"; break + else + link_regex="no" +@@ -9222,14 +7939,10 @@ + done + fi + if test "x$ax_lib" = "x"; then +- { { $as_echo "$as_me:$LINENO: error: Could not find a version of the Boost::Regex library!" >&5 +-$as_echo "$as_me: error: Could not find a version of the Boost::Regex library!" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not find a version of the Boost::Regex library!" "$LINENO" 5 + fi + if test "x$link_regex" != "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 +-$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + +@@ -9243,7 +7956,7 @@ + + + # Check whether --with-boost-serialization was given. +-if test "${with_boost_serialization+set}" = set; then ++if test "${with_boost_serialization+set}" = set; then : + withval=$with_boost_serialization; + if test "$withval" = "no"; then + want_boost="no" +@@ -9265,7 +7978,7 @@ + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&5 + $as_echo "$as_me: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&2;} + export CPPFLAGS + +@@ -9273,9 +7986,9 @@ + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + +- { $as_echo "$as_me:$LINENO: checking whether the Boost::Serialization library is available" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Serialization library is available" >&5 + $as_echo_n "checking whether the Boost::Serialization library is available... " >&6; } +-if test "${ax_cv_boost_serialization+set}" = set; then ++if ${ax_cv_boost_serialization+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=cpp +@@ -9284,11 +7997,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -9305,32 +8014,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_serialization=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ax_cv_boost_serialization=no ++ ax_cv_boost_serialization=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -9340,31 +8028,25 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_serialization" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_serialization" >&5 + $as_echo "$ax_cv_boost_serialization" >&6; } + if test "x$ax_cv_boost_serialization" = "xyes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST_SERIALIZATION /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST_SERIALIZATION /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + if test "x$ax_boost_user_serialization_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.so* $BOOSTLIBDIR/libboost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9382,47 +8064,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break + else + link_serialization="no" +@@ -9433,18 +8087,14 @@ + for libextension in `ls $BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9462,47 +8112,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break + else + link_serialization="no" +@@ -9514,18 +8136,14 @@ + else + for ax_lib in $ax_boost_user_serialization_lib boost_serialization-$ax_boost_user_serialization_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 + $as_echo_n "checking for main in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + +@@ -9537,47 +8155,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break + else + link_serialization="no" +@@ -9587,14 +8177,10 @@ + + fi + if test "x$ax_lib" = "x"; then +- { { $as_echo "$as_me:$LINENO: error: Could not find a version of the library!" >&5 +-$as_echo "$as_me: error: Could not find a version of the library!" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_serialization" != "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 +-$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + +@@ -9608,7 +8194,7 @@ + + + # Check whether --with-boost-system was given. +-if test "${with_boost_system+set}" = set; then ++if test "${with_boost_system+set}" = set; then : + withval=$with_boost_system; + if test "$withval" = "no"; then + want_boost="no" +@@ -9637,9 +8223,9 @@ + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + +- { $as_echo "$as_me:$LINENO: checking whether the Boost::System library is available" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5 + $as_echo_n "checking whether the Boost::System library is available... " >&6; } +-if test "${ax_cv_boost_system+set}" = set; then ++if ${ax_cv_boost_system+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=cpp +@@ -9650,11 +8236,7 @@ + + CXXFLAGS_SAVE=$CXXFLAGS + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -9665,32 +8247,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_system=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ax_cv_boost_system=no ++ ax_cv_boost_system=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS=$CXXFLAGS_SAVE + ac_ext=cpp +@@ -9701,15 +8262,13 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_system" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5 + $as_echo "$ax_cv_boost_system" >&6; } + if test "x$ax_cv_boost_system" = "xyes"; then + + + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST_SYSTEM /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + +@@ -9718,18 +8277,14 @@ + for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9747,47 +8302,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break + else + link_system="no" +@@ -9798,18 +8325,14 @@ + for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9827,47 +8350,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break + else + link_system="no" +@@ -9879,18 +8374,14 @@ + else + for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -9908,47 +8399,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break + else + link_system="no" +@@ -9958,14 +8421,10 @@ + + fi + if test "x$ax_lib" = "x"; then +- { { $as_echo "$as_me:$LINENO: error: Could not find a version of the library!" >&5 +-$as_echo "$as_me: error: Could not find a version of the library!" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_system" = "xno"; then +- { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 +-$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + +@@ -9979,7 +8438,7 @@ + + + # Check whether --with-boost-thread was given. +-if test "${with_boost_thread+set}" = set; then ++if test "${with_boost_thread+set}" = set; then : + withval=$with_boost_thread; + if test "$withval" = "no"; then + want_boost="no" +@@ -10008,9 +8467,9 @@ + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + +- { $as_echo "$as_me:$LINENO: checking whether the Boost::Thread library is available" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Thread library is available" >&5 + $as_echo_n "checking whether the Boost::Thread library is available... " >&6; } +-if test "${ax_cv_boost_thread+set}" = set; then ++if ${ax_cv_boost_thread+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=cpp +@@ -10028,11 +8487,7 @@ + else + CXXFLAGS="-pthread $CXXFLAGS" + fi +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -10044,32 +8499,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_thread=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ax_cv_boost_thread=no ++ ax_cv_boost_thread=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS=$CXXFLAGS_SAVE + ac_ext=cpp +@@ -10080,7 +8514,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_thread" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread" >&5 + $as_echo "$ax_cv_boost_thread" >&6; } + if test "x$ax_cv_boost_thread" = "xyes"; then + if test "x$host_os" = "xsolaris" ; then +@@ -10094,9 +8528,7 @@ + + + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BOOST_THREAD /**/ +-_ACEOF ++$as_echo "#define HAVE_BOOST_THREAD /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + +@@ -10111,18 +8543,14 @@ + for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a*$;\1;'`; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10140,47 +8568,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_Lib=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++if ac_fn_cxx_try_link "$LINENO"; then : ++ eval "$as_ac_Lib=yes" ++else ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_THREAD_LIB="-l$ax_lib"; link_thread="yes"; break + else + link_thread="no" +@@ -10191,18 +8591,14 @@ + for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10220,47 +8616,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_THREAD_LIB="-l$ax_lib"; link_thread="yes"; break + else + link_thread="no" +@@ -10272,18 +8640,14 @@ + else + for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 + $as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$ax_lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10301,47 +8665,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_THREAD_LIB="-l$ax_lib"; link_thread="yes"; break + else + link_thread="no" +@@ -10351,14 +8687,10 @@ + + fi + if test "x$ax_lib" = "x"; then +- { { $as_echo "$as_me:$LINENO: error: Could not find a version of the library!" >&5 +-$as_echo "$as_me: error: Could not find a version of the library!" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_thread" = "xno"; then +- { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 +-$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + else + case "x$host_os" in + *bsd* ) +@@ -10391,17 +8723,13 @@ + + # Newer Boost implementations need to link librt on Linux + BOOST_LDFLAGS='' +-{ $as_echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 + $as_echo_n "checking for library containing clock_gettime... " >&6; } +-if test "${ac_cv_search_clock_gettime+set}" = set; then ++if ${ac_cv_search_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10426,54 +8754,27 @@ + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_clock_gettime+set}" = set; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if ${ac_cv_search_clock_gettime+:} false; then : + break + fi + done +-if test "${ac_cv_search_clock_gettime+set}" = set; then +- : ++if ${ac_cv_search_clock_gettime+:} false; then : ++ + else + ac_cv_search_clock_gettime=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 + $as_echo "$ac_cv_search_clock_gettime" >&6; } + ac_res=$ac_cv_search_clock_gettime +-if test "$ac_res" != no; then ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + BOOST_LDFLAGS='-lrt' + fi +@@ -10524,26 +8825,22 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 + $as_echo_n "checking for an ANSI C-conforming const... " >&6; } +-if test "${ac_cv_c_const+set}" = set; then ++if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int + main () + { +-/* FIXME: Include the comments suggested by Paul. */ ++ + #ifndef __cplusplus +- /* Ultrix mips cc rejects this. */ ++ /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; +- const charset cs; ++ const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; +@@ -10560,8 +8857,9 @@ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; +- { /* SCO 3.2v4 cc rejects this. */ +- char *t; ++ { /* SCO 3.2v4 cc rejects this sort of thing. */ ++ char tx; ++ char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; +@@ -10577,10 +8875,10 @@ + iptr p = 0; + ++p; + } +- { /* AIX XL C 1.02.0.0 rejects this saying ++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; ++ struct s { int j; const int *ap[3]; } bx; ++ struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +@@ -10593,203 +8891,41 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_c_const=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_c_const=no ++ ac_cv_c_const=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 + $as_echo "$ac_cv_c_const" >&6; } + if test $ac_cv_c_const = no; then + +-cat >>confdefs.h <<\_ACEOF +-#define const /**/ +-_ACEOF ++$as_echo "#define const /**/" >>confdefs.h + + fi + + +-{ $as_echo "$as_me:$LINENO: checking whether putenv is declared" >&5 +-$as_echo_n "checking whether putenv is declared... " >&6; } +-if test "${ac_cv_have_decl_putenv+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-#ifndef putenv +- (void) putenv; +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_have_decl_putenv=yes ++ac_fn_cxx_check_decl "$LINENO" "putenv" "ac_cv_have_decl_putenv" "$ac_includes_default" ++if test "x$ac_cv_have_decl_putenv" = xyes; then : ++ ac_have_decl=1 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_have_decl_putenv=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_have_decl=0 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_putenv" >&5 +-$as_echo "$ac_cv_have_decl_putenv" >&6; } +-if test "x$ac_cv_have_decl_putenv" = x""yes; then +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_PUTENV 1 +-_ACEOF + + cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_PUTENV 1 ++#define HAVE_DECL_PUTENV $ac_have_decl + _ACEOF +- +-else ++if test $ac_have_decl = 1; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_PUTENV 0 +-_ACEOF +- +- +-fi +- +- +-{ $as_echo "$as_me:$LINENO: checking for putenv" >&5 +-$as_echo_n "checking for putenv... " >&6; } +-if test "${ac_cv_func_putenv+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define putenv to an innocuous variant, in case declares putenv. +- For example, HP-UX 11i declares gettimeofday. */ +-#define putenv innocuous_putenv +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char putenv (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef putenv +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char putenv (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_putenv || defined __stub___putenv +-choke me +-#endif +- +-int +-main () +-{ +-return putenv (); +- ; +- return 0; +-} ++#define HAVE_DECL_PUTENV 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_putenv=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_putenv=no + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_putenv" >&5 +-$as_echo "$ac_cv_func_putenv" >&6; } +-if test "x$ac_cv_func_putenv" = x""yes; then ++ac_fn_cxx_check_func "$LINENO" "putenv" "ac_cv_func_putenv" ++if test "x$ac_cv_func_putenv" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_PUTENV 1 + _ACEOF +@@ -10797,164 +8933,25 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking whether setenv is declared" >&5 +-$as_echo_n "checking whether setenv is declared... " >&6; } +-if test "${ac_cv_have_decl_setenv+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-#ifndef setenv +- (void) setenv; +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_have_decl_setenv=yes ++ac_fn_cxx_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" ++if test "x$ac_cv_have_decl_setenv" = xyes; then : ++ ac_have_decl=1 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_have_decl_setenv=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_have_decl=0 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_setenv" >&5 +-$as_echo "$ac_cv_have_decl_setenv" >&6; } +-if test "x$ac_cv_have_decl_setenv" = x""yes; then +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_SETENV 1 +-_ACEOF + + cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_SETENV 1 ++#define HAVE_DECL_SETENV $ac_have_decl + _ACEOF +- +-else ++if test $ac_have_decl = 1; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_SETENV 0 +-_ACEOF +- +- +-fi +- +- +-{ $as_echo "$as_me:$LINENO: checking for setenv" >&5 +-$as_echo_n "checking for setenv... " >&6; } +-if test "${ac_cv_func_setenv+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define setenv to an innocuous variant, in case declares setenv. +- For example, HP-UX 11i declares gettimeofday. */ +-#define setenv innocuous_setenv +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char setenv (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef setenv +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char setenv (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_setenv || defined __stub___setenv +-choke me +-#endif +- +-int +-main () +-{ +-return setenv (); +- ; +- return 0; +-} ++#define HAVE_DECL_SETENV 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_setenv=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_setenv=no + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setenv" >&5 +-$as_echo "$ac_cv_func_setenv" >&6; } +-if test "x$ac_cv_func_setenv" = x""yes; then ++ac_fn_cxx_check_func "$LINENO" "setenv" "ac_cv_func_setenv" ++if test "x$ac_cv_func_setenv" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SETENV 1 + _ACEOF +@@ -10968,18 +8965,14 @@ + # ]) + #]) + +-{ $as_echo "$as_me:$LINENO: checking for erf in -lm" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for erf in -lm" >&5 + $as_echo_n "checking for erf in -lm... " >&6; } +-if test "${ac_cv_lib_m_erf+set}" = set; then ++if ${ac_cv_lib_m_erf+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10991,49 +8984,24 @@ + char erf (); + int + main () +-{ +-return erf (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++{ ++return erf (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_m_erf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_erf=no ++ ac_cv_lib_m_erf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_erf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_erf" >&5 + $as_echo "$ac_cv_lib_m_erf" >&6; } +-if test "x$ac_cv_lib_m_erf" = x""yes; then ++if test "x$ac_cv_lib_m_erf" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_FUNC_ERF 1 + _ACEOF +@@ -11042,7 +9010,7 @@ + + + # set up cpu specific flags +-{ $as_echo "$as_me:$LINENO: checking for architecture/compiler specific optimization flags" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for architecture/compiler specific optimization flags" >&5 + $as_echo_n "checking for architecture/compiler specific optimization flags... " >&6; } + case $target_cpu in + rs6000) +@@ -11087,12 +9055,12 @@ + fi + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: C optimization flags: $COPT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: C optimization flags: $COPT" >&5 + $as_echo "C optimization flags: $COPT" >&6; } +-{ $as_echo "$as_me:$LINENO: result: C++ optimization flags: $CXXOPT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ optimization flags: $CXXOPT" >&5 + $as_echo "C++ optimization flags: $CXXOPT" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for OS specific flags" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OS specific flags" >&5 + $as_echo_n "checking for OS specific flags... " >&6; } + case $target_os in + aix*) +@@ -11109,16 +9077,16 @@ + CXXDEF="$CXXDEF $EXTRADEFS" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: C preprocessor directives: $CDEF" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: C preprocessor directives: $CDEF" >&5 + $as_echo "C preprocessor directives: $CDEF" >&6; } +-{ $as_echo "$as_me:$LINENO: result: C++ preprocessor directives: $CXXDEF" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ preprocessor directives: $CXXDEF" >&5 + $as_echo "C++ preprocessor directives: $CXXDEF" >&6; } + + # Adjust the debug flags. + # The default is to not debug. --with-debug will turn on debugging. + + # Check whether --with-debug was given. +-if test "${with_debug+set}" = set; then ++if test "${with_debug+set}" = set; then : + withval=$with_debug; + case $withval in + yes) +@@ -11146,7 +9114,7 @@ + # "--with-debug" option will overwrite $CDBG and $CXXDBG. + + # Check whether --with-profiling was given. +-if test "${with_profiling+set}" = set; then ++if test "${with_profiling+set}" = set; then : + withval=$with_profiling; + case $withval in + yes) +@@ -11170,7 +9138,7 @@ + # off optimization. + + # Check whether --with-opt was given. +-if test "${with_opt+set}" = set; then ++if test "${with_opt+set}" = set; then : + withval=$with_opt; + case $withval in + yes) +@@ -11192,9 +9160,9 @@ + # Check for OpenMP, the test reports for C++ only, because we called AC_LANG([C++]) near the top + + +-{ $as_echo "$as_me:$LINENO: checking for OpenMP flag of C++ compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&5 + $as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; } +-if test "${ax_cv_cxx_openmp+set}" = set; then ++if ${ax_cv_cxx_openmp+:} false; then : + $as_echo_n "(cached) " >&6 + else + saveCXXFLAGS=$CXXFLAGS +@@ -11212,11 +9180,7 @@ + esac + # AC_TRY_LINK_FUNC(omp_set_num_threads, + # [ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break]) +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -11227,43 +9191,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + ax_cv_cxx_openmp=$ax_openmp_flag; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + done + CXXFLAGS=$saveCXXFLAGS + + fi +-{ $as_echo "$as_me:$LINENO: result: $ax_cv_cxx_openmp" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_openmp" >&5 + $as_echo "$ax_cv_cxx_openmp" >&6; } + if test "x$ax_cv_cxx_openmp" = "xunknown"; then + : +@@ -11292,16 +9229,12 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- { $as_echo "$as_me:$LINENO: checking if $CXX supports __builtin_expect" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports __builtin_expect" >&5 + $as_echo_n "checking if $CXX supports __builtin_expect... " >&6; } +-if test "${_cv_cxx_supports___builtin_expect+set}" = set; then ++if ${_cv_cxx_supports___builtin_expect+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -11313,40 +9246,15 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + _cv_cxx_supports___builtin_expect="yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- _cv_cxx_supports___builtin_expect="no" ++ _cv_cxx_supports___builtin_expect="no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $_cv_cxx_supports___builtin_expect" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_cxx_supports___builtin_expect" >&5 + $as_echo "$_cv_cxx_supports___builtin_expect" >&6; } + if test "$_cv_cxx_supports___builtin_expect" = "yes" ; then + have_builtin_expect=1 +@@ -11372,16 +9280,12 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- { $as_echo "$as_me:$LINENO: checking if $CXX supports __builtin_prefetch" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports __builtin_prefetch" >&5 + $as_echo_n "checking if $CXX supports __builtin_prefetch... " >&6; } +-if test "${_cv_cxx_supports___builtin_prefetch+set}" = set; then ++if ${_cv_cxx_supports___builtin_prefetch+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -11393,40 +9297,15 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + _cv_cxx_supports___builtin_prefetch="yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- _cv_cxx_supports___builtin_prefetch="no" ++ _cv_cxx_supports___builtin_prefetch="no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $_cv_cxx_supports___builtin_prefetch" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_cxx_supports___builtin_prefetch" >&5 + $as_echo "$_cv_cxx_supports___builtin_prefetch" >&6; } + if test "$_cv_cxx_supports___builtin_prefetch" = "yes" ; then + have_builtin_prefetch=1 +@@ -11452,16 +9331,12 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- { $as_echo "$as_me:$LINENO: checking if $CXX supports __builtin_constant_p" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports __builtin_constant_p" >&5 + $as_echo_n "checking if $CXX supports __builtin_constant_p... " >&6; } +-if test "${_cv_cxx_supports___builtin_constant_p+set}" = set; then ++if ${_cv_cxx_supports___builtin_constant_p+:} false; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -11473,40 +9348,15 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + _cv_cxx_supports___builtin_constant_p="yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- _cv_cxx_supports___builtin_constant_p="no" ++ _cv_cxx_supports___builtin_constant_p="no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $_cv_cxx_supports___builtin_constant_p" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_cxx_supports___builtin_constant_p" >&5 + $as_echo "$_cv_cxx_supports___builtin_constant_p" >&6; } + if test "$_cv_cxx_supports___builtin_constant_p" = "yes" ; then + have_builtin_constant_p=1 +@@ -11531,7 +9381,7 @@ + # The default is to disable strict language checks. + + # Check whether --with-strict was given. +-if test "${with_strict+set}" = set; then ++if test "${with_strict+set}" = set; then : + withval=$with_strict; + case $withval in + yes) +@@ -11558,7 +9408,7 @@ + # Handle plugins + + # Check whether --with-plugins was given. +-if test "${with_plugins+set}" = set; then ++if test "${with_plugins+set}" = set; then : + withval=$with_plugins; + case $withval in + yes) +@@ -11595,7 +9445,7 @@ + # The default is to disable strict language checks. + + # Check whether --with-insanely-strict was given. +-if test "${with_insanely_strict+set}" = set; then ++if test "${with_insanely_strict+set}" = set; then : + withval=$with_insanely_strict; + case $withval in + yes) +@@ -11610,9 +9460,9 @@ + + fi + +-{ $as_echo "$as_me:$LINENO: result: C extra flags: $COTH" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: C extra flags: $COTH" >&5 + $as_echo "C extra flags: $COTH" >&6; } +-{ $as_echo "$as_me:$LINENO: result: C++ extra flags: $CXXOTH" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ extra flags: $CXXOTH" >&5 + $as_echo "C++ extra flags: $CXXOTH" >&6; } + + # Set up CFLAGS and FFLAGS. +@@ -11670,13 +9520,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -11684,8 +9534,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -11707,12 +9557,23 @@ + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++ if test "x$cache_file" != "x/dev/null"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} +- cat confcache >$cache_file ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi +@@ -11726,14 +9587,15 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -11741,13 +9603,14 @@ + + + +-: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -11757,17 +9620,18 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -11775,23 +9639,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -11799,7 +9655,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -11810,7 +9672,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -11833,13 +9695,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -11849,15 +9704,16 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++as_myself= ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -11869,12 +9725,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -11886,7 +9746,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -11900,8 +9842,12 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +@@ -11921,76 +9867,25 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -12005,49 +9900,85 @@ + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -12057,13 +9988,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by psi $as_me 4.0.0-beta5, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -12095,13 +10032,15 @@ + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -12120,16 +10059,17 @@ + Configuration commands: + $config_commands + +-Report bugs to ." ++Report bugs to ." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + psi config.status 4.0.0-beta5 +-configured by $0, generated by GNU Autoconf 2.63, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.69, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -12145,11 +10085,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -12163,27 +10108,29 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error $? "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -12191,11 +10138,10 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error $? "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -12212,7 +10158,7 @@ + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' +@@ -12572,9 +10518,7 @@ + "bin/psi4-config") CONFIG_FILES="$CONFIG_FILES bin/psi4-config" ;; + "psi4-config") CONFIG_COMMANDS="$CONFIG_COMMANDS psi4-config" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -12597,26 +10541,24 @@ + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -12624,7 +10566,13 @@ + if test -n "$CONFIG_FILES"; then + + +-ac_cr=' ' ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +@@ -12632,7 +10580,7 @@ + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && + _ACEOF + + +@@ -12641,24 +10589,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -12666,7 +10608,7 @@ + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -12680,7 +10622,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -12694,7 +10636,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -12714,7 +10656,7 @@ + rm -f conf$$subs.awk + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +@@ -12746,23 +10688,29 @@ + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" + else + cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -12774,7 +10722,7 @@ + # No need to generate them if there are no CONFIG_HEADERS. + # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +@@ -12786,13 +10734,11 @@ + # handling of long lines. + ac_delim='%!_!# ' + for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_t"; then ++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_tt"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -12877,9 +10823,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -12892,9 +10836,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -12913,7 +10855,7 @@ + for ac_f + do + case $ac_f in +- -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -12922,12 +10864,10 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't +@@ -12938,7 +10878,7 @@ + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. +@@ -12950,10 +10890,8 @@ + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -12981,47 +10919,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in +@@ -13073,7 +10971,6 @@ + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- + ac_sed_dataroot=' + /datarootdir/ { + p +@@ -13083,12 +10980,11 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' ++/@mandir@/p' + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -13098,7 +10994,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -13125,27 +11021,24 @@ + s&@INSTALL@&$ac_INSTALL&;t t + $ac_datarootdir_hack + " +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_tmp/out"`; test -z "$ac_out"; } && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -13154,31 +11047,25 @@ + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" +- } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } +- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" ++ } >"$ac_tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" +- mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ mv "$ac_tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -13191,15 +11078,12 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -13220,10 +11104,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +diff -urN psi4.0b5.org/configure.ac psi4.0b5/configure.ac +--- psi4.0b5.org/configure.ac 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/configure.ac 2013-09-20 18:01:00.170267584 +0200 +@@ -37,6 +37,20 @@ + PSI_TOP_OBJDIR=`pwd` + AC_DEFINE_UNQUOTED([PSI_TOP_OBJDIR],["$PSI_TOP_OBJDIR"]) + ++if test -z $PSI_OBJ_INSTALL_DIR; then ++ PSI_OBJ_INSTALL_DIR=`pwd` ++fi ++ ++AC_ARG_VAR(PSI_OBJ_INSTALL_DIR,Directory where to place the psi object files) ++AC_DEFINE_UNQUOTED([PSI_OBJ_INSTALL_DIR], ["$PSI_OBJ_INSTALL_DIR"]) ++ ++if test -z $PSI_SRC_INSTALL_DIR; then ++ PSI_SRC_INSTALL_DIR=`pwd` ++fi ++ ++AC_ARG_VAR(PSI_SRC_INSTALL_DIR,Directory where to place the psi source files) ++AC_DEFINE_UNQUOTED([PSI_SRC_INSTALL_DIR], ["$PSI_SRC_INSTALL_DIR"]) ++ + AC_CONFIG_AUX_DIR(bin) + AC_CONFIG_MACRO_DIR([m4]) + +diff -urN psi4.0b5.org/include/psiconfig.h.in psi4.0b5/include/psiconfig.h.in +--- psi4.0b5.org/include/psiconfig.h.in 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/include/psiconfig.h.in 2013-09-20 18:01:43.009105835 +0200 +@@ -14,6 +14,10 @@ + #define PSI_TOP_SRCDIR @top_srcdir@ + #define PSI_TOP_OBJDIR @top_objdir@ + ++/* directories to use for new plugins */ ++#undef PSI_OBJ_INSTALL_DIR ++#undef PSI_SRC_INSTALL_DIR ++ + /* MPI? */ + #undef HAVE_MPI + +diff -urN psi4.0b5.org/src/bin/psi4/create_new_plugin.cc psi4.0b5/src/bin/psi4/create_new_plugin.cc +--- psi4.0b5.org/src/bin/psi4/create_new_plugin.cc 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/src/bin/psi4/create_new_plugin.cc 2013-09-20 18:03:36.492674514 +0200 +@@ -128,8 +128,8 @@ + Name[0] = ::toupper(Name[0]); + + // Formatted strings, to be substituted in later +- std::string format_top_srcdir(PSI_TOP_SRCDIR); +- std::string format_top_objdir(PSI_TOP_OBJDIR); ++ std::string format_top_srcdir(PSI_SRC_INSTALL_DIR); ++ std::string format_top_objdir(PSI_OBJ_INSTALL_DIR); + std::string format_plugin(plugin_name_); + std::string format_PLUGIN = boost::algorithm::to_upper_copy(plugin_name_); + -- GitLab From e679d69debb27d14c1fcf0d1647c1d074b966e1d Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 2 Oct 2013 11:45:11 +0200 Subject: [PATCH 087/811] PSI: reorder new-plugin patch and added comments --- .../p/PSI/PSI-4.0b5-new-plugin.patch | 108 +++++++++--------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch index c3f18f8ce5..92e45ae9be 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-new-plugin.patch @@ -1,3 +1,59 @@ +# This patch add two env vars (PSI_OBJ_INSTALL_DIR and PSI_SRC_INSTALL_DIR) to the +# configure script. These vars set the location of the obj and the src dir after +# install. PSI needs to know this when it generates a new plugin. +# The real change is in configure.ac. configure is autogenerated using this file. +diff -urN psi4.0b5.org/configure.ac psi4.0b5/configure.ac +--- psi4.0b5.org/configure.ac 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/configure.ac 2013-09-20 18:01:00.170267584 +0200 +@@ -37,6 +37,20 @@ + PSI_TOP_OBJDIR=`pwd` + AC_DEFINE_UNQUOTED([PSI_TOP_OBJDIR],["$PSI_TOP_OBJDIR"]) + ++if test -z $PSI_OBJ_INSTALL_DIR; then ++ PSI_OBJ_INSTALL_DIR=`pwd` ++fi ++ ++AC_ARG_VAR(PSI_OBJ_INSTALL_DIR,Directory where to place the psi object files) ++AC_DEFINE_UNQUOTED([PSI_OBJ_INSTALL_DIR], ["$PSI_OBJ_INSTALL_DIR"]) ++ ++if test -z $PSI_SRC_INSTALL_DIR; then ++ PSI_SRC_INSTALL_DIR=`pwd` ++fi ++ ++AC_ARG_VAR(PSI_SRC_INSTALL_DIR,Directory where to place the psi source files) ++AC_DEFINE_UNQUOTED([PSI_SRC_INSTALL_DIR], ["$PSI_SRC_INSTALL_DIR"]) ++ + AC_CONFIG_AUX_DIR(bin) + AC_CONFIG_MACRO_DIR([m4]) + +diff -urN psi4.0b5.org/include/psiconfig.h.in psi4.0b5/include/psiconfig.h.in +--- psi4.0b5.org/include/psiconfig.h.in 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/include/psiconfig.h.in 2013-09-20 18:01:43.009105835 +0200 +@@ -14,6 +14,10 @@ + #define PSI_TOP_SRCDIR @top_srcdir@ + #define PSI_TOP_OBJDIR @top_objdir@ + ++/* directories to use for new plugins */ ++#undef PSI_OBJ_INSTALL_DIR ++#undef PSI_SRC_INSTALL_DIR ++ + /* MPI? */ + #undef HAVE_MPI + +diff -urN psi4.0b5.org/src/bin/psi4/create_new_plugin.cc psi4.0b5/src/bin/psi4/create_new_plugin.cc +--- psi4.0b5.org/src/bin/psi4/create_new_plugin.cc 2013-07-01 23:11:05.000000000 +0200 ++++ psi4.0b5/src/bin/psi4/create_new_plugin.cc 2013-09-20 18:03:36.492674514 +0200 +@@ -128,8 +128,8 @@ + Name[0] = ::toupper(Name[0]); + + // Formatted strings, to be substituted in later +- std::string format_top_srcdir(PSI_TOP_SRCDIR); +- std::string format_top_objdir(PSI_TOP_OBJDIR); ++ std::string format_top_srcdir(PSI_SRC_INSTALL_DIR); ++ std::string format_top_objdir(PSI_OBJ_INSTALL_DIR); + std::string format_plugin(plugin_name_); + std::string format_PLUGIN = boost::algorithm::to_upper_copy(plugin_name_); + diff -urN psi4.0b5.org/configure psi4.0b5/configure --- psi4.0b5.org/configure 2013-07-01 23:11:05.000000000 +0200 +++ psi4.0b5/configure 2013-09-20 18:01:52.468070030 +0200 @@ -12020,55 +12076,3 @@ diff -urN psi4.0b5.org/configure psi4.0b5/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -diff -urN psi4.0b5.org/configure.ac psi4.0b5/configure.ac ---- psi4.0b5.org/configure.ac 2013-07-01 23:11:05.000000000 +0200 -+++ psi4.0b5/configure.ac 2013-09-20 18:01:00.170267584 +0200 -@@ -37,6 +37,20 @@ - PSI_TOP_OBJDIR=`pwd` - AC_DEFINE_UNQUOTED([PSI_TOP_OBJDIR],["$PSI_TOP_OBJDIR"]) - -+if test -z $PSI_OBJ_INSTALL_DIR; then -+ PSI_OBJ_INSTALL_DIR=`pwd` -+fi -+ -+AC_ARG_VAR(PSI_OBJ_INSTALL_DIR,Directory where to place the psi object files) -+AC_DEFINE_UNQUOTED([PSI_OBJ_INSTALL_DIR], ["$PSI_OBJ_INSTALL_DIR"]) -+ -+if test -z $PSI_SRC_INSTALL_DIR; then -+ PSI_SRC_INSTALL_DIR=`pwd` -+fi -+ -+AC_ARG_VAR(PSI_SRC_INSTALL_DIR,Directory where to place the psi source files) -+AC_DEFINE_UNQUOTED([PSI_SRC_INSTALL_DIR], ["$PSI_SRC_INSTALL_DIR"]) -+ - AC_CONFIG_AUX_DIR(bin) - AC_CONFIG_MACRO_DIR([m4]) - -diff -urN psi4.0b5.org/include/psiconfig.h.in psi4.0b5/include/psiconfig.h.in ---- psi4.0b5.org/include/psiconfig.h.in 2013-07-01 23:11:05.000000000 +0200 -+++ psi4.0b5/include/psiconfig.h.in 2013-09-20 18:01:43.009105835 +0200 -@@ -14,6 +14,10 @@ - #define PSI_TOP_SRCDIR @top_srcdir@ - #define PSI_TOP_OBJDIR @top_objdir@ - -+/* directories to use for new plugins */ -+#undef PSI_OBJ_INSTALL_DIR -+#undef PSI_SRC_INSTALL_DIR -+ - /* MPI? */ - #undef HAVE_MPI - -diff -urN psi4.0b5.org/src/bin/psi4/create_new_plugin.cc psi4.0b5/src/bin/psi4/create_new_plugin.cc ---- psi4.0b5.org/src/bin/psi4/create_new_plugin.cc 2013-07-01 23:11:05.000000000 +0200 -+++ psi4.0b5/src/bin/psi4/create_new_plugin.cc 2013-09-20 18:03:36.492674514 +0200 -@@ -128,8 +128,8 @@ - Name[0] = ::toupper(Name[0]); - - // Formatted strings, to be substituted in later -- std::string format_top_srcdir(PSI_TOP_SRCDIR); -- std::string format_top_objdir(PSI_TOP_OBJDIR); -+ std::string format_top_srcdir(PSI_SRC_INSTALL_DIR); -+ std::string format_top_objdir(PSI_OBJ_INSTALL_DIR); - std::string format_plugin(plugin_name_); - std::string format_PLUGIN = boost::algorithm::to_upper_copy(plugin_name_); - -- GitLab From 7b62e19d947e6553376a4dfe46e671aac8ef1843 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 13 Sep 2013 17:15:01 +0200 Subject: [PATCH 088/811] Updated Boost to 1.53 with ictce-5.5.0 and python-2.7.5 --- .../Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..ef5291b851 --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,28 @@ +name = 'Boost' +version = '1.53.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +patches = ['intellinuxjam_fPIC.patch'] + +pythonversion = '2.7.5' +versionsuffix = '-Python-%s' % pythonversion + +dependencies = [ + ('bzip2', '1.0.6'), + ('Python', pythonversion), +] + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' -- GitLab From c3e094ca97bb40ecfa4b723db53945e75d18d45b Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 13 Sep 2013 17:15:28 +0200 Subject: [PATCH 089/811] Update PSI to 4.0b5 with ictce-5.5.0 and MPI --- .../p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 29 ++++++++++ .../p/PSI/PSI-4.0b5-mpi-memcpy.patch | 53 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb new file mode 100644 index 0000000000..18de8fdebe --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -0,0 +1,29 @@ +name = 'PSI' +version = '4.0b5' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b4-mpi.patch', + 'PSI-4.0b5-mpi-memcpy.patch', + 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit +] + +python = 'Python' +pyver = '2.7.5' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch new file mode 100644 index 0000000000..3c6eb421fb --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch @@ -0,0 +1,53 @@ +diff -ur psi4.0b5.orig/src/lib/libparallel/elem.h psi4.0b5/src/lib/libparallel/elem.h +--- psi4.0b5.orig/src/lib/libparallel/elem.h 2013-09-12 19:58:45.675482999 +0200 ++++ psi4.0b5/src/lib/libparallel/elem.h 2013-09-12 17:56:02.259640817 +0200 +@@ -140,7 +140,7 @@ + if (receive_buffer == 0) { + receive_buffer = new type[nelem]; + elem::mpi::AllReduce(&data[0], receive_buffer, nelem, elem::mpi::SUM, comm_); +- ::memcpy(data, receive_buffer, nelem*sizeof(type)); ++ std::memcpy(data, receive_buffer, nelem*sizeof(type)); + delete receive_buffer; + } + else +diff -ur psi4.0b5.orig/src/lib/libparallel/local.h psi4.0b5/src/lib/libparallel/local.h +--- psi4.0b5.orig/src/lib/libparallel/local.h 2013-09-12 19:58:54.605171643 +0200 ++++ psi4.0b5/src/lib/libparallel/local.h 2013-09-12 17:56:02.259640817 +0200 +@@ -137,7 +137,7 @@ + inline void sum(type data, int nelem, type *receive_buffer=0, int target=-1) + { + if (receive_buffer != 0) +- ::memcpy(receive_buffer, data, sizeof(type) * nelem); ++ std::memcpy(receive_buffer, data, sizeof(type) * nelem); + } + + /** +diff -ur psi4.0b5.orig/src/lib/libparallel/mpi_wrapper.h psi4.0b5/src/lib/libparallel/mpi_wrapper.h +--- psi4.0b5.orig/src/lib/libparallel/mpi_wrapper.h 2013-09-12 19:58:37.556766089 +0200 ++++ psi4.0b5/src/lib/libparallel/mpi_wrapper.h 2013-09-12 19:55:22.506570968 +0200 +@@ -22,6 +22,7 @@ + + #if defined(HAVE_MPI) + ++#include + #include + + namespace psi { +@@ -99,7 +100,7 @@ + void sum(double* data, size_t nelem) { + double *receive_buffer = new double[nelem]; + MPI_Allreduce(static_cast(data), static_cast(receive_buffer), nelem, MPI_DOUBLE, MPI_SUM, comm_); +- ::memcpy(static_cast(data), static_cast(receive_buffer), sizeof(double)*nelem); ++ std::memcpy(static_cast(data), static_cast(receive_buffer), sizeof(double)*nelem); + delete[] receive_buffer; + } + +@@ -118,7 +119,7 @@ + MPI_Allreduce(static_cast(data), static_cast(receive_buffer), n, M, MPI_SUM, comm_); \ + \ + if (alloc) { \ +- ::memcpy(static_cast(data), static_cast(receive_buffer), sizeof(T)*n); \ ++ std::memcpy(static_cast(data), static_cast(receive_buffer), sizeof(T)*n); \ + delete[] receive_buffer; \ + } \ + } -- GitLab From ed893349bd290d3d72e38385d9c9af5e61284a62 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 24 Sep 2013 16:20:33 +0200 Subject: [PATCH 090/811] PSI-4.0b5-ictce-5.5.0: Added fix for potential thread bug A variable is changed without proper mutex locking. --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index 18de8fdebe..2af96b5786 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -16,6 +16,7 @@ patches = [ 'PSI-4.0b4-mpi.patch', 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-thread-pool.patch', ] python = 'Python' -- GitLab From 36050bb9feca3436fa4e2034692697398503d35f Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 1 Oct 2013 14:54:07 +0200 Subject: [PATCH 091/811] Added patch to PSI for new-plugin I've added two env vars to the configure script: one for the install directory for the source and one for the install directory of the objects. --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index 2af96b5786..b3815a9d70 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -17,6 +17,7 @@ patches = [ 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', + 'PSI-4.0b5-new-plugin.patch', ] python = 'Python' -- GitLab From 40dab5dca7b9b0c375a47c985b9615bc6036a7ad Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 3 Oct 2013 15:58:45 +0200 Subject: [PATCH 092/811] PSI: second thread pool patch Hang should be fixed now. --- .../p/PSI/PSI-4.0b5-thread-pool.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch index fe03b68857..68fd95329e 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-thread-pool.patch @@ -18,3 +18,60 @@ diff -ur psi4.0b5.orig/src/bin/detci/tpool.cc psi4.0b5/src/bin/detci/tpool.cc } *tpoolp = tpool; +diff --git a/src/bin/detci/tpool.cc b/src/bin/detci/tpool.cc +index ab42c9a..cfbffa2 100644 +--- a/src/bin/detci/tpool.cc ++++ b/src/bin/detci/tpool.cc +@@ -284,10 +284,22 @@ int tpool_destroy(tpool_t tpool, + } + void tpool_queue_open(tpool_t tpool) + { +- pthread_mutex_lock(&tpool->queue_lock); ++ int rtn; ++ std::string str; ++ ++ if ((rtn = pthread_mutex_lock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_lock "; ++ str += boost::lexical_cast( rtn) ; ++ throw PsiException(str,__FILE__,__LINE__); ++ } ++ + tpool->queue_closed = 0; +- tpool->threads_awake = 0; +- pthread_mutex_unlock(&tpool->queue_lock); ++ ++ if ((rtn = pthread_mutex_unlock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_unlock "; ++ str += boost::lexical_cast( rtn) ; ++ throw PsiException(str,__FILE__,__LINE__); ++ } + } + + void tpool_queue_close(tpool_t tpool, int finish) +@@ -295,7 +307,12 @@ void tpool_queue_close(tpool_t tpool, int finish) + std::string str; + int rtn; + +- pthread_mutex_lock(&tpool->queue_lock); ++ if ((rtn = pthread_mutex_lock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_lock "; ++ str += boost::lexical_cast( rtn) ; ++ throw PsiException(str,__FILE__,__LINE__); ++ } ++ + tpool->queue_closed = 1; + + if (finish) { +@@ -309,7 +326,11 @@ void tpool_queue_close(tpool_t tpool, int finish) + + } + +- pthread_mutex_unlock(&tpool->queue_lock); ++ if ((rtn = pthread_mutex_unlock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_unlock "; ++ str += boost::lexical_cast( rtn) ; ++ throw PsiException(str,__FILE__,__LINE__); ++ } + + } + -- GitLab From b28047795e7a03ddabf2bfe6f558ea5d7a2b9acb Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 13 Sep 2013 18:05:43 +0200 Subject: [PATCH 093/811] PSI update to 4.0b5 with ictce-5.5.0 multithreaded --- .../p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb new file mode 100644 index 0000000000..1d70869b4d --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb @@ -0,0 +1,31 @@ +name = 'PSI' +version = '4.0b5' +versionsuffix = '-mt' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +# not using MPI results in a build relying on multithreaded BLAS solely +toolchainopts = {'usempi': False} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-new-plugin.patch', + 'PSI-4.0b5-thread-pool.patch', +] + +python = 'Python' +pyver = '2.7.5' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' -- GitLab From e032764661f9be8951d37945e0ed5caf17bfe5a5 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sat, 5 Oct 2013 15:15:52 +0200 Subject: [PATCH 094/811] PSI-4.0b5-ictce-5.5.0: use correct version of patch --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index b3815a9d70..6584a717f5 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -13,7 +13,7 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ - 'PSI-4.0b4-mpi.patch', + 'PSI-4.0b5-mpi.patch', 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', -- GitLab From f5012fe56b05a6d170d344272a5f4cadce539a2f Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sat, 5 Oct 2013 16:36:30 +0200 Subject: [PATCH 095/811] Updated GSL to 1.16 with ictce-5.5.0 --- .../easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb new file mode 100644 index 0000000000..cc919ac9fe --- /dev/null +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb @@ -0,0 +1,17 @@ +name = 'GSL' +version = '1.16' + +homepage = 'http://www.gnu.org/software/gsl/' +description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. + The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/gsl/'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +moduleclass = 'numlib' -- GitLab From a2887c32914d43ed0302a091f261ba3d4102d351 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 7 Oct 2013 13:29:24 +0200 Subject: [PATCH 096/811] arpack-ng: fixed incorrect lib in pkg-config file --- .../a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb | 2 ++ .../a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb | 5 ++++- .../a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb index b1b9520fb2..df235b41f8 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb @@ -11,6 +11,8 @@ toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': False} source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] sources = [SOURCELOWER_TAR_GZ] +patches = ['arpack-ng-3.1.3-pkgconfig.patch'] + configopts = '--with-pic --with-blas="$LIBLAS_MT" --with-lapack="$LIBLAPACK_MT"' sanity_check_paths = { diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb index 4d8ff60f8f..2b79e8317c 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb @@ -10,7 +10,10 @@ toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True} source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['arpack-ng-3.1.3-configure-mpi.patch'] +patches = [ + 'arpack-ng-3.1.3-configure-mpi.patch', + 'arpack-ng-3.1.3-pkgconfig.patch', +] configopts = '--enable-mpi --with-pic --with-blas="$LIBLAS" --with-lapack="$LIBLAPACK"' diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch new file mode 100644 index 0000000000..eca7e51f1e --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch @@ -0,0 +1,9 @@ +--- arpack.pc.in.orig 2013-10-07 13:25:45.614476724 +0200 ++++ arpack.pc.in 2013-10-07 13:25:36.213517908 +0200 +@@ -5,5 +5,5 @@ + Name: arpack + Description: ARPACK-NG + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -larpack -lblas -latlas ++Libs: -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@ + Cflags: -- GitLab From 2d8714ff46f47d5b9b7534e190fb41f4b704e00d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 7 Oct 2013 21:33:55 +0200 Subject: [PATCH 097/811] bump version to 1.9.0.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b4af8975bb..db883e435c 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.8.0.0" +VERSION = "1.9.0.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 1992c46370aae3da67d21a42cce06aee62db543a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 7 Oct 2013 21:35:19 +0200 Subject: [PATCH 098/811] bump version to 1.8.1.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b4af8975bb..c236722f3a 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.8.0.0" +VERSION = "1.8.1.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 0ce8a97d463ed98f5ee1d8c2dadfe2ac1b3ab304 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 8 Oct 2013 17:11:55 +0200 Subject: [PATCH 099/811] get rid of faulty libxcb easyconfig (no Python version suffix, so deps can not be resolved) --- .../l/libxcb/libxcb-1.8-goolf-1.4.10.eb | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb deleted file mode 100644 index da98dbac0a..0000000000 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10.eb +++ /dev/null @@ -1,28 +0,0 @@ -name = 'libxcb' -version = '1.8' - -homepage = 'http://xcb.freedesktop.org/' -description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, -latency hiding, direct access to the protocol, improved threading support, and extensibility.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -source_urls = ['http://xcb.freedesktop.org/dist/'] -sources = [SOURCELOWER_TAR_GZ] - -patches = ['libxcb-no-pthread-stubs.patch'] - -versionsuffix = '' -dependencies = [ - ('xcb-proto', '1.7', versionsuffix) -] - -sanity_check_paths = { - 'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx", - "-randr", "-record", "-render", "-res", "-screensaver", - "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes", - "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]], - 'dirs': ['include/xcb', 'lib/pkgconfig'], -} - -moduleclass = 'lib' -- GitLab From 4ee758b66216a6169002086ff0a82ab42782998a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 8 Oct 2013 17:11:29 +0200 Subject: [PATCH 100/811] fix faulty easyconfig file names --- ...rl-5.16.3.eb => XML-LibXML-2.0018-goolf-1.4.10-Perl-5.16.3.eb} | 0 ...L-Syck-1.21-goolf-1.4.10.eb => YAML-Syck-1.27-goolf-1.4.10.eb} | 0 ...L-Syck-1.21-ictce-4.1.13.eb => YAML-Syck-1.27-ictce-4.1.13.eb} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/x/XML-LibXML/{XML-LibXML-4.023-goolf-1.4.10-Perl-5.16.3.eb => XML-LibXML-2.0018-goolf-1.4.10-Perl-5.16.3.eb} (100%) rename easybuild/easyconfigs/y/YAML-Syck/{YAML-Syck-1.21-goolf-1.4.10.eb => YAML-Syck-1.27-goolf-1.4.10.eb} (100%) rename easybuild/easyconfigs/y/YAML-Syck/{YAML-Syck-1.21-ictce-4.1.13.eb => YAML-Syck-1.27-ictce-4.1.13.eb} (100%) diff --git a/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-4.023-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-goolf-1.4.10-Perl-5.16.3.eb similarity index 100% rename from easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-4.023-goolf-1.4.10-Perl-5.16.3.eb rename to easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-goolf-1.4.10-Perl-5.16.3.eb diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.21-goolf-1.4.10.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10.eb similarity index 100% rename from easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.21-goolf-1.4.10.eb rename to easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.21-ictce-4.1.13.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13.eb similarity index 100% rename from easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.21-ictce-4.1.13.eb rename to easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13.eb -- GitLab From 5f03bc4e6bf0c6bacfb694502e186c77a9edfd36 Mon Sep 17 00:00:00 2001 From: Bart Verleye Date: Wed, 9 Oct 2013 14:51:31 +1300 Subject: [PATCH 101/811] Adding all eb config files for the new gmpolf toolchain. --- .../f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb | 32 ++++++++++++ .../easyconfigs/g/gmpich2/gmpich2-3.0.4.eg | 25 +++++++++ .../easyconfigs/g/gmpolf/gmpolf-1.4.8.eb | 37 ++++++++++++++ .../l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb | 15 ++++++ .../m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb | 23 +++++++++ ...enBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb | 51 +++++++++++++++++++ ...pich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 25 +++++++++ 7 files changed, 208 insertions(+) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb create mode 100644 easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg create mode 100644 easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb create mode 100644 easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb create mode 100644 easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb new file mode 100644 index 0000000000..c688556f3b --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +# Put --enable-openmp back when Clang supports OpenMP. +common_configopts = "--with-pic" + +# No quad precision +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', 'f', 'f_mpi', 'l', 'l_mpi']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg b/easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg new file mode 100644 index 0000000000..c3d42043e2 --- /dev/null +++ b/easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg @@ -0,0 +1,25 @@ +easyblock = "Toolchain" + +name = 'gmpich2' +version = '3.0.4' + +homepage = '(none)' +description = """gcc and GFortran based compiler toolchain, + including MPICH2 for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.8.1' +comp = '%s-%s' % (compname, compver) + +mpilib = 'MPICH2' +mpiver = '3.0.4' + +# compiler toolchain depencies +dependencies = [ + (compname, compver), + (mpilib, mpiver, '-%s' % comp), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb new file mode 100644 index 0000000000..4b9be5f436 --- /dev/null +++ b/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb @@ -0,0 +1,37 @@ +easyblock = "Toolchain" + +name = 'gmpolf' +version = '1.4.8' + +homepage = '(none)' +description = """gcc and GFortran based compiler toolchain, + MPICH for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp_name = 'GCC' +comp_version = '4.8.1' +comp = "%s-%s" % (comp_name, comp_version) + +blaslib = 'OpenBLAS' +blasver = '0.2.6' +blas = '%s-%s' % (blaslib, blasver) +blassuff = 'LAPACK-3.4.2' + +# toolchain used to build dependencies +comp_mpi_tc_name = 'gmpich2' +comp_mpi_tc_ver = "%s" % '3.0.4' +comp_mpi_tc = "%s-%s" % (comp_mpi_tc_name, comp_mpi_tc_ver) + +# Compiler toolchain dependencies +# We need ClangGCC and MPICH as explicit dependencies instead of cgmpich toolchain +# because of toolchain definition being verified against list of modules. +dependencies = [ + (comp_name, comp_version), + ('MPICH2', '3.0.4-%s' % comp), # + (blaslib, blasver, '-%s-%s' % (comp_mpi_tc, blassuff)), + ('FFTW', '3.3.3', "-%s" % comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s-%s-%s' % (comp_mpi_tc, blas, blassuff)), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb new file mode 100644 index 0000000000..35196b60c2 --- /dev/null +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb @@ -0,0 +1,15 @@ +name = 'LAPACK' +version = "3.4.2" + +homepage = 'http://www.netlib.org/lapack/' +description = """LAPACK is written in Fortran90 and provides routines for solving systems of + simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue + problems, and singular value problems.""" + +toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchainopts = {'pic': True} + +sources = ['%s-%s.tgz' % (name.lower(), version)] +source_urls = [homepage] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb new file mode 100644 index 0000000000..521ce4aec1 --- /dev/null +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb @@ -0,0 +1,23 @@ +name = 'MPICH2' +version = '3.0.4' + +homepage = 'http://www.mpich.org/' +description = """MPICH v3.x is an open source high-performance MPI 3.0 implementation. +It does not support InfiniBand (use MVAPICH2 with InfiniBand devices).""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +sources = ['mpich-3.0.4.tar.gz'] +source_urls = ['http://www.mpich.org/static/tarballs/%s' % version] + +# MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS. +preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; ' + +sanity_check_paths = { + 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', + 'bin/mpiexec', 'bin/mpirun', + 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], + 'dirs': [], +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..e340334b6f --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb @@ -0,0 +1,51 @@ +name = 'OpenBLAS' +version = '0.2.6' + +lapackver = '3.4.2' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'gmpich2', 'version': '3.0.4'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..1f6d9377e2 --- /dev/null +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -0,0 +1,25 @@ +name = 'ScaLAPACK' +version = '2.0.2' + +homepage = 'http://www.netlib.org/scalapack/' +description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines +redesigned for distributed memory MIMD parallel computers.""" + +toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchainopts = {'pic': True} + +source_urls = [homepage] +sources = ['%(namelower)s-%(version)s.tgz'] + +blaslib = 'OpenBLAS' +blasver = '0.2.6' +blassuff = '-LAPACK-3.4.2' + +versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff) + +dependencies = [(blaslib, blasver, blassuff)] + +## parallel build tends to fail, so disabling it +parallel = 1 + +moduleclass = 'numlib' -- GitLab From 4775e5ec6c6fe9acdb7322e9e666d21fca45e6f4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 10 Oct 2013 17:58:40 +0200 Subject: [PATCH 102/811] drop incorrect patch file spec --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index 6584a717f5..6c090df7b7 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -13,7 +13,6 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ - 'PSI-4.0b5-mpi.patch', 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', -- GitLab From 3f0b55d703f35b47d725c44f5df878dfe62c36e4 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 10 Oct 2013 18:10:10 +0200 Subject: [PATCH 103/811] PSI: add MPI patch to 4.0b5 --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index 6c090df7b7..b3815a9d70 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -13,6 +13,7 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ + 'PSI-4.0b4-mpi.patch', 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', -- GitLab From d86b963967f12eb712f0e618e847bba13a4dde29 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 10 Oct 2013 18:24:23 +0200 Subject: [PATCH 104/811] align PSI easyconfigs, correct filename of -mt PSI goalf easyconfig, add mpi PSI goalf easyconfig --- .../PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb | 31 +++++++++++++++++++ .../p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb | 4 +-- .../p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb new file mode 100644 index 0000000000..baeac81b77 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb @@ -0,0 +1,31 @@ +name = 'PSI' +version = '4.0b5' +versionsuffix = '-mt' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +# not using MPI results in a build relying on multithreaded BLAS solely +toolchainopts = {'usempi': False} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-thread-pool.patch', + 'PSI-4.0b5-new-plugin.patch', +] + +python = 'Python' +pyver = '2.7.5' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb index 0bc53b7daa..99696fe235 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb @@ -7,13 +7,13 @@ efficient, high-accuracy simulations of a variety of molecular properties. We ca computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} -# not using MPI results in a build relying on multithreaded BLAS solely -toolchainopts = {'usempi': False} +toolchainopts = {'usempi': True} source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ + 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb index 1d70869b4d..33a7817cd8 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb @@ -16,8 +16,8 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit - 'PSI-4.0b5-new-plugin.patch', 'PSI-4.0b5-thread-pool.patch', + 'PSI-4.0b5-new-plugin.patch', ] python = 'Python' -- GitLab From c91f48034093b39ffd9ca8b0d25d0a16cb4e998a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 10 Oct 2013 21:44:20 +0200 Subject: [PATCH 105/811] complete mpi patch file for PSI-4.0b5 --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch index 3c6eb421fb..f4f30827c5 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch @@ -51,3 +51,13 @@ diff -ur psi4.0b5.orig/src/lib/libparallel/mpi_wrapper.h psi4.0b5/src/lib/libpar delete[] receive_buffer; \ } \ } +--- psi4.0b5/src/lib/libmints/wavefunction.h.orig 2013-10-10 21:41:48.177679312 +0200 ++++ psi4.0b5/src/lib/libmints/wavefunction.h 2013-10-10 21:41:37.884807311 +0200 +@@ -28,7 +28,6 @@ + + #include "typedefs.h" + #include ++#include + + #define MAX_IOFF 30000 + extern size_t ioff[MAX_IOFF]; -- GitLab From fc17d5f9ca76448dad130ce170965703891be294 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 10 Oct 2013 21:55:28 +0200 Subject: [PATCH 106/811] fix typo in patch file --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch index f4f30827c5..04829caed6 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch @@ -53,7 +53,7 @@ diff -ur psi4.0b5.orig/src/lib/libparallel/mpi_wrapper.h psi4.0b5/src/lib/libpar } --- psi4.0b5/src/lib/libmints/wavefunction.h.orig 2013-10-10 21:41:48.177679312 +0200 +++ psi4.0b5/src/lib/libmints/wavefunction.h 2013-10-10 21:41:37.884807311 +0200 -@@ -28,7 +28,6 @@ +@@ -28,6 +28,7 @@ #include "typedefs.h" #include -- GitLab From ae62f61cea0178ba1177eb07014dde03ac6da157 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 10 Oct 2013 22:01:46 +0200 Subject: [PATCH 107/811] really fix typo in patch file --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch index 04829caed6..cc73c4ea53 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-mpi-memcpy.patch @@ -53,7 +53,7 @@ diff -ur psi4.0b5.orig/src/lib/libparallel/mpi_wrapper.h psi4.0b5/src/lib/libpar } --- psi4.0b5/src/lib/libmints/wavefunction.h.orig 2013-10-10 21:41:48.177679312 +0200 +++ psi4.0b5/src/lib/libmints/wavefunction.h 2013-10-10 21:41:37.884807311 +0200 -@@ -28,6 +28,7 @@ +@@ -28,7 +28,8 @@ #include "typedefs.h" #include -- GitLab From e1b2780fd92588116cc41b6d364a59fc8d2fc204 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 10 Oct 2013 22:18:35 +0200 Subject: [PATCH 108/811] remove respecifying default max_fail_ratio of 0.5 in NWChem easyconfig --- .../NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb | 3 --- 1 file changed, 3 deletions(-) diff --git a/easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb b/easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb index e6559b246d..c49f66d3b2 100644 --- a/easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb @@ -25,7 +25,4 @@ dependencies = [(python, pyver)] modules = 'all python' -# 12/43 tests fail (exit code 1), so needs to bump up the max fail ratio -max_fail_ratio = 0.5 - moduleclass = 'chem' -- GitLab From a3f01e8dcc4cc6fc058841571e3c6562d364886c Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 11 Oct 2013 09:57:20 +0200 Subject: [PATCH 109/811] PSI: avoid duplicate patch --- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index b3815a9d70..6c090df7b7 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -13,7 +13,6 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ - 'PSI-4.0b4-mpi.patch', 'PSI-4.0b5-mpi-memcpy.patch', 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', -- GitLab From 380c88a51ab4632027a68defb2bbf73b37ffef1a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 11 Oct 2013 22:06:25 +0200 Subject: [PATCH 110/811] correct version to v1.8.1.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index db883e435c..c236722f3a 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.9.0.0dev" +VERSION = "1.8.1.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 600686afa6670e316c2772de4ca10bfc4b607f2d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 13 Oct 2013 21:05:13 +0200 Subject: [PATCH 111/811] bump version to v1.8.1.0, update release notes --- RELEASE_NOTES | 12 +++++++++++- setup.py | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 112abdf7e6..fc1eee4a12 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,9 +1,19 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 1,699 easyconfig files, for 338 different software packages +The latest version of easybuild-easyconfig provides 1,710 easyconfig files, for 338 different software packages and 25 different (compiler) toolchains. +v1.8.1.0 (October 14th 2013) +---------------------------- + +bugfix release +- added additional easyconfigs for various software packages (#457): + - Boost, bzip2, libreadline, ncurses, PSI, Python, zlib +- various bug fixes, including: + - fix faulty easyconfig file names for XML-LibXML and YAML-Syck (#459) + - stop (re)specyfing default maximum ratio for failed tests in NWChem easyconfig (#457) + v1.8.0.0 (October 4th 2013) --------------------------- diff --git a/setup.py b/setup.py index c236722f3a..4e7903516e 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.8.1.0dev" +VERSION = "1.8.1.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 06ddf2c9f87b8f8f8d3b135388a81fdd5d34c492 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 14 Oct 2013 11:35:54 +0200 Subject: [PATCH 112/811] fix easyconfig file names w.r.t version suffixes --- ...oalf-1.1.0.eb => HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb} | 0 .../m/MUSCLE/{MUSCLE-3.8.31.eb => MUSCLE-3.8.31-i86linux64.eb} | 0 ...goolf-1.4.10.eb => YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb} | 0 ...ictce-4.1.13.eb => YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/h/HPCBIOS_Math/{HPCBIOS_Math-20130829-goalf-1.1.0.eb => HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb} (100%) rename easybuild/easyconfigs/m/MUSCLE/{MUSCLE-3.8.31.eb => MUSCLE-3.8.31-i86linux64.eb} (100%) rename easybuild/easyconfigs/y/YAML-Syck/{YAML-Syck-1.27-goolf-1.4.10.eb => YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb} (100%) rename easybuild/easyconfigs/y/YAML-Syck/{YAML-Syck-1.27-ictce-4.1.13.eb => YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb} (100%) diff --git a/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0.eb b/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb similarity index 100% rename from easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0.eb rename to easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb diff --git a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31.eb b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-i86linux64.eb similarity index 100% rename from easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31.eb rename to easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-i86linux64.eb diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb similarity index 100% rename from easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10.eb rename to easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb similarity index 100% rename from easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13.eb rename to easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb -- GitLab From ac1f345ebbe6de81be2b19c54e6fb2c5d75364d5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 14 Oct 2013 11:38:06 +0200 Subject: [PATCH 113/811] add PR #462 to release notes, fix typo --- RELEASE_NOTES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index fc1eee4a12..3138395dd4 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -11,8 +11,8 @@ bugfix release - added additional easyconfigs for various software packages (#457): - Boost, bzip2, libreadline, ncurses, PSI, Python, zlib - various bug fixes, including: - - fix faulty easyconfig file names for XML-LibXML and YAML-Syck (#459) - - stop (re)specyfing default maximum ratio for failed tests in NWChem easyconfig (#457) + - fix faulty easyconfig file names for HPCBIOS_Math, MUSCLE, XML-LibXML and YAML-Syck (#459, #462) + - stop (re)specifying default maximum ratio for failed tests in NWChem easyconfig (#457) v1.8.0.0 (October 4th 2013) --------------------------- -- GitLab From c9feb0b047990c0d7e801af36364dda8422b6754 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 14 Oct 2013 11:46:54 +0200 Subject: [PATCH 114/811] bump version to 1.9.0.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4e7903516e..db883e435c 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.8.1.0" +VERSION = "1.9.0.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From b814db22713d4231002af1c435e4b73b1b4a2641 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 14 Oct 2013 16:37:24 +0200 Subject: [PATCH 115/811] add easyconfigs for EasyBuild v1.8.x --- .../e/EasyBuild/EasyBuild-1.8.0.eb | 29 +++++++++++++++++++ .../e/EasyBuild/EasyBuild-1.8.1.eb | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb create mode 100644 easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb new file mode 100644 index 0000000000..4474ca43e8 --- /dev/null +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb @@ -0,0 +1,29 @@ +easyblock = 'EB_EasyBuildMeta' + +name = 'EasyBuild' +version = '1.8.0' + +homepage = 'http://hpcugent.github.com/easybuild/' +description = """EasyBuild is a software build and installation framework + written in Python that allows you to install software in a structured, +repeatable and robust way.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://pypi.python.org/packages/source/e/easybuild-framework/', + 'http://pypi.python.org/packages/source/e/easybuild-easyblocks/', + 'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/', +] +# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?) +sources = [ + 'easybuild-framework-%(version)s.tar.gz', + 'easybuild-easyblocks-%(version)s.tar.gz', + 'easybuild-easyconfigs-%(version)s.0.tar.gz', +] + +# EasyBuild is a (set of) Python packages, so it depends on Python +# usually, we want to use the system Python, so no actual Python dependency is listed +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb new file mode 100644 index 0000000000..59a2b57db8 --- /dev/null +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb @@ -0,0 +1,29 @@ +easyblock = 'EB_EasyBuildMeta' + +name = 'EasyBuild' +version = '1.8.1' + +homepage = 'http://hpcugent.github.com/easybuild/' +description = """EasyBuild is a software build and installation framework + written in Python that allows you to install software in a structured, +repeatable and robust way.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://pypi.python.org/packages/source/e/easybuild-framework/', + 'http://pypi.python.org/packages/source/e/easybuild-easyblocks/', + 'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/', +] +# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?) +sources = [ + 'easybuild-framework-%(version)s.tar.gz', + 'easybuild-easyblocks-%(version)s.tar.gz', + 'easybuild-easyconfigs-%(version)s.0.tar.gz', +] + +# EasyBuild is a (set of) Python packages, so it depends on Python +# usually, we want to use the system Python, so no actual Python dependency is listed +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] + +moduleclass = 'tools' -- GitLab From a4bb27bc7e890ac3ebb16a5efcdb0093eaefd30e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 15 Oct 2013 22:16:08 +0200 Subject: [PATCH 116/811] rebase gmpich easyconfig for FFTW 3.3.3 on gmvapich easyconfig (rather than one for a Clang-based toolchain) --- .../easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb index c688556f3b..c93ef1d71b 100644 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb @@ -11,21 +11,21 @@ toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] source_urls = [homepage] -# Put --enable-openmp back when Clang supports OpenMP. -common_configopts = "--with-pic" +common_configopts = "--enable-openmp --with-pic" -# No quad precision configopts = [ common_configopts + " --enable-single --enable-sse2 --enable-mpi", common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", common_configopts + " --enable-sse2 --enable-mpi", # default as last ] sanity_check_paths = { - 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom']] + + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + - ['lib/libfftw3%s.a' % x for x in ['', '_mpi', 'f', 'f_mpi', 'l', 'l_mpi']], + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], 'dirs': ['lib/pkgconfig'], } -- GitLab From 9384e92dfb4fa8435a26f55b433f29d6fa85152e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 15 Oct 2013 23:06:13 +0200 Subject: [PATCH 117/811] align gmpich2 and gmpolf toolchain versions, fix dependency specifications in toolchain easyconfigs --- ...h2-3.0.4.eb => FFTW-3.3.3-gmpich2-1.4.8.eb} | 2 +- .../{gmpich2-3.0.4.eg => gmpich2-1.4.8.eb} | 8 ++++---- easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb | 18 +++++++++--------- .../l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb | 2 +- ...enBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb} | 2 +- ...pich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb} | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) rename easybuild/easyconfigs/f/FFTW/{FFTW-3.3.3-gmpich2-3.0.4.eb => FFTW-3.3.3-gmpich2-1.4.8.eb} (95%) rename easybuild/easyconfigs/g/gmpich2/{gmpich2-3.0.4.eg => gmpich2-1.4.8.eb} (75%) rename easybuild/easyconfigs/o/OpenBLAS/{OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb => OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb} (96%) rename easybuild/easyconfigs/s/ScaLAPACK/{ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb => ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb} (92%) diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-1.4.8.eb similarity index 95% rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb rename to easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-1.4.8.eb index c93ef1d71b..260a090f9c 100644 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-3.0.4.eb +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich2-1.4.8.eb @@ -5,7 +5,7 @@ homepage = 'http://www.fftw.org' description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data.""" -toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchain = {'name': 'gmpich2', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg b/easybuild/easyconfigs/g/gmpich2/gmpich2-1.4.8.eb similarity index 75% rename from easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg rename to easybuild/easyconfigs/g/gmpich2/gmpich2-1.4.8.eb index c3d42043e2..7aaac2970c 100644 --- a/easybuild/easyconfigs/g/gmpich2/gmpich2-3.0.4.eg +++ b/easybuild/easyconfigs/g/gmpich2/gmpich2-1.4.8.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'gmpich2' -version = '3.0.4' +version = '1.4.8' homepage = '(none)' description = """gcc and GFortran based compiler toolchain, @@ -11,15 +11,15 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} compname = 'GCC' compver = '4.8.1' -comp = '%s-%s' % (compname, compver) +comp = (compname, compver) mpilib = 'MPICH2' mpiver = '3.0.4' # compiler toolchain depencies dependencies = [ - (compname, compver), - (mpilib, mpiver, '-%s' % comp), + comp, + (mpilib, mpiver, '', comp), ] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb index 4b9be5f436..f5fc67132e 100644 --- a/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb @@ -11,27 +11,27 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} comp_name = 'GCC' comp_version = '4.8.1' -comp = "%s-%s" % (comp_name, comp_version) +comp = (comp_name, comp_version) blaslib = 'OpenBLAS' blasver = '0.2.6' blas = '%s-%s' % (blaslib, blasver) -blassuff = 'LAPACK-3.4.2' +blassuff = '-LAPACK-3.4.2' # toolchain used to build dependencies comp_mpi_tc_name = 'gmpich2' -comp_mpi_tc_ver = "%s" % '3.0.4' -comp_mpi_tc = "%s-%s" % (comp_mpi_tc_name, comp_mpi_tc_ver) +comp_mpi_tc_ver = version +comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) # Compiler toolchain dependencies # We need ClangGCC and MPICH as explicit dependencies instead of cgmpich toolchain # because of toolchain definition being verified against list of modules. dependencies = [ - (comp_name, comp_version), - ('MPICH2', '3.0.4-%s' % comp), # - (blaslib, blasver, '-%s-%s' % (comp_mpi_tc, blassuff)), - ('FFTW', '3.3.3', "-%s" % comp_mpi_tc), - ('ScaLAPACK', '2.0.2', '-%s-%s-%s' % (comp_mpi_tc, blas, blassuff)), + comp, + ('MPICH2', '3.0.4', '', comp), # part of gmpich2 toolchain + (blaslib, blasver, blassuff, comp_mpi_tc), + ('FFTW', '3.3.3', '', comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), ] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb index 35196b60c2..8170725a1c 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb @@ -6,7 +6,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue problems, and singular value problems.""" -toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchain = {'name': 'gmpich2', 'version': '1.4.8'} toolchainopts = {'pic': True} sources = ['%s-%s.tgz' % (name.lower(), version)] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb similarity index 96% rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb rename to easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb index e340334b6f..b181e103bb 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-3.0.4-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb @@ -7,7 +7,7 @@ versionsuffix = '-LAPACK-%s' % lapackver homepage = 'http://xianyi.github.com/OpenBLAS/' description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" -toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchain = {'name': 'gmpich2', 'version': '1.4.8'} lapack_src = 'lapack-%s.tgz' % lapackver large_src = 'large.tgz' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb similarity index 92% rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb rename to easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index 1f6d9377e2..5b744a280f 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-3.0.4-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -5,7 +5,7 @@ homepage = 'http://www.netlib.org/scalapack/' description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines redesigned for distributed memory MIMD parallel computers.""" -toolchain = {'name': 'gmpich2', 'version': '3.0.4'} +toolchain = {'name': 'gmpich2', 'version': '1.4.8'} toolchainopts = {'pic': True} source_urls = [homepage] -- GitLab From 6fd3a5d453132c848231e8d983a69ebd9737d00e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 15 Oct 2013 23:19:18 +0200 Subject: [PATCH 118/811] fix final remarks --- .../easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb | 2 +- easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb | 7 +++---- .../OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb index 8170725a1c..c68bfa3e9c 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gmpich2', 'version': '1.4.8'} toolchainopts = {'pic': True} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = ['%(namelower)s-%(version)s.tgz'] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb index 521ce4aec1..d6b58fa6d4 100644 --- a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb @@ -7,16 +7,15 @@ It does not support InfiniBand (use MVAPICH2 with InfiniBand devices).""" toolchain = {'name': 'GCC', 'version': '4.8.1'} -sources = ['mpich-3.0.4.tar.gz'] -source_urls = ['http://www.mpich.org/static/tarballs/%s' % version] +sources = ['mpich-%(version)s.tar.gz'] +source_urls = ['http://www.mpich.org/static/tarballs/%(version)s'] # MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS. preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; ' sanity_check_paths = { 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', - 'bin/mpiexec', 'bin/mpirun', - 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], + 'bin/mpiexec', 'bin/mpirun', 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], 'dirs': [], } diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb index b181e103bb..34e641ad21 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich2-1.4.8-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), -- GitLab From 7fa61c02ff5145cefe5085b9129022e814319352 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 16 Oct 2013 11:50:27 +0200 Subject: [PATCH 119/811] add gzip easyconfig for gmpolf toolchain, clean up comments in gmpolf toolchain --- .../easyconfigs/g/gmpolf/gmpolf-1.4.8.eb | 4 +-- .../g/gzip/gzip-1.5-gmpolf-1.4.8.eb | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb diff --git a/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb index f5fc67132e..dc21b726a3 100644 --- a/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb @@ -23,9 +23,7 @@ comp_mpi_tc_name = 'gmpich2' comp_mpi_tc_ver = version comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) -# Compiler toolchain dependencies -# We need ClangGCC and MPICH as explicit dependencies instead of cgmpich toolchain -# because of toolchain definition being verified against list of modules. +# compiler toolchain dependencies dependencies = [ comp, ('MPICH2', '3.0.4', '', comp), # part of gmpich2 toolchain diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..ab8b1bc75e --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC +# Authors:: Thekla Loizou +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html +## + +name = 'gzip' +version = '1.5' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz +source_urls = ['http://ftpmirror.gnu.org/gzip'] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' -- GitLab From 90981c5fed51862304f9eb2cca8049a20b54cd00 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 16 Oct 2013 14:16:51 +0200 Subject: [PATCH 120/811] add (ported) easyconfigs for picard and GATK + Java update --- .../GenomeAnalysisTK-1.0.5083.eb | 17 +++++++++++++++++ .../GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb | 17 +++++++++++++++++ easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb | 15 +++++++++++++++ easybuild/easyconfigs/p/picard/picard-1.100.eb | 14 ++++++++++++++ easybuild/easyconfigs/p/picard/picard-1.39.eb | 14 ++++++++++++++ 5 files changed, 77 insertions(+) create mode 100644 easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb create mode 100644 easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb create mode 100644 easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb create mode 100644 easybuild/easyconfigs/p/picard/picard-1.100.eb create mode 100644 easybuild/easyconfigs/p/picard/picard-1.39.eb diff --git a/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb new file mode 100644 index 0000000000..4c621fce8f --- /dev/null +++ b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb @@ -0,0 +1,17 @@ +name = 'GenomeAnalysisTK' +version = '1.0.5083' + +homepage = 'http://www.broadinstitute.org/gsa/wiki/index.php/The_Genome_Analysis_Toolkit' +description = """The GATK is a structured software library that makes writing efficient analysis tools + using next-generation sequencing data very easy, and second it's a suite of tools for working with human + medical resequencing projects such as 1000 Genomes and The Cancer Genome Atlas. These tools include things + like a depth of coverage analyzers, a quality score recalibrator, a SNP/indel caller and a local realigner.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# download via http://www.broadinstitute.org/gatk/download (requires registration) +sources = [SOURCE_TAR_BZ2] + +dependencies = [('Java', '1.7.0_40')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb new file mode 100644 index 0000000000..4e2b834782 --- /dev/null +++ b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb @@ -0,0 +1,17 @@ +name = 'GenomeAnalysisTK' +version = '2.7-4' + +homepage = 'http://www.broadinstitute.org/gsa/wiki/index.php/The_Genome_Analysis_Toolkit' +description = """The GATK is a structured software library that makes writing efficient analysis tools + using next-generation sequencing data very easy, and second it's a suite of tools for working with human + medical resequencing projects such as 1000 Genomes and The Cancer Genome Atlas. These tools include things + like a depth of coverage analyzers, a quality score recalibrator, a SNP/indel caller and a local realigner.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# download via http://www.broadinstitute.org/gatk/download (requires registration) +sources = [SOURCE_TAR_BZ2] + +dependencies = [('Java', '1.7.0_40')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb new file mode 100644 index 0000000000..a5fd350c4b --- /dev/null +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb @@ -0,0 +1,15 @@ +name = 'Java' +version = '1.7.0_40' + +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'} + +## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +(vp, vs) = version.split('_') +altver = '%su%s' % (vp.split('.')[1], vs) +sources = ['jdk-%s-linux-x64.tar.gz' % altver] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/picard/picard-1.100.eb b/easybuild/easyconfigs/p/picard/picard-1.100.eb new file mode 100644 index 0000000000..290abd2ffb --- /dev/null +++ b/easybuild/easyconfigs/p/picard/picard-1.100.eb @@ -0,0 +1,14 @@ +name = 'picard' +version = '1.100' + +homepage = 'http://sourceforge.net/projects/picard' +description = """A set of tools (in Java) for working with next generation sequencing data in the BAM format.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%(name)s-tools-%(version)s.zip'] + +dependencies = [('Java', '1.7.0_40')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/p/picard/picard-1.39.eb b/easybuild/easyconfigs/p/picard/picard-1.39.eb new file mode 100644 index 0000000000..28de787dec --- /dev/null +++ b/easybuild/easyconfigs/p/picard/picard-1.39.eb @@ -0,0 +1,14 @@ +name = 'picard' +version = '1.39' + +homepage = 'http://sourceforge.net/projects/picard' +description = """A set of tools (in Java) for working with next generation sequencing data in the BAM format.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%(name)s-tools-%(version)s.zip'] + +dependencies = [('Java', '1.7.0_40')] + +moduleclass = 'bio' -- GitLab From 64b9e2714b788fe07b5773ff255d02ea7d319a33 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 16 Oct 2013 14:22:01 +0200 Subject: [PATCH 121/811] add easyconfigs for Allinea tools --- .../Allinea-4.1-32834-Redhat-5.7-x86_64.eb | 17 +++++++++++++++++ .../Allinea-4.1-32834-Redhat-6.0-x86_64.eb | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb create mode 100644 easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb diff --git a/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb new file mode 100644 index 0000000000..83146cb739 --- /dev/null +++ b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb @@ -0,0 +1,17 @@ +name = 'Allinea' +version = '4.1-32834-Redhat-5.7-x86_64' + +homepage = 'http://www.allinea.com' +description = """The Allinea environment is an essential toolkit for developers and computational scientists +looking to get results faster.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = ['http://content.allinea.com/downloads/'] +sources = ['%(namelower)s-tools-%(version)s.tar'] + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb new file mode 100644 index 0000000000..bcfffae599 --- /dev/null +++ b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb @@ -0,0 +1,17 @@ +name = 'Allinea' +version = '4.1-32834-Redhat-6.0-x86_64' + +homepage = 'http://www.allinea.com' +description = """The Allinea environment is an essential toolkit for developers and computational scientists +looking to get results faster.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = ['http://content.allinea.com/downloads/'] +sources = ['%(namelower)s-tools-%(version)s.tar'] + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'tools' -- GitLab From 774e8f3b382787805992580dd8e5ea0f7253e5c7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 16 Oct 2013 14:58:05 +0200 Subject: [PATCH 122/811] add easyconfigs for new versions of FSL and fmri + dependencies --- .../f/FSL/FSL-5.0.4-ictce-5.3.0.eb | 26 +++++++++++++++++ .../f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb | 29 +++++++++++++++++++ .../f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb | 17 +++++++++++ .../t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb | 19 ++++++++++++ .../easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb | 19 ++++++++++++ 5 files changed, 110 insertions(+) create mode 100644 easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb create mode 100644 easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..295efc5d97 --- /dev/null +++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb @@ -0,0 +1,26 @@ +name = 'FSL' +version = '5.0.4' + +homepage = 'http://www.fmrib.ox.ac.uk/fsl/' +description = """FSL is a comprehensive library of analysis tools for FMRI, MRI and DTI brain imaging data.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ["http://www.fmrib.ox.ac.uk/fsldownloads/"] +sources = ['%(namelower)s-%(version)s-sources.tar.gz'] + +patches = [ + 'FSL-%(version)s_makefile_fixes.patch', + 'FSL-%(version)s_ictce-wd803.patch', + 'FSL_icc_nan-inf_fix.patch', +] + +dependencies = [ + ('freeglut', '2.8.1'), + ('expat', '2.1.0'), +] + +# libX11-devel is required for X11/Xlib.h, required by tk build +osdependencies = ['libX11-devel'] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb b/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb new file mode 100644 index 0000000000..f685ae9e45 --- /dev/null +++ b/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb @@ -0,0 +1,29 @@ +easyblock = 'RPackage' + +name = 'fmri' +version = '1.5-0' + +homepage = 'http://cran.r-project.org/web/packages/fmri' +description = """The package contains R-functions to perform an fmri analysis as described in K. Tabelow, + J. Polzehl, H.U. Voss, and V. Spokoiny, Analysing fMRI experiments with structure adaptive smoothing procedures, + NeuroImage, 33:55-62 (2006) and J. Polzehl, H.U. Voss, K. Tabelow, Structural adaptive segmentation for statistical + parametric mapping, NeuroImage, 52:515-523 (2010).""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://cran.r-project.org/src/contrib/'] +sources = ['%s_%s.tar.gz' % (name, version)] + +r = 'R' +rver = '2.15.3' +versionsuffix = '-%s-%s' % (r, rver) + +tcltkver = '8.5.15' + +dependencies = [ + (r, rver), + ('Tcl', tcltkver), + ('Tk', tcltkver), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..e473bccccb --- /dev/null +++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'freeglut' +version = '2.8.1' + +homepage = 'http://freeglut.sourceforge.net/' +description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(name)s'] + +sanity_check_paths = { + 'files': ['lib/libglut.a', 'lib/libglut.so'], + 'dirs': ['include/GL'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb new file mode 100644 index 0000000000..808b442937 --- /dev/null +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'Tcl' +version = '8.5.15' + +homepage = 'http://www.tcl.tk/' +description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, +suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ["http://prdownloads.sourceforge.net/tcl"] +sources = ['%s%s-src.tar.gz' % (name.lower(), version)] + +configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' + +runtest = 'test' + +start_dir = 'unix' + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb new file mode 100644 index 0000000000..fb3f5af8c8 --- /dev/null +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'Tk' +version = '8.5.15' + +homepage = 'http://www.tcl.tk/' +description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for building + a graphical user interface (GUI) in many different programming languages.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ["http://prdownloads.sourceforge.net/tcl"] +sources = ['%s%s-src.tar.gz' % (name.lower(), version)] + +dependencies = [('Tcl', version)] + +configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"' + +start_dir = 'unix' + +moduleclass = 'vis' -- GitLab From 455f5da3177fb19ed5e0e762c477702d52e01357 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 16 Oct 2013 18:08:30 +0200 Subject: [PATCH 123/811] added new orca + dependencies --- .../a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb | 20 +++++++++++ .../libpciaccess-0.13.1-GCC-4.7.2.eb | 23 +++++++++++++ .../ORCA-3_0_0-linux_x86-64_openmpi_165.eb | 31 +++++++++++++++++ .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 34 +++++++++++++++++++ .../xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb | 21 ++++++++++++ 5 files changed, 129 insertions(+) create mode 100755 easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb create mode 100755 easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb create mode 100644 easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb create mode 100755 easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb new file mode 100755 index 0000000000..e7f48d52a0 --- /dev/null +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb @@ -0,0 +1,20 @@ +name = 'Autoconf' +version = '2.69' + +homepage = 'http://www.gnu.org/software/autoconf/' +description = """Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" + +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb new file mode 100755 index 0000000000..57b19f2a34 --- /dev/null +++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb @@ -0,0 +1,23 @@ +name = 'libpciaccess' +version = '0.13.1' + +homepage = 'http://cgit.freedesktop.org/xorg/lib/libpciaccess/' +description = """Generic PCI access library.""" + +source_urls = ['http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot'] +sources = [SOURCE_TAR_GZ] +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && " + +sanity_check_paths = { + 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], + 'dirs': ['lib/pkgconfig'] + } + +builddependencies = [ + ('Autoconf', '2.69'), + ('xorg-macros', '1.17') + ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb new file mode 100644 index 0000000000..2045717dff --- /dev/null +++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb @@ -0,0 +1,31 @@ +easyblock = "PackedBinary" + +name = "ORCA" +version = '3_0_0-linux_x86-64_openmpi_165' + +homepage = 'http://www.thch.uni-bonn.de/tc/orca/' +description = """ORCA is a flexible, efficient and easy-to-use general purpose tool for quantum chemistry + with specific emphasis on spectroscopic properties of open-shell molecules. + It features a wide variety of standard quantum chemical methods ranging from semiempirical methods to DFT to single- + and multireference correlated ab initio methods. + It can also treat environmental and relativistic effects.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} +dependencies = [('OpenMPI', '1.6.5', '-GCC-4.7.2')] + +sources = ['%s_%s_%s.tbz' % (name.lower(), version.split('-')[0], "-".join(version.split('-')[1:]))] + +sanity_check_paths = { + 'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf', + 'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc', + 'rocis', 'scf', 'scfgrad', 'soc'] + for y in ["", "_mpi"]] + \ + ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib', + 'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc', + 'md', 'mergefrag', 'ndoint', 'numfreq', 'plot', + 'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \ + ['orca', 'otool_cosmo'], + 'dirs': [] + } + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb new file mode 100644 index 0000000000..6f15d2ee54 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -0,0 +1,34 @@ +name = 'OpenMPI' +version = '1.6.5' + +homepage = 'http://www.open-mpi.org/' +description = "The Open MPI Project is an open source MPI-2 implementation." + +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] + +dependencies = [ + ('hwloc', '1.6.2'), + ('libpciaccess', '0.13.1'), +] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support +configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading + +# needed for --with-openib +osdependencies = ['libibverbs-devel'] + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.so" % (libfile) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", + "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"] +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb new file mode 100755 index 0000000000..2f94a14774 --- /dev/null +++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb @@ -0,0 +1,21 @@ +name = 'xorg-macros' +version = '1.17' + +homepage = 'http://cgit.freedesktop.org/xorg/util/macros' +description = """X.org macros utilities.""" + +source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! +sources = ['util-macros-%s.tar.gz' % version] + +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +preconfigopts = './autogen.sh && ' + +sanity_check_paths = { + 'files': ['share/pkgconfig/xorg-macros.pc'], + 'dirs': [] + } + +dependencies = [('Autoconf', '2.69')] + +moduleclass = 'devel' -- GitLab From 8381a2483086e32debc51f1b4dd84de97d885026 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 18 Oct 2013 14:17:54 +0200 Subject: [PATCH 124/811] port thread pool patch to PSI 4.0b4, and use it to fix 'hanging' tests --- .../p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb | 5 +- .../p/PSI/PSI-4.0b4-ictce-4.1.13.eb | 5 +- .../p/PSI/PSI-4.0b4-thread-pool.patch | 73 +++++++++++++++++++ 3 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b4-thread-pool.patch diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb index a65e030fdc..257d8f97ad 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb @@ -14,7 +14,10 @@ toolchainopts = {'usempi': False} source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] -patches = ['PSI-4.0b4-mpi.patch'] +patches = [ + 'PSI-4.0b4-mpi.patch', + 'PSI-4.0b4-thread-pool.patch', +] python = 'Python' pyver = '2.7.3' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb index bf153e7282..78a59d7159 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb @@ -12,7 +12,10 @@ toolchainopts = {'usempi': True} source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] -patches = ['PSI-4.0b4-mpi.patch'] +patches = [ + 'PSI-4.0b4-mpi.patch', + 'PSI-4.0b4-thread-pool.patch', +] python = 'Python' pyver = '2.7.3' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-thread-pool.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-thread-pool.patch new file mode 100644 index 0000000000..332fbb862f --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-thread-pool.patch @@ -0,0 +1,73 @@ +diff -ur src/bin/detci/tpool.cc src/bin/detci/tpool.cc +--- src/bin/detci/tpool.cc 2013-07-01 23:11:05.000000000 +0200 ++++ src/bin/detci/tpool.cc 2013-09-24 16:00:34.584896769 +0200 +@@ -78,7 +78,7 @@ + tpool->queue_tail = NULL; + tpool->queue_closed = 0; + tpool->shutdown = 0; +- tpool->threads_awake = 0; ++ tpool->threads_awake = num_worker_threads; + if ((rtn = pthread_mutex_init(&(tpool->queue_lock), NULL)) != 0){ + str = "pthread_mutex_init "; + str += strerror(rtn); +@@ -115,7 +115,6 @@ + str += boost::lexical_cast( rtn) ; + throw PsiException(str,__FILE__,__LINE__); + } +- tpool->threads_awake++; + } + + *tpoolp = tpool; +@@ -263,10 +262,22 @@ + } + void tpool_queue_open(tpool_t tpool) + { +- pthread_mutex_lock(&tpool->queue_lock); ++ int rtn; ++ std::string str; ++ ++ if ((rtn = pthread_mutex_lock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_lock "; ++ str += static_cast( &(std::ostringstream() << rtn) )->str(); ++ throw PsiException(str,__FILE__,__LINE__); ++ } ++ + tpool->queue_closed = 0; +- tpool->threads_awake = 0; +- pthread_mutex_unlock(&tpool->queue_lock); ++ ++ if ((rtn = pthread_mutex_unlock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_unlock "; ++ str += static_cast( &(std::ostringstream() << rtn) )->str(); ++ throw PsiException(str,__FILE__,__LINE__); ++ } + } + + void tpool_queue_close(tpool_t tpool, int finish) +@@ -274,7 +285,12 @@ + std::string str; + int rtn; + +- pthread_mutex_lock(&tpool->queue_lock); ++ if ((rtn = pthread_mutex_lock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_lock "; ++ str += static_cast( &(std::ostringstream() << rtn) )->str(); ++ throw PsiException(str,__FILE__,__LINE__); ++ } ++ + tpool->queue_closed = 1; + + if (finish) { +@@ -288,7 +304,11 @@ + + } + +- pthread_mutex_unlock(&tpool->queue_lock); ++ if ((rtn = pthread_mutex_unlock(&(tpool->queue_lock))) != 0){ ++ str = "pthread_mutex_unlock "; ++ str += static_cast( &(std::ostringstream() << rtn) )->str(); ++ throw PsiException(str,__FILE__,__LINE__); ++ } + + } + -- GitLab From 8346c78f1d4cb3b9556f4729196b722d979939e4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 18 Oct 2013 16:21:37 +0200 Subject: [PATCH 125/811] update release notes for EasyBuild v1.8.2 --- RELEASE_NOTES | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 3138395dd4..083b60dbd4 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,6 +4,12 @@ For more detailed information, please see the git log. The latest version of easybuild-easyconfig provides 1,710 easyconfig files, for 338 different software packages and 25 different (compiler) toolchains. +v1.8.2.0 (October 18th 2013) +---------------------------- + +bugfix release +- port thread pool patch to PSI 4.0.b4 and include it to avoid hanging tests (#471) + v1.8.1.0 (October 14th 2013) ---------------------------- diff --git a/setup.py b/setup.py index 4e7903516e..d4a89c0170 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.8.1.0" +VERSION = "1.8.2.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 0729f68e8e06622c7bf533d3ab60f38116092b3e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 18 Oct 2013 16:24:06 +0200 Subject: [PATCH 126/811] fix typo --- RELEASE_NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 083b60dbd4..236075fbe3 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -8,7 +8,7 @@ v1.8.2.0 (October 18th 2013) ---------------------------- bugfix release -- port thread pool patch to PSI 4.0.b4 and include it to avoid hanging tests (#471) +- port thread pool patch to PSI 4.0b4 and include it to avoid hanging tests (#471) v1.8.1.0 (October 14th 2013) ---------------------------- -- GitLab From 95b90c51ff20cb59b2322e50f2f7261f74dbef5d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 19 Oct 2013 23:08:36 +0200 Subject: [PATCH 127/811] add goolf/ictce easyconfigs for PANDAseq --- .../a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb | 23 +++++++++++++++ .../p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb | 28 +++++++++++++++++++ .../p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb | 28 +++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb new file mode 100644 index 0000000000..a41534f1d8 --- /dev/null +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb @@ -0,0 +1,23 @@ +name = 'Autoconf' +version = '2.69' + +homepage = 'http://www.gnu.org/software/autoconf/' +description = """Autoconf is an extensible package of M4 macros that produce shell scripts to automatically + configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like + systems without manual user intervention. Autoconf creates a configuration script for a package from a + template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb new file mode 100644 index 0000000000..d2c97d05e9 --- /dev/null +++ b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb @@ -0,0 +1,28 @@ +name = 'PANDAseq' +version = '2.5' + +homepage = 'https://github.com/neufeld/pandaseq' +description = """PANDAseq assembles Illumina Solexa overlapping pair-end reads.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +# download from https://github.com/neufeld/pandaseq/archive/v2.5.tar.gz +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('libtool', '2.4.2'), + ('bzip2', '1.0.6'), + ('zlib', '1.2.8'), +] + +builddependencies = [('Autoconf', '2.69')] + +preconfigopts = "./autogen.sh &&" + +sanity_check_paths = { + 'files': ['bin/pandaseq', 'bin/pandaseq-checkid', 'bin/pandaseq-hang', 'bin/pandaxs', + 'lib/libpandaseq.so', 'lib/libpandaseq.a', 'lib/pkgconfig/pandaseq-%(version_major)s.pc'], + 'dirs': ['include/pandaseq-%(version_major)s'], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb new file mode 100644 index 0000000000..4071617d72 --- /dev/null +++ b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb @@ -0,0 +1,28 @@ +name = 'PANDAseq' +version = '2.5' + +homepage = 'https://github.com/neufeld/pandaseq' +description = """PANDAseq assembles Illumina Solexa overlapping pair-end reads.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +# download from https://github.com/neufeld/pandaseq/archive/v2.5.tar.gz +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('libtool', '2.4.2'), + ('bzip2', '1.0.6'), + ('zlib', '1.2.8'), +] + +builddependencies = [('Autoconf', '2.69')] + +preconfigopts = "./autogen.sh &&" + +sanity_check_paths = { + 'files': ['bin/pandaseq', 'bin/pandaseq-checkid', 'bin/pandaseq-hang', 'bin/pandaxs', + 'lib/libpandaseq.so', 'lib/libpandaseq.a', 'lib/pkgconfig/pandaseq-%(version_major)s.pc'], + 'dirs': ['include/pandaseq-%(version_major)s'], +} + +moduleclass = 'bio' -- GitLab From 7c62d2a076109e037fa25a0c2a7ffd2d072ed33e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 22 Oct 2013 11:24:20 +0300 Subject: [PATCH 128/811] add components for goolf-1.6.10 Signed-off-by: Fotis Georgatos --- .../a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb | 24 +++++++++ .../a/Automake/Automake-1.14-GCC-4.8.2.eb | 31 +++++++++++ .../f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb | 32 ++++++++++++ easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb | 28 ++++++++++ easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb | 24 +++++++++ easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb | 37 ++++++++++++++ .../h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb | 18 +++++++ .../easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb | 22 ++++++++ ...penBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb | 51 +++++++++++++++++++ .../o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 42 +++++++++++++++ ...ompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb | 25 +++++++++ 11 files changed, 334 insertions(+) create mode 100644 easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb create mode 100644 easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb create mode 100644 easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb new file mode 100644 index 0000000000..8a01ba648a --- /dev/null +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb @@ -0,0 +1,24 @@ +name = 'Autoconf' +version = '2.69' + +homepage = 'http://www.gnu.org/software/autoconf/' +description = """Autoconf is an extensible package of M4 macros that produce shell scripts + to automatically configure software source code packages. These scripts can adapt the + packages to many kinds of UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template file that lists the + operating system features that the package can use, in the form of M4 macro calls.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('M4', '1.4.17')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb new file mode 100644 index 0000000000..38cd369b16 --- /dev/null +++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb @@ -0,0 +1,31 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'Automake' +version = "1.14" + +homepage = 'http://www.gnu.org/software/automake/automake.html' +description = "Automake: GNU Standards-compliant Makefile generator" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +source_urls = ['http://ftp.gnu.org/gnu/automake'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('Autoconf', '2.69')] + +sanity_check_paths = { + 'files': ['bin/automake', 'bin/aclocal'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb new file mode 100644 index 0000000000..b1f5824155 --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gompi', 'version': '1.6.10'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb new file mode 100644 index 0000000000..cef0802601 --- /dev/null +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb @@ -0,0 +1,28 @@ +name = "GCC" +version = '4.8.2' + +homepage = 'http://gcc.gnu.org/' +description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...).""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s', # GCC auto-resolving HTTP mirror + 'http://ftpmirror.gnu.org/gmp', # idem for GMP + 'http://ftpmirror.gnu.org/mpfr', # idem for MPFR + 'http://www.multiprecision.org/mpc/download', # MPC official +] +sources = [ + SOURCELOWER_TAR_GZ, + 'gmp-5.1.3.tar.bz2', + 'mpfr-3.1.2.tar.gz', + 'mpc-1.0.1.tar.gz', +] + +languages = ['c', 'c++', 'fortran', 'lto'] + +# building GCC sometimes fails if make parallelism is too high, so let's limit it +maxparallel = 4 + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb b/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb new file mode 100644 index 0000000000..988f987ac6 --- /dev/null +++ b/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb @@ -0,0 +1,24 @@ +easyblock = "Toolchain" + +name = 'gompi' +version = '1.6.10' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, + including OpenMPI for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.8.2' + +mpilib = 'OpenMPI' +mpiver = '1.7.3' + +# compiler toolchain depencies +dependencies = [ + (compname, compver), + (mpilib, mpiver, '-%s-%s' % (compname, compver)), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb new file mode 100644 index 0000000000..552cef69cb --- /dev/null +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb @@ -0,0 +1,37 @@ +easyblock = "Toolchain" + +name = 'goolf' +version = '1.6.10' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, including + OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp_name = 'GCC' +comp_version = '4.8.2' +comp = "%s-%s" % (comp_name, comp_version) + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blas = '%s-%s' % (blaslib, blasver) +blassuff = 'LAPACK-3.4.2' + +# toolchain used to build goolf dependencies +comp_mpi_tc_name = 'gompi' +comp_mpi_tc_ver = "%s" % version +comp_mpi_tc = "%s-%s" % (comp_mpi_tc_name, comp_mpi_tc_ver) + +# compiler toolchain depencies +# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain +# because of toolchain preperation functions +dependencies = [ + ('GCC', '4.8.2'), + ('OpenMPI', '1.7.3-%s' % comp), # part of gompi-1.1.0 + (blaslib, blasver, '-%s-%s' % (comp_mpi_tc, blassuff)), + ('FFTW', '3.3.3', "-%s" % comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s-%s-%s' % (comp_mpi_tc, blas, blassuff)) + ] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb new file mode 100644 index 0000000000..10a37d2dbb --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb @@ -0,0 +1,18 @@ +name = 'hwloc' +version = "1.7.2" + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +versionpath = '.'.join(version.split('.')[:-1]) +source_urls = ['http://www.open-mpi.org/software/hwloc/v%s/downloads/' % versionpath] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb new file mode 100644 index 0000000000..ef386fcf48 --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb @@ -0,0 +1,22 @@ +name = 'M4' +version = '1.4.17' + +homepage = 'http://www.gnu.org/software/m4/m4.html' +description = """GNU M4 is an implementation of the traditional Unix macro processor. + It is mostly SVR4 compatible although it has some extensions + (for example, handling more than 9 positional parameters to macros). + GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/m4'] + +configopts = "--enable-cxx" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..6692010d4e --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb @@ -0,0 +1,51 @@ +name = 'OpenBLAS' +version = '0.2.8' + +lapackver = '3.4.2' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'gompi', 'version': '1.6.10'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb new file mode 100644 index 0000000000..97fcbbfb99 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -0,0 +1,42 @@ +name = 'OpenMPI' +version = "1.7.3" + +homepage = 'http://www.open-mpi.org/' +description = """The Open MPI Project is an open source MPI-2 implementation.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] + +builddependencies = [ + ('Automake', '1.14'), + ('Autoconf', '2.69') +] + +dependencies = [ ('hwloc', '1.7.2') ] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support +configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", +#"mpi_f77" , +#"mpi_f90", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", +#mpif-common", "mpif-config", "mpif", + "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"] + } + +moduleclass = 'mpi' + + +# added by EasyBuild as dictated by command line options +patches = ['openmpi-mca-params.conf-1.6.4-local.patch', 'pax_disable.patch'] # added by EasyBuild diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..5baf987e04 --- /dev/null +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb @@ -0,0 +1,25 @@ +name = 'ScaLAPACK' +version = '2.0.2' + +homepage = 'http://www.netlib.org/scalapack/' +description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines + redesigned for distributed memory MIMD parallel computers.""" + +toolchain = {'name': 'gompi', 'version': '1.6.10'} +toolchainopts = {'pic': True} + +source_urls = [homepage] +sources = ['%(namelower)s-%(version)s.tgz'] + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blassuff = '-LAPACK-3.4.2' + +versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff) + +dependencies = [(blaslib, blasver, blassuff)] + +## parallel build tends to fail, so disabling it +parallel = 1 + +moduleclass = 'numlib' -- GitLab From 69a003f450aed03526394a799c0f60c71a208254 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 22 Oct 2013 11:28:22 +0300 Subject: [PATCH 129/811] fix x permissions on .patch and .eb files Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/b/BLAST/BLAST-2.2.28_ictce-fixes.patch | 0 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 easybuild/easyconfigs/b/BLAST/BLAST-2.2.28_ictce-fixes.patch mode change 100755 => 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb diff --git a/easybuild/easyconfigs/b/BLAST/BLAST-2.2.28_ictce-fixes.patch b/easybuild/easyconfigs/b/BLAST/BLAST-2.2.28_ictce-fixes.patch old mode 100755 new mode 100644 diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb old mode 100755 new mode 100644 -- GitLab From 03c3c19353bd63c06e40499ba1727f43312b8553 Mon Sep 17 00:00:00 2001 From: yossibaruch Date: Wed, 23 Oct 2013 16:47:25 +0300 Subject: [PATCH 130/811] adding WRF 3.5.1 goolf --- .../w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb new file mode 100644 index 0000000000..1bb629aaae --- /dev/null +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb @@ -0,0 +1,38 @@ +name = 'WRF' +version = '3.5.1' + +homepage = 'http://www.wrf-model.org' +description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale + numerical weather prediction system designed to serve both operational forecasting and atmospheric + research needs.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 + +sources = ['%sV%s.TAR.gz' % (name, version)] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +# csh is used by WRF install scripts +builddependencies = [('tcsh', '6.18.01')] + +dependencies = [ + ('JasPer', '1.900.1'), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), +] + +patches = [ + 'WRF_parallel_build_fix.patch', + #'WRF-%(version)s_netCDF-Fortran_separate_path.patch', + #'WRF-%(version)s_known_problems.patch', + 'WRF-3.5_netCDF-Fortran_separate_path.patch', + 'WRF_tests_limit-runtimes.patch', +] + +# limit parallel build to 20 +maxparallel = 20 + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +moduleclass = 'geo' -- GitLab From d1379d8f28bee19642ec16ff54eb20fb88b1805e Mon Sep 17 00:00:00 2001 From: yossibaruch Date: Thu, 24 Oct 2013 13:05:53 +0300 Subject: [PATCH 131/811] adding scipy 0.12 with goolf --- .../scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..9d7071d5f3 --- /dev/null +++ b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,19 @@ +name = 'scipy' +version = '0.12.0' +versionsuffix = '-Python-2.7.3' + +homepage = 'http://www.scipy.org' +description = """SciPy is a collection of mathematical algorithms and convenience + functions built on the Numpy extension for Python.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True} + +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +sources = [SOURCE_TAR_GZ] + +dependencies = [ + ('numpy', '1.6.2', versionsuffix), + ] + +moduleclass = 'math' -- GitLab From f8cd2004c5d084a1cf753ad5d35fc34fe43fab49 Mon Sep 17 00:00:00 2001 From: Thekla Date: Thu, 24 Oct 2013 14:59:45 +0300 Subject: [PATCH 132/811] Adding arpack-ng --- .../arpack-ng-3.1.3-configure-mpi.patch | 26 +++++++++++++++++++ .../arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb | 23 ++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch new file mode 100644 index 0000000000..d33dca4fee --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch @@ -0,0 +1,26 @@ +--- configure.orig 2013-04-02 11:33:44.000000000 +0300 ++++ configure 2013-10-23 11:26:16.265192891 +0300 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++/#! /bin/sh + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.69 for arpack-ng 3.1.3. + # +@@ -8433,7 +8433,7 @@ + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) ++ icc* | ifort* | mpif77*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' +@@ -12052,7 +12052,7 @@ + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) ++ icc* | ifort* | mpif77*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fPIC' + lt_prog_compiler_static_F77='-static' diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb new file mode 100644 index 0000000000..c00e1840d8 --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb @@ -0,0 +1,23 @@ +name = 'arpack-ng' +version = '3.1.3' + +homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/' +description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True} + +source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['arpack-ng-3.1.3-configure-mpi.patch'] + +configopts = '--with-blas="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --with-lapack="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --enable-mpi' + + +sanity_check_paths = { + 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libarpack.a"], + 'dirs': [] +} + +moduleclass = 'numlib' -- GitLab From bf944013aa71964e2db99a628ad634c44d62e368 Mon Sep 17 00:00:00 2001 From: Thekla Date: Thu, 24 Oct 2013 15:56:28 +0300 Subject: [PATCH 133/811] Adding arpack-ng --- .../a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch index d33dca4fee..9811837b02 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch @@ -1,11 +1,5 @@ ---- configure.orig 2013-04-02 11:33:44.000000000 +0300 -+++ configure 2013-10-23 11:26:16.265192891 +0300 -@@ -1,4 +1,4 @@ --#! /bin/sh -+/#! /bin/sh - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.69 for arpack-ng 3.1.3. - # +--- configure.orig 2013-10-24 15:26:59.994151181 +0300 ++++ configure 2013-10-24 15:29:31.293151084 +0300 @@ -8433,7 +8433,7 @@ ;; # icc used to be incompatible with GCC. -- GitLab From ccabeef0a0f056dbd4e7ff1601fad5539926fbb4 Mon Sep 17 00:00:00 2001 From: Xavier Besseron Date: Thu, 24 Oct 2013 14:57:56 +0200 Subject: [PATCH 134/811] Build shared libraries with MPICH --- easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb | 3 +++ easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb index 99806a57ae..971d6adf6f 100644 --- a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb @@ -13,6 +13,9 @@ source_urls = ['http://www.mpich.org/static/tarballs/%s' % version] # MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS. preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; ' +# Build shared libraries +configopts = '--enable-shared' + sanity_check_paths = { 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 'bin/mpiexec', 'bin/mpirun', diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb index d6b58fa6d4..6716e71e5b 100644 --- a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb @@ -13,6 +13,9 @@ source_urls = ['http://www.mpich.org/static/tarballs/%(version)s'] # MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS. preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; ' +# Build shared libraries +configopts = '--enable-shared' + sanity_check_paths = { 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 'bin/mpiexec', 'bin/mpirun', 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], -- GitLab From 672992e7465b02f2b994d3e4461c14f9557eba53 Mon Sep 17 00:00:00 2001 From: Thekla Date: Thu, 24 Oct 2013 16:14:29 +0300 Subject: [PATCH 135/811] Adding Silo and ParFlow --- .../p/ParFlow/ParFlow-605-goolf-1.4.10.eb | 45 +++++++++++++++++++ .../s/Silo/Silo-4.9.1-goolf-1.4.10.eb | 21 +++++++++ 2 files changed, 66 insertions(+) create mode 100644 easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb new file mode 100644 index 0000000000..40d777c0a5 --- /dev/null +++ b/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb @@ -0,0 +1,45 @@ +name = 'ParFlow' +version = '605' + +homepage = 'http://computation.llnl.gov/casc/parflow/parflow_home.html' +description = """ParFlow is an integrated, parallel watershed model that makes use of high-performance computing to simulate surface and subsurface fluid flow.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': True, 'pic': True, 'usempi': True} + +sources = ['%s.r%s.tar.gz' % (name.lower(), version)] +source_urls = ['http://inside.mines.edu/~rmaxwell/'] + +dependencies = [ + ('Silo', '4.9.1'), + ('Hypre', '2.8.0b'), + ('Tcl', '8.5.14'), +] + +preconfigopts = [ 'cd pfsimulator &&', + 'cd pftools &&', +] + +configopts = [ ' --with-amps=mpi1 --enable-timing --with-clm --with-silo=$EBROOTSILO --with-hypre=$EBROOTHYPRE', + ' --with-amps=mpi1 --enable-timing --with-clm --with-silo=$EBROOTSILO --with-tcl=$EBROOTTCL', +] + +premakeopts = [ 'cd pfsimulator &&', + 'cd pftools &&', +] + +makeopts = [ 'LDLIBS="$LDLIBS_EXTRA -lHYPRE -lsilo -lmpi -lgfortran -lm -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../.. -L/usr/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/lib/../lib -L/lib/x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6 -lgcc_s -lgcc -lquadmath"', + 'LDLIBS="$(LDLIBS_EXTRA) $(PARFLOW_TOOLS_LIBS) -lsilo -ltcl8.5 -lgfortran -lm -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../.. -L/usr/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/lib/../lib -L/lib/x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4. -lgcc_s -lgcc -lquadmath"', + ] + +preinstallopts = [ 'cd pfsimulator &&', + 'cd pftools &&', +] + +sanity_check_paths = { + 'files': ["lib/libamps.a", "lib/libamps_common.a", "lib/libclm.a", "lib/libkinsol.a", "lib/libparflow.a", "bin/batchmc", "bin/bgmsfem2pfsol", "bin/bootmc", "bin/freemc", "bin/getmc", "bin/gmssol2pfsol", "bin/gmstinvertices", "bin/gmstriangulate", "bin/killmc", "bin/parflow", "bin/peekmc", "bin/pfhelp", "bin/pfwell_cat", "bin/pfsbtosa", "bin/pfbtosa", "bin/pfstrip", "bin/pfbtovis", "bin/projecttin", "bin/run"], + 'dirs': [], +} + +moduleclass = 'data' + diff --git a/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..46ca32ccbb --- /dev/null +++ b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb @@ -0,0 +1,21 @@ +name = 'Silo' +version = '4.9.1' + +homepage = 'https://wci.llnl.gov/codes/silo/index.html' +description = """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': True, 'pic': True, 'usempi': True} + +sources = ['%s-%s.tar.gz' % (name.lower(), version)] +source_urls = ['https://wci.llnl.gov/codes/silo/silo-4.9.1'] + +configopts = ' --disable-silex ' + +sanity_check_paths = { + 'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a'], + 'dirs': [] + } + +moduleclass = 'lib' + -- GitLab From ed946eff08f06673e8e9529f2e023b69eb12dfac Mon Sep 17 00:00:00 2001 From: Thekla Date: Thu, 24 Oct 2013 16:31:32 +0300 Subject: [PATCH 136/811] Adding CDO --- .../c/CDO/CDO-1.6.0-goolf-1.4.10.eb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..6a6d8a0172 --- /dev/null +++ b/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb @@ -0,0 +1,28 @@ +name = 'CDO' +version = '1.6.0' + +homepage = 'https://code.zmaw.de/projects/cdo' +description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': True, 'pic': True, 'usempi': True} + +sources = ['%s-%s.tar.gz' % (name.lower(), version)] +source_urls = ['https://code.zmaw.de/attachments/download/5287/'] + + + +dependencies = [ + ('HDF5', '1.8.10-patch1'), + ('netCDF', '4.2.1.1'), +] + +configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF" + +sanity_check_paths = { + 'files': ["bin/cdo"], + 'dirs': [], +} + +moduleclass = 'data' + -- GitLab From b6f944555c2bc34dbef41a86cc83924712d67547 Mon Sep 17 00:00:00 2001 From: Thekla Date: Thu, 24 Oct 2013 16:59:02 +0300 Subject: [PATCH 137/811] Making changes in arpack-ng --- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb index c00e1840d8..ff6deace30 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb @@ -12,8 +12,9 @@ sources = [SOURCELOWER_TAR_GZ] patches = ['arpack-ng-3.1.3-configure-mpi.patch'] -configopts = '--with-blas="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --with-lapack="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --enable-mpi' +#configopts = '--with-blas="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --with-lapack="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --enable-mpi' +configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' sanity_check_paths = { 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libarpack.a"], -- GitLab From 1f217385905f542eb751572281d9c9f62a294a07 Mon Sep 17 00:00:00 2001 From: Thekla Date: Thu, 24 Oct 2013 17:46:18 +0300 Subject: [PATCH 138/811] Change in config file --- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb index ff6deace30..a7cc90eaa8 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb @@ -12,8 +12,6 @@ sources = [SOURCELOWER_TAR_GZ] patches = ['arpack-ng-3.1.3-configure-mpi.patch'] -#configopts = '--with-blas="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --with-lapack="-L$SOFTROOTIMKL/lib/em64t -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread" --enable-mpi' - configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' sanity_check_paths = { -- GitLab From 4e7da02259247ffa4d4e4f7646e39238b3132b14 Mon Sep 17 00:00:00 2001 From: yossibaruch Date: Thu, 24 Oct 2013 18:27:27 +0300 Subject: [PATCH 139/811] adding python-1.0.0 with goolf --- ...IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..4ca51fd8a5 --- /dev/null +++ b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,49 @@ +easyblock = "PythonPackage" + +name = 'IPython' +version = '1.1.0' + +homepage = 'http://ipython.org/index.html' +description = """IPython provides a rich architecture for interactive computing with: +Powerful interactive shells (terminal and Qt-based). +A browser-based notebook with support for code, text, mathematical expressions, inline plots and other rich media. +Support for interactive data visualization and use of GUI toolkits. +Flexible, embeddable interpreters to load into your own projects. +Easy to use, high performance tools for parallel computing.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +#source_urls = [('http://archive.ipython.org/release/%s' % version, 'download')] +#sources = [SOURCE_TAR_GZ] + +sources = ['%s-%s.tar.gz' % (name.lower(), version)] +source_urls = ['http://archive.ipython.org/release/%s/' %(version)] + + +python = 'Python' +pyver = '2.7.3' +pyshortver = '2.7' +versionsuffix = '-%s-%s' % (python, pyver) + + +dependencies = [ + (python, pyver), +] + +# we're giving the sanity check just a method to replace the EXTS_FILTER_PYTHON_PACKAGES default value (mentioned below) with something that will tell use that i[ython exists but not a test, and will work +# EXTS_FILTER_PYTHON_PACKAGES = ('python -c "import %(ext_name)s"', "") + +exts_filter = ('ipython -h', "") + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/IPython' % pyshortver], +} + +#sanity_check_commands = [('/bin/touch', ' /tmp/run_yossi')] +sanity_check_commands = [('iptest','')] + +# IPython is tested using iptest +#tests = [iptest]# + +moduleclass = 'tools' -- GitLab From 224b374c50b7efe93a3a9bc7c88c8540c2c12b7c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 24 Oct 2013 20:01:12 +0300 Subject: [PATCH 140/811] contrib bunch of tiny compilers Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/p/PCC/PCC-20131024.eb | 28 +++++++++++++++++ easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb | 35 +++++++++++++++++++++ easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb | 34 ++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 easybuild/easyconfigs/p/PCC/PCC-20131024.eb create mode 100644 easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb create mode 100644 easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb new file mode 100644 index 0000000000..01ab26d824 --- /dev/null +++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb @@ -0,0 +1,28 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = 'PCC' +version = '20131024' + +homepage = 'http://pcc.ludd.ltu.se/' +description = """The compiler is based on the original Portable C Compiler by S. C. Johnson, + written in the late 70's. About 50% of the frontend code and 80% of the backend code has been modified.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# eg. http://pcc.ludd.ltu.se/downloads/ +sources = ['pcc-%(version)s.tgz'] +source_urls = ['ftp://pcc.ludd.ltu.se/pub/pcc/'] + +sanity_check_paths = { + 'files': ["bin/pcc"], + 'dirs': ["lib"] +} + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb new file mode 100644 index 0000000000..57b77cced8 --- /dev/null +++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb @@ -0,0 +1,35 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = 'SDCC' +version = '3.3.0' + +homepage = 'http://sdcc.sourceforge.net/' +description = """SDCC is a retargettable, optimizing ANSI - C compiler suite that targets + the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) + DS80C390 variants, Freescale (formerly Motorola) HC08 based (hc08, s08) and Zilog Z80 based + MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting the + Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# eg. http://sourceforge.net/projects/sdcc/files/sdcc/3.3.0/sdcc-src-3.3.0.tar.bz2/download +sources = ['sdcc-src-%s.tar.bz2' % version] +source_urls = ['http://sourceforge.net/projects/sdcc/files/sdcc/%s/' % version, 'download'] + +configopts = "--disable-pic14-port --disable-pic16-port" + +sanity_check_paths = { + 'files': ["bin/sdcc"], + 'dirs': [] +} + +runtest = 'installcheck' # N.B. the current Makefile contains just a placeholder and is empty + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb new file mode 100644 index 0000000000..e5a63b16d6 --- /dev/null +++ b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = 'TCC' +version = '0.9.26' +# altversions = ['0.9.21', '0.9.22', '0.9.23', '0.9.24', '0.9.25', '0.9.26'] # older versions may require more special handling + +homepage = 'http://bellard.org/tcc/' +description = """The Tiny C Compiler (aka TCC, tCc, or TinyCC) is an x86 and x86-64 C compiler + created by Fabrice Bellard. It is designed to work for slow computers with little disk space + and can run shebang style !/usr/bin/tcc . TCC is distributed under the LGPL. TCC claims to + implement all of ANSI C (C89/C90),[1] much of the new ISO C99 standard, + and many GNU C extensions including inline assembly.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# eg. http://download.savannah.nongnu.org/releases/tinycc/tcc-0.9.26.tar.bz2 +sources = ['tcc-%s.tar.bz2' % version] +source_urls = ['http://download.savannah.nongnu.org/releases/tinycc/'] + +sanity_check_paths = { + 'files': ["bin/tcc"], + 'dirs': [] +} + +runtest = 'test' + +moduleclass = 'compiler' -- GitLab From 1d2c2a01d402386c53c74329c4662afd44cee954 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 24 Oct 2013 20:15:46 +0300 Subject: [PATCH 141/811] laatste ronde of bugfixes Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/p/PCC/PCC-20131024.eb | 4 ++-- easybuild/easyconfigs/s/SDCC/{SDCC-3.3.eb => SDCC-3.3-0.eb} | 1 + easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename easybuild/easyconfigs/s/SDCC/{SDCC-3.3.eb => SDCC-3.3-0.eb} (94%) diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb index 01ab26d824..ba11dcf6fd 100644 --- a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb +++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb @@ -16,9 +16,9 @@ description = """The compiler is based on the original Portable C Compiler by S. toolchain = {'name': 'dummy', 'version': 'dummy'} -# eg. http://pcc.ludd.ltu.se/downloads/ +# eg. http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-20131024.tgz sources = ['pcc-%(version)s.tgz'] -source_urls = ['ftp://pcc.ludd.ltu.se/pub/pcc/'] +source_urls = ['http://pcc.ludd.ltu.se/ftp/pub/pcc/'] sanity_check_paths = { 'files': ["bin/pcc"], diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb similarity index 94% rename from easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb rename to easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb index 57b77cced8..046c5af90a 100644 --- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.eb +++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb @@ -23,6 +23,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['sdcc-src-%s.tar.bz2' % version] source_urls = ['http://sourceforge.net/projects/sdcc/files/sdcc/%s/' % version, 'download'] +# similar build style like https://svn.redports.org/tijl/lang/sdcc/Makefile configopts = "--disable-pic14-port --disable-pic16-port" sanity_check_paths = { diff --git a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb index e5a63b16d6..febaa53129 100644 --- a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb +++ b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb @@ -21,7 +21,7 @@ description = """The Tiny C Compiler (aka TCC, tCc, or TinyCC) is an x86 and x86 toolchain = {'name': 'dummy', 'version': 'dummy'} # eg. http://download.savannah.nongnu.org/releases/tinycc/tcc-0.9.26.tar.bz2 -sources = ['tcc-%s.tar.bz2' % version] +sources = [SOURCELOWER_TAR_BZ2] source_urls = ['http://download.savannah.nongnu.org/releases/tinycc/'] sanity_check_paths = { -- GitLab From 9642816df05ff60bbee7c4aa45ff92ed7b91a144 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 24 Oct 2013 21:25:09 +0300 Subject: [PATCH 142/811] latest and greatest Chapel added Signed-off-by: Fotis Georgatos --- .../c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..fb22027823 --- /dev/null +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb @@ -0,0 +1,29 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = 'Chapel' +version = '1.8.0' + +homepage = 'http://chapel.cray.com' +description = """ Chapel is an emerging parallel programming language whose design and development + is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users + while also serving as a portable parallel programming model that can be used on commodity clusters + or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale + parallel computers while matching or beating the performance and portability of current programming + models like MPI.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [SOURCEFORGE_SOURCE] + +unpack_options = '--strip-components=1' + +moduleclass = 'lang' -- GitLab From aa865d854e02a0f803e3ec5e30514846d2c70266 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 24 Oct 2013 21:28:42 +0300 Subject: [PATCH 143/811] re-add parallel=1, it is there for a reason Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb index fb22027823..caf0ad21dc 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb @@ -26,4 +26,7 @@ source_urls = [SOURCEFORGE_SOURCE] unpack_options = '--strip-components=1' +# parallel build fails +parallel = 1 + moduleclass = 'lang' -- GitLab From 16c92bda0b5ebf28846d05f16a555d480ce7472b Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 29 Oct 2013 19:47:27 +0100 Subject: [PATCH 144/811] add TDK from Nvidia Signed-off-by: Fotis Georgatos --- .../Tesla-Deployment-Kit-5.319.43.eb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb diff --git a/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb new file mode 100644 index 0000000000..4db2aee3fd --- /dev/null +++ b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb @@ -0,0 +1,37 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: University of Luxembourg / LCSB +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +easyblock = "Tarball" + +name = "Tesla-Deployment-Kit" +version = "5.319.43" + +homepage = 'https://developer.nvidia.com/tesla-deployment-kit' +description = """The Tesla Deployment Kit is a set of tools provided primarily for the NVIDIA Tesla + range of GPUs. They aim to empower users to better manage their NVIDIA GPUs by providing a broad + range of functionalities. The kit contains: + * NVIDIA Management Library (NVML), + * Tesla Deployment Kit - Linux Edition (Aug 1st, 2013)""" + +toolchain = {'version': 'dummy', 'name': 'dummy'} + +sources = ['tdk_%(version)s.tar.gz'] +source_urls = ['http://developer.download.nvidia.com/compute/cuda/5_5/rel/nvml'] + +sanity_check_paths = { + 'files': ["nvidia-healthmon/nvidia-healthmon", "nvidia-healthmon/nvidia-healthmon_x86"], + 'dirs': [] +} + +modextrapaths = { + 'PATH': 'nvidia-healthmon', + 'CPATH': 'nvml/include', +} + +moduleclass = 'system' -- GitLab From f36b39ec5a50134c17c59405006fcae93bd0d992 Mon Sep 17 00:00:00 2001 From: Xavier Besseron Date: Thu, 31 Oct 2013 11:22:13 +0100 Subject: [PATCH 145/811] Additional easyconfigs with minimal dependencies --- .../b/Bison/Bison-2.7-GCC-4.8.1.eb | 20 +++++++++++++++ .../b/bzip2/bzip2-1.0.6-GCC-4.8.1.eb | 15 +++++++++++ .../c/CMake/CMake-2.8.12-GCC-4.8.1.eb | 20 +++++++++++++++ .../easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb | 25 +++++++++++++++++++ .../easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb | 21 ++++++++++++++++ .../z/zlib/zlib-1.2.8-GCC-4.8.1.eb | 22 ++++++++++++++++ 6 files changed, 123 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb new file mode 100644 index 0000000000..e24eef4f7e --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.7' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar +into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.1.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.1.eb new file mode 100644 index 0000000000..197ce153f8 --- /dev/null +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.1.eb @@ -0,0 +1,15 @@ +name = 'bzip2' +version = '1.0.6' + +homepage = 'http://www.bzip.org/' +description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically +compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical +compressors), whilst being around twice as fast at compression and six times faster at decompression.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} +toolchainopts = {'pic': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.bzip.org/%(version)s/'] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.1.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.1.eb new file mode 100644 index 0000000000..4dba02eaaa --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.1.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb new file mode 100644 index 0000000000..ddb33422fd --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb @@ -0,0 +1,25 @@ +name = 'M4' +version = '1.4.16' + +homepage = 'http://www.gnu.org/software/m4/m4.html' +description = """GNU M4 is an implementation of the traditional Unix macro processor. +It is mostly SVR4 compatible although it has some extensions +(for example, handling more than 9 positional parameters to macros). +GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc. +""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/m4'] + +patches = ['M4-%(version)s-no-gets.patch'] + +configopts = "--enable-cxx" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb new file mode 100644 index 0000000000..091eab829e --- /dev/null +++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb @@ -0,0 +1,21 @@ +name = 'Szip' +version = '2.1' + +homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/' +description = "Szip compression software, providing lossless compression of scientific data" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +sanity_check_paths = { + 'files': ["lib/libsz.a", "lib/libsz.so"] + + ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb new file mode 100644 index 0000000000..93fdc0a3b5 --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb @@ -0,0 +1,22 @@ +name = 'zlib' +version = '1.2.8' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, + not covered by any patents -- lossless data-compression library for use on virtually any + computer hardware and operating system.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +preconfigopts = 'LDSHARED="$CC -shared"' + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 02a27e5d4c34dae473de1954cc0ad5abd7bf684b Mon Sep 17 00:00:00 2001 From: Xavier Besseron Date: Thu, 31 Oct 2013 15:34:57 +0100 Subject: [PATCH 146/811] New EasyConfigs for HDF5-serial, ie HDF5 without MPI support. They are based on the HDF5-serial EasyBlock which allows to compile HDF5 without MPI support. --- .../HDF5-serial-1.8.10-GCC-4.8.1.eb | 24 +++++++++++++++++++ .../HDF5-serial-1.8.11-GCC-4.8.1.eb | 24 +++++++++++++++++++ .../h/HDF5-serial/configure_libtool.patch | 16 +++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch diff --git a/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb b/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb new file mode 100644 index 0000000000..1ad66be02d --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb @@ -0,0 +1,24 @@ +name = 'HDF5-serial' +version = '1.8.10' + +easyblock = 'EB_HDF5_serial' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = ['hdf5-%(version)s.tar.gz'] + +dependencies = [ + ('zlib', '1.2.8'), + ('Szip', '2.1'), +] + +patches = ['configure_libtool.patch'] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb b/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb new file mode 100644 index 0000000000..9027b2ff87 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb @@ -0,0 +1,24 @@ +name = 'HDF5-serial' +version = '1.8.11' + +easyblock = 'EB_HDF5_serial' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = ['hdf5-%(version)s.tar.gz'] + +dependencies = [ + ('zlib', '1.2.8'), + ('Szip', '2.1'), +] + +patches = ['configure_libtool.patch'] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch b/easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch new file mode 100644 index 0000000000..08b436b4a6 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch @@ -0,0 +1,16 @@ +--- hdf5-1.8.7.orig/configure 2011-05-10 16:20:59.000000000 +0200 ++++ hdf5-1.8.7/configure 2012-06-19 10:39:14.925704379 +0200 +@@ -18836,11 +18836,13 @@ + # linked, so don't bother handling this case. + esac + else ++ if [ "${prev}${p}" != "-l" ]; then + if test -z "$postdeps_FC"; then + postdeps_FC="${prev}${p}" + else + postdeps_FC="${postdeps_FC} ${prev}${p}" + fi ++ fi + fi + prev= + ;; -- GitLab From f2314588e27b3adc3e8d7f0b1617c9fec68caa2d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 31 Oct 2013 21:46:25 +0100 Subject: [PATCH 147/811] add build status badges for master/develop branches to README --- README.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.rst b/README.rst index 5156c3f493..51eea37653 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,21 @@ +Build status - *master branch (Python 2.4, Python 2.6, Python 2.7)* + +.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_master-python24/badge/icon + :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_master-python24/ +.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_master/badge/icon + :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_master/ +.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_master-python27/badge/icon + :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_master-python27/ + +Build status - *develop branch (Python 2.4, Python 2.6, Python 2.7)* + +.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_develop-python24/badge/icon + :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_develop-python24/ +.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_develop/badge/icon + :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_develop/ +.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_develop-python27/badge/icon + :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-easyconfigs_unit-test_hpcugent_develop-python27/ + EasyBuild: building software with ease -------------------------------------- -- GitLab From 6b6e8ca08a71007cdb633046ae1889520dcf4c3a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Nov 2013 17:39:29 +0100 Subject: [PATCH 148/811] add libXi easyconfigs --- .../l/libXi/libXi-1.7.2-goolf-1.4.10.eb | 17 +++++++++++++++++ .../l/libXi/libXi-1.7.2-ictce-4.1.13.eb | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..0973560bb8 --- /dev/null +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'libXi' +version = '1.7.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """LibXi provides an X Window System client interface to the XINPUT extension to the X protocol.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/extensions/XInput.h'], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb new file mode 100644 index 0000000000..392eb4b098 --- /dev/null +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'libXi' +version = '1.7.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """LibXi provides an X Window System client interface to the XINPUT extension to the X protocol.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/extensions/XInput.h'], + 'dirs' : [], +} + +moduleclass = 'vis' -- GitLab From b14e23dd05486803b31f3a8337c9ed4fe484c54d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Nov 2013 17:39:46 +0100 Subject: [PATCH 149/811] add Sablotron easyconfigs --- .../Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb | 19 +++++++++++++++++++ .../Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb new file mode 100644 index 0000000000..ce924727e4 --- /dev/null +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = 'Sablotron' +version = '1.0.3' + +homepage = 'http://sablotron.sourceforge.net/' +description = """Sablotron XML processor""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['Sablot-%(version)s.tar.gz'] + +dependencies = [('expat', '2.1.0')] + +sanity_check_paths = { + 'files': [], + 'dirs': ["."] +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb new file mode 100644 index 0000000000..112ef8ef87 --- /dev/null +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb @@ -0,0 +1,19 @@ +name = 'Sablotron' +version = '1.0.3' + +homepage = 'http://sablotron.sourceforge.net/' +description = """Sablotron XML processor""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['Sablot-%(version)s.tar.gz'] + +dependencies = [('expat', '2.1.0')] + +sanity_check_paths = { + 'files': [], + 'dirs': ["."] +} + +moduleclass = 'data' -- GitLab From d63e5414307ac0046393c33c8cca800a055b9a11 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Nov 2013 17:40:01 +0100 Subject: [PATCH 150/811] add libXi as dependency for freeglut --- easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb | 2 ++ easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb index ef561e493e..11d38c6295 100644 --- a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb @@ -9,6 +9,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://prdownloads.sourceforge.net/%(name)s'] +dependencies = [('libXi', '1.7.2')] + sanity_check_paths = { 'files': ['lib/libglut.a', 'lib/libglut.so'], 'dirs': ['include/GL'], diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb index e256926c3f..2c7f621177 100644 --- a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb @@ -9,6 +9,8 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://prdownloads.sourceforge.net/%(name)s'] +dependencies = [('libXi', '1.7.2')] + sanity_check_paths = { 'files': ['lib/libglut.a', 'lib/libglut.so'], 'dirs': ['include/GL'], -- GitLab From c0827322c51c26aae65fcff0b5ccdb362cf3f9e1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Nov 2013 17:40:43 +0100 Subject: [PATCH 151/811] add freeglut, Sablotron and libxml2 as dependencies to ARB --- easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb | 10 +++------- easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb index bdf7039f7d..57bbc878e9 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb @@ -29,13 +29,9 @@ dependencies = [ ('libXaw', '1.0.12'), ('Perl', '5.16.3'), ('libxslt', '1.1.28'), -#TODO: - #xmllint - # optional - #('freeglut', '2.8.1'), - # currently fails, see https://github.com/hpcugent/easybuild-easyconfigs/issues/368 - # but this is optional anyway - # sablotron + ('freeglut', '2.8.1'), + ('Sablotron', '1.0.3'), + ('libxml2', '2.9.1'), ] premakeopts = "export ARBHOME=$PWD && export PATH=$ARBHOME/bin:$PATH && export LD_LIBRARY_PATH=$ARBHOME/lib:$ARBHOME:LIBLINK:$LD_LIBRARY_PATH &&" makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index 2bbfce994a..971168fddc 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -28,13 +28,9 @@ dependencies = [ ('libXaw', '1.0.12'), ('Perl', '5.16.3'), ('libxslt', '1.1.28'), -#TODO: - #xmllint - # optional - #('freeglut', '2.8.1'), - # currently fails, see https://github.com/hpcugent/easybuild-easyconfigs/issues/368 - # but this is optional anyway - # sablotron + ('freeglut', '2.8.1'), + ('Sablotron', '1.0.3'), + ('libxml2', '2.9.1'), ] premakeopts = "export ARBHOME=$PWD && PATH=$ARBHOME/bin:$PATH && LD_LIBRARY_PATH=$ARBHOME/lib:$ARBHOME/LIBLINK:$LD_LIBRARY_PATH &&" makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support -- GitLab From 5b0b0c8d65c713a9e245f74278b98fa7777abc14 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Nov 2013 17:56:14 +0100 Subject: [PATCH 152/811] correct source spec for ARB --- easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb index 57bbc878e9..8a0bd49bd3 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb @@ -8,7 +8,7 @@ to the respective sequence entries is structured according to phylogeny or other toolchain = {'name': 'goolf', 'version': '1.4.10'} -sources = ['%(name)ssrc.tgz'] +sources = ['%(namelower)ssrc.tgz'] source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] patches = [ diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index 971168fddc..f789eae7b7 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -7,7 +7,7 @@ handling and data analysis. A central database of processed (aligned) sequences to the respective sequence entries is structured according to phylogeny or other user defined criteria.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -sources = ['%(name)ssrc.tgz'] +sources = ['%(namelower)ssrc.tgz'] source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] patches = [ -- GitLab From f0ad3f2fd2e99906d264a0a4c7256a0a00f89607 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 1 Nov 2013 19:36:04 +0100 Subject: [PATCH 153/811] remove premakeopts and makeopts setting for ARB, set by easyblock now --- easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb | 3 +-- easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb index 8a0bd49bd3..0017c13626 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb @@ -33,6 +33,5 @@ dependencies = [ ('Sablotron', '1.0.3'), ('libxml2', '2.9.1'), ] -premakeopts = "export ARBHOME=$PWD && export PATH=$ARBHOME/bin:$PATH && export LD_LIBRARY_PATH=$ARBHOME/lib:$ARBHOME:LIBLINK:$LD_LIBRARY_PATH &&" -makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support + moduleclass = 'bio' diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index f789eae7b7..46f4482eda 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -32,8 +32,5 @@ dependencies = [ ('Sablotron', '1.0.3'), ('libxml2', '2.9.1'), ] -premakeopts = "export ARBHOME=$PWD && PATH=$ARBHOME/bin:$PATH && LD_LIBRARY_PATH=$ARBHOME/lib:$ARBHOME/LIBLINK:$LD_LIBRARY_PATH &&" -makeopts = 'all OPENGL=0 V=1 ARB_64=1' # no opengl support, verbose, 64bit support -# makefile doesn't support parallel builds -#parallel = 1 + moduleclass = 'bio' -- GitLab From 9efc660b72d2eb4617442bf707fe3b8650032598 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 13:17:01 +0100 Subject: [PATCH 154/811] add patch for Sablotron with ictce, fix sanity check --- .../s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb | 4 ++-- .../s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb | 6 ++++-- .../s/Sablotron/Sablotron-1.0.3_recent-icpc.patch | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb index ce924727e4..1a4ec0de84 100644 --- a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb @@ -12,8 +12,8 @@ sources = ['Sablot-%(version)s.tar.gz'] dependencies = [('expat', '2.1.0')] sanity_check_paths = { - 'files': [], - 'dirs': ["."] + 'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.so'], + 'dirs': ['share/doc/html/sablot', 'man'], } moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb index 112ef8ef87..1ed69df631 100644 --- a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb @@ -9,11 +9,13 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = [SOURCEFORGE_SOURCE] sources = ['Sablot-%(version)s.tar.gz'] +patches = ['%(name)s-%(version)s_recent-icpc.patch'] + dependencies = [('expat', '2.1.0')] sanity_check_paths = { - 'files': [], - 'dirs': ["."] + 'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.so'], + 'dirs': ['share/doc/html/sablot', 'man'], } moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch new file mode 100644 index 0000000000..605f59b697 --- /dev/null +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch @@ -0,0 +1,14 @@ +diff -ru /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3.orig/configure /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3/configure +--- /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3.orig/configure 2005-06-07 17:29:14.000000000 +0200 ++++ /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3/configure 2013-11-02 12:18:57.211802268 +0100 +@@ -10331,8 +10331,8 @@ + # Intel C++ + with_gnu_ld=yes + archive_cmds_need_lc_CXX=no +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -- GitLab From 7cf8aebff5873385d4d8a8c1976f0cf1c4fe8d66 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 13:21:47 +0100 Subject: [PATCH 155/811] add inputproto as dependency for libXi --- easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb | 2 ++ easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb index 0973560bb8..03673e2f2b 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb @@ -9,6 +9,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +dependencies = [('inputproto', '2.3')] + sanity_check_paths = { 'files' : ['include/X11/extensions/XInput.h'], 'dirs' : [], diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb index 392eb4b098..c3e8060e3b 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb @@ -9,6 +9,8 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +dependencies = [('inputproto', '2.3')] + sanity_check_paths = { 'files' : ['include/X11/extensions/XInput.h'], 'dirs' : [], -- GitLab From 9913186a7779776bf72b14112ee909a58f54c0a7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 13:49:04 +0100 Subject: [PATCH 156/811] make sure ARB GCC version check passes when building with ictce --- easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index 46f4482eda..f28f029d84 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -33,4 +33,6 @@ dependencies = [ ('libxml2', '2.9.1'), ] +makeopts = 'GCC_VERSION_ALLOWED=`$ARBHOME/SOURCE_TOOLS/arb_gcc_version.pl`' + moduleclass = 'bio' -- GitLab From d8af9ab951f54488a11d9bbebc95e96c17e24987 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 13:58:33 +0100 Subject: [PATCH 157/811] add clarifying comment --- easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index f28f029d84..359b78e779 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -33,6 +33,7 @@ dependencies = [ ('libxml2', '2.9.1'), ] +# make sure GCC version check passes, use ARB script to get current GCC version as indicate it's an allowed version makeopts = 'GCC_VERSION_ALLOWED=`$ARBHOME/SOURCE_TOOLS/arb_gcc_version.pl`' moduleclass = 'bio' -- GitLab From 1650f03989db8937e84dc6e66c0f8ae2076436a1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 14:05:40 +0100 Subject: [PATCH 158/811] fix moduleclass for MySQLdb + style fixes --- .../MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb index 1d9f7f914e..aff09691b8 100644 --- a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb @@ -4,17 +4,16 @@ name = 'MySQLdb' version = '1.2.4' homepage = 'https://github.com/farcepest/MySQLdb1' -description = """ -MySQLdb is a Python DB API-2.0-compliant interface; see PEP-249 for details. -""" +description = """MySQLdb is a Python DB API-2.0-compliant interface; see PEP-249 for details.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['https://github.com/farcepest/MySQLdb1/archive'] -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] -python = "Python" +python = 'Python' pythonversion = '2.7.3' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pythonshortversion = '.'.join(pythonversion.split('.')[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) @@ -23,4 +22,5 @@ dependencies = [ ('zlib', '1.2.7'), ('OpenSSL', '1.0.0'), ] -moduleclass = "database" + +moduleclass = "data" -- GitLab From 2ee04e846bff883c0afceffb0e437b481f8c7121 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 14:13:04 +0100 Subject: [PATCH 159/811] style and consistency fixes in motif easyconfigs --- .../easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 12 ++++++++---- .../easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 10 ++++++++-- .../easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb | 2 ++ .../easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb | 3 +++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index b47a0a4c09..355a1a3e21 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -10,9 +10,9 @@ description = """Motif refers to both a graphical user interface (GUI) specifica toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} -# from the source rpm +# from the source rpm http://motif.ics.com/sites/default/files/openmotif-2.2.4-0.1.src__0.rpm sources = ['open%(name)s-%(version)s.tar.bz2'] -source_urls = [SOURCEFORGE_SOURCE] + patches = [ 'datadir.patch', 'openmotif-2.2.4.diff', 'openmotif22-add_LONG64_define.diff', 'openmotif22-strcmp.diff', 'openmotif-uil.diff', 'openmotif-xpm.diff', 'PrintableString.diff', 'sentinel.diff', 'warn.patch', @@ -36,11 +36,15 @@ builddependencies = [ ('printproto', '1.0.5'), ] +# make has problems with utf8 premakeopts = "LANG=C " + # motif ships a broken automake and libtool -preconfigopts = """rm -f libtool install-sh missing depcomp config.guess config.sub && \ -cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && """ +preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && " +preconfigopts += cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " + configopts = "--enable-shared" + # make is not parallel safe parallel = 1 diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index 73c4d18939..fee15a33e7 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -35,11 +35,17 @@ dependencies = [ ('libXext', '1.3.2'), ] +# make has problems with utf8 premakeopts = "LANG=C " + # motif ships a broken automake and libtool -preconfigopts = """rm -f libtool install-sh missing depcomp config.guess config.sub && \ -cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && """ + +preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && " +preconfigopts += "cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " + configopts = "--enable-shared" + +# make is not parallel safe parallel = 1 sanity_check_paths = { diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb index c34eb6a755..3f9ec34302 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb @@ -20,6 +20,8 @@ dependencies = [ ] preconfigopts = "./autogen.sh && " + # makefile is not parallel safe parallel = 1 + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb index f3f21cb8e6..04c45d219f 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb @@ -20,5 +20,8 @@ dependencies = [ ] preconfigopts = "./autogen.sh && " + +# makefile is not parallel safe parallel = 1 + moduleclass = 'vis' -- GitLab From 3a836bae9e353c9bfacad538b3e5eff472f408d5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 14:14:47 +0100 Subject: [PATCH 160/811] add comment in Sablotron patch file --- .../easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch index 605f59b697..55d1fe909a 100644 --- a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3_recent-icpc.patch @@ -1,3 +1,4 @@ +inspired by https://issues.apache.org/ooo/show_bug.cgi?id=62702 diff -ru /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3.orig/configure /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3/configure --- /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3.orig/configure 2005-06-07 17:29:14.000000000 +0200 +++ /tmp/vsc40023/easybuild_build/Sablotron/1.0.3/ictce-4.1.13/Sablot-1.0.3/configure 2013-11-02 12:18:57.211802268 +0100 -- GitLab From 8c9ff16ee4e33e45abd5c2671822bd32d5fe05d2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 14:21:10 +0100 Subject: [PATCH 161/811] style fixes, get rid of test.pl file that crept in --- easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 1 - easybuild/easyconfigs/p/test.pl | 8 -------- easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb | 3 +-- easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb | 3 +-- 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 easybuild/easyconfigs/p/test.pl diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index fee15a33e7..ef16bf1c13 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -39,7 +39,6 @@ dependencies = [ premakeopts = "LANG=C " # motif ships a broken automake and libtool - preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && " preconfigopts += "cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " diff --git a/easybuild/easyconfigs/p/test.pl b/easybuild/easyconfigs/p/test.pl deleted file mode 100644 index 84d595528c..0000000000 --- a/easybuild/easyconfigs/p/test.pl +++ /dev/null @@ -1,8 +0,0 @@ -use strict; - use Test::More; -use Config; - my $tainted_path = substr($^X,0,0) . "/no/such/file"; - my $err; - # $! is used in a tainted expression, so gets tainted - open my $fh, $tainted_path or $err= "$!"; - unlike($err, qr/^\d+$/, 'tainted $!'); diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb index 423e0c0171..3772668400 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb @@ -2,8 +2,7 @@ name = 'xtrans' version = '1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ - xtrans includes a number of routines to make X implementations transport-independent; +description = """xtrans includes a number of routines to make X implementations transport-independent; at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. """ diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb index 429bb549e4..8b232a5888 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb @@ -2,8 +2,7 @@ name = 'xtrans' version = '1.2' homepage = "http://www.freedesktop.org/wiki/Software/xlibs" -description = """ - xtrans includes a number of routines to make X implementations transport-independent; +description = """xtrans includes a number of routines to make X implementations transport-independent; at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. """ toolchain = {'name': 'ictce', 'version': '4.1.13'} -- GitLab From fa35c31a2b894e2d1526129b4ca5f9e236d54f6b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 14:24:34 +0100 Subject: [PATCH 162/811] fix typo --- easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 355a1a3e21..0b1df3cc17 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -41,7 +41,7 @@ premakeopts = "LANG=C " # motif ships a broken automake and libtool preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && " -preconfigopts += cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " +preconfigopts += "cp $EBROOTAUTOMAKE/share/automake*/* . || cp $EBROOTLIBTOOL/bin/libtool . && " configopts = "--enable-shared" -- GitLab From 934b82230dfe68cb4f32e1810dc687280da9001b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 16:49:31 +0100 Subject: [PATCH 163/811] align ncurses v5.9-20130406 GCC easyconfig with other, fix source specs for MySQLdb --- .../MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb | 3 +-- .../n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb index aff09691b8..6384b73e74 100644 --- a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb @@ -8,8 +8,7 @@ description = """MySQLdb is a Python DB API-2.0-compliant interface; see PEP-249 toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['https://github.com/farcepest/MySQLdb1/archive'] -sources = [SOURCELOWER_TAR_GZ] +sources = [SOURCE_TAR_GZ] python = 'Python' pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb index 1509c39d22..9d8732ce41 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb @@ -9,11 +9,12 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'GCC', 'version': '4.7.2'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['ncurses-5.9.tar.gz'] -source_urls = [ - 'http://ftpmirror.gnu.org/%(name)s', - 'ftp://invisible-island.net/ncurses/5.9', # for patch file below -] -patches = ['ncurses-5.9-20130406.patch.gz'] +# In future, this URL will not be sufficient to obtain this tarball, because +# the directory contains only a couple of older ncurses 5.9 snapshots. +source_urls = ['ftp://invisible-island.net/ncurses/current/'] +sources = ['%(name)s-%(version)s.tgz'] + +# Parallel build contains a race on etip.h, needed for c++/demo.cc. +parallel = 1 moduleclass = 'devel' -- GitLab From 794879f3a9da73c73f925db62142658fe555e4cf Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 16:54:51 +0100 Subject: [PATCH 164/811] git rid of MySQLdb easyconfig, it has missing deps and is not a dep of something else --- ...MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb deleted file mode 100644 index 6384b73e74..0000000000 --- a/easybuild/easyconfigs/m/MySQLdb/MySQLdb-1.2.4-goolf-1.4.10-Python-2.7.3.eb +++ /dev/null @@ -1,25 +0,0 @@ -easyblock = "PythonPackage" - -name = 'MySQLdb' -version = '1.2.4' - -homepage = 'https://github.com/farcepest/MySQLdb1' -description = """MySQLdb is a Python DB API-2.0-compliant interface; see PEP-249 for details.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -sources = [SOURCE_TAR_GZ] - -python = 'Python' -pythonversion = '2.7.3' -pythonshortversion = '.'.join(pythonversion.split('.')[:-1]) - -versionsuffix = "-%s-%s" % (python, pythonversion) - -dependencies = [ - (python, pythonversion), - ('zlib', '1.2.7'), - ('OpenSSL', '1.0.0'), -] - -moduleclass = "data" -- GitLab From 1159e7de8434b09832527bbfa401cb9eaf23bf0a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 17:02:50 +0100 Subject: [PATCH 165/811] add libXmu dependency for motif --- easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 1 + easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 1 + 2 files changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 0b1df3cc17..585d47bd59 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -30,6 +30,7 @@ dependencies = [ ('libXp', '1.0.2'), ('libX11', '1.6.1'), ('libXext', '1.3.2'), + ('libXmu', '1.1.2'), ] builddependencies = [ diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index ef16bf1c13..3edf92d5c4 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -33,6 +33,7 @@ dependencies = [ ('libXp', '1.0.2'), ('libX11', '1.6.1'), ('libXext', '1.3.2'), + ('libXmu', '1.1.2'), ] # make has problems with utf8 -- GitLab From e10f283e6202b57c4a8298cb0ed4234da9c91685 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 17:32:02 +0100 Subject: [PATCH 166/811] add extra patch file to motif 2.2.4 easyconfig to fix prototype error, style fixes --- .../m/motif/motif-2.2.4-goolf-1.4.10.eb | 15 +++++-- .../m/motif/motif-2.2.4-ictce-4.1.13.eb | 14 ++++++- .../motif/motif-2.2.4_libXmu-prototypes.patch | 42 +++++++++++++++++++ 3 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 easybuild/easyconfigs/m/motif/motif-2.2.4_libXmu-prototypes.patch diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 585d47bd59..ca45f741c4 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -10,13 +10,22 @@ description = """Motif refers to both a graphical user interface (GUI) specifica toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} -# from the source rpm http://motif.ics.com/sites/default/files/openmotif-2.2.4-0.1.src__0.rpm +# from the source RPM http://motif.ics.com/sites/default/files/openmotif-2.2.4-0.1.src__0.rpm sources = ['open%(name)s-%(version)s.tar.bz2'] +# most patch files are obtained from source RPM patches = [ - 'datadir.patch', 'openmotif-2.2.4.diff', 'openmotif22-add_LONG64_define.diff', 'openmotif22-strcmp.diff', - 'openmotif-uil.diff', 'openmotif-xpm.diff', 'PrintableString.diff', 'sentinel.diff', 'warn.patch', + 'datadir.patch', + 'openmotif-2.2.4.diff', + 'openmotif22-add_LONG64_define.diff', + 'openmotif22-strcmp.diff', + 'openmotif-uil.diff', + 'openmotif-xpm.diff', + 'PrintableString.diff', + 'sentinel.diff', + 'warn.patch', 'XmResizeHashTable.patch', + 'motif-2.2.4_libXmu-prototypes.patch', ] dependencies = [ diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index 3edf92d5c4..7957f4dc3a 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -12,10 +12,20 @@ toolchainopts = {'optarch': True, 'pic': True} # from the source rpm http://motif.ics.com/sites/default/files/openmotif-2.2.4-0.1.src__0.rpm sources = ['open%(name)s-%(version)s.tar.bz2'] + +# most patch files are obtained from source RPM patches = [ - 'datadir.patch', 'openmotif-2.2.4.diff', 'openmotif22-add_LONG64_define.diff', 'openmotif22-strcmp.diff', - 'openmotif-uil.diff', 'openmotif-xpm.diff', 'PrintableString.diff', 'sentinel.diff', 'warn.patch', + 'datadir.patch', + 'openmotif-2.2.4.diff', + 'openmotif22-add_LONG64_define.diff', + 'openmotif22-strcmp.diff', + 'openmotif-uil.diff', + 'openmotif-xpm.diff', + 'PrintableString.diff', + 'sentinel.diff', + 'warn.patch', 'XmResizeHashTable.patch', + 'motif-2.2.4_libXmu-prototypes.patch', ] builddependencies = [ diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4_libXmu-prototypes.patch b/easybuild/easyconfigs/m/motif/motif-2.2.4_libXmu-prototypes.patch new file mode 100644 index 0000000000..ff030c5cdd --- /dev/null +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4_libXmu-prototypes.patch @@ -0,0 +1,42 @@ +based on http://bugzillafiles.novell.org/attachment.cgi?id=553093 obtained via http://lists.opensuse.org/opensuse-bugs/2013-08/msg01273.html +--- openmotif-2.2.4/lib/Xm/EditresCom.c.orig 2013-11-02 17:17:01.964238060 +0100 ++++ openmotif-2.2.4/lib/Xm/EditresCom.c 2013-11-02 17:22:54.975419721 +0100 +@@ -147,15 +147,23 @@ + + static Globals globals; + +-static void SendFailure(), SendCommand(), InsertWidget(), ExecuteCommand(); +-static void FreeEvent(), ExecuteSetValues(), ExecuteGetGeometry(); +-static void ExecuteGetResources(); ++static void SendFailure(Widget w,Atom sel,ResIdent ident,char * str); ++static void SendCommand(Widget w, Atom sel, ResIdent ident,EditresCommand command,ProtocolStream * stream); ++static void InsertWidget(ProtocolStream * stream, Widget w); ++static void FreeEvent(EditresEvent * event); ++static void ExecuteGetGeometry(Widget w,ProtocolStream * stream); ++static void ExecuteGetResources(Widget w,ProtocolStream * stream); ++static void ExecuteCommand(Widget w,Atom sel,ResIdent ident,EditresEvent * event); ++static void ExecuteSetValues( Widget w,SetValuesEvent * sv_event,WidgetInfo * entry,ProtocolStream * stream,unsigned short * count); ++ + + static void GetCommand(); +-static void LoadResources(); ++static void LoadResources(Widget w); + static Boolean IsChild(); +-static void DumpChildren(); +-static char *DumpWidgets(), *DoSetValues(), *DoFindChild(); ++static void DumpChildren(Widget w, ProtocolStream * stream,unsigned short *count); ++static char *DumpWidgets(Widget w, EditresEvent * event /* UNUSED */, ProtocolStream * stream); ++static char *DoSetValues(); ++static char *DoFindChild(Widget w,EditresEvent * event,ProtocolStream * stream); + static char *DoGetGeometry(), *DoGetResources(), *DumpValues(); + + #ifndef HAVE_XMU_N_COPY_ISO +@@ -1789,7 +1797,7 @@ + void + _XEditResPutString8(stream, str) + ProtocolStream * stream; +-char * str; ++_Xconst char * str; + { + int i, len = strlen(str); + -- GitLab From ef738c6359de24e1583884128b1a7a4b27e24c6e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 17:45:23 +0100 Subject: [PATCH 167/811] collapse motif patch files into one --- .../m/motif/motif-2.2.4-goolf-1.4.10.eb | 679 ++++++- .../m/motif/motif-2.2.4-ictce-4.1.13.eb | 13 +- .../m/motif/motif-2.2.4_various-fixes.patch | 1803 +++++++++++++++++ 3 files changed, 2473 insertions(+), 22 deletions(-) create mode 100644 easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index ca45f741c4..0d499644bc 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -15,17 +15,8 @@ sources = ['open%(name)s-%(version)s.tar.bz2'] # most patch files are obtained from source RPM patches = [ - 'datadir.patch', - 'openmotif-2.2.4.diff', - 'openmotif22-add_LONG64_define.diff', - 'openmotif22-strcmp.diff', - 'openmotif-uil.diff', - 'openmotif-xpm.diff', - 'PrintableString.diff', - 'sentinel.diff', - 'warn.patch', - 'XmResizeHashTable.patch', - 'motif-2.2.4_libXmu-prototypes.patch', + '%(name)s-%(version)s_various-fixes.patch', + '%(name)s-%(version)s_libXmu-prototypes.patch', ] dependencies = [ @@ -64,3 +55,669 @@ sanity_check_paths = { } moduleclass = 'vis' +--- demos/programs/ButtonBox/bboxdemo.c ++++ demos/programs/ButtonBox/bboxdemo.c +@@ -668,4 +668,5 @@ + XtRealizeWidget(top); + + XtAppMainLoop(app); ++ return 0; + } +--- demos/programs/ColorSel/bxutil-c.c ++++ demos/programs/ColorSel/bxutil-c.c +@@ -3471,6 +3471,7 @@ + default: + return -1; + } ++ abort(); + } + + +@@ -3494,6 +3495,7 @@ + default: + return -1; + } ++ abort(); + } + + /* +--- demos/programs/FontSel/fontsel.c ++++ demos/programs/FontSel/fontsel.c +@@ -68,6 +68,7 @@ + * Returns: nothing + * + */ ++void + InitializeDemoForm(Widget form) + { + Widget w; +@@ -119,5 +120,6 @@ + XtRealizeWidget(top); + + XtAppMainLoop(app); ++ return 0; + } + +--- demos/programs/MultiList/bxutil-c.c ++++ demos/programs/MultiList/bxutil-c.c +@@ -3469,6 +3469,7 @@ + } + return (c); + } ++ abort(); + } + + +@@ -3490,6 +3491,7 @@ + mdata->InsideString = !mdata->InsideString; + return (ungetc(c, mdata->stream.file)); + } ++ abort(); + } + + /* +--- demos/programs/Tree/bxutil-c.c ++++ demos/programs/Tree/bxutil-c.c +@@ -3471,6 +3471,7 @@ + default: + return -1; + } ++ abort(); + } + + +@@ -3494,6 +3495,7 @@ + default: + return -1; + } ++ abort(); + } + + /* +--- tools/wml/wmlresolve.c ++++ tools/wml/wmlresolve.c +@@ -69,6 +69,7 @@ + + #if defined(__STDC__) + #include ++#include + #endif + #include + +--- demos/programs/ButtonBox/Makefile.am ++++ demos/programs/ButtonBox/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/ButtonBox ++pkgdatadir = $(datadir)/Xm/ButtonBox + + bin_PROGRAMS = bboxdemo + EXTRA_DIST = Imakefile + bboxdemo_SOURCES = bboxdemo.c +-data_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/ColorSel/Makefile.am ++++ demos/programs/ColorSel/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Color ++pkgdatadir = $(datadir)/Xm/Color + + bin_PROGRAMS = colordemo + colordemo_SOURCES = bxutil-c.c colordemo.c + EXTRA_DIST = Imakefile +-data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Column/Makefile.am ++++ demos/programs/Column/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Column ++pkgdatadir = $(datadir)/Xm/Column + + bin_PROGRAMS = column + column_SOURCES = column.c + EXTRA_DIST = Imakefile Column.ad +-data_DATA = $(EXTRA_DIST) $(column_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(column_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/DropDown/Makefile.am ++++ demos/programs/DropDown/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/DropDown ++pkgdatadir = $(datadir)/Xm/DropDown + + bin_PROGRAMS = dropdown + EXTRA_DIST = DropDown.ad Imakefile + dropdown_SOURCES = dropdown.c +-data_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Exm/app_in_c/Makefile.am ++++ demos/programs/Exm/app_in_c/Makefile.am +@@ -1,10 +1,9 @@ + MAINTAINERCLEANFILES = Makefile.in + +-bindir = ${prefix}/share/Xm/Exm/app_in_c +-datadir = ${prefix}/share/Xm/Exm/app_in_c ++pkgdatadir = $(datadir)/Xm/Exm/app_in_c + + man_MANS = exm_in_c.man +-bin_PROGRAMS = exm_in_c ++pkgdata_PROGRAMS = exm_in_c + exm_in_c_SOURCES = exm_in_c.c + + EXTRA_DIST = exm_in_c.man Imakefile +--- demos/programs/Exm/simple_app/Makefile.am ++++ demos/programs/Exm/simple_app/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-bindir = ${prefix}/share/Xm/Exm/simple_app +-datadir = ${prefix}/share/Xm/Exm/simple_app ++bindir = @datadir@/Xm/Exm/simple_app ++datadir = @datadir@/Xm/Exm/simple_app + + data_DATA = README + man_MANS = simpleDemo.man +--- demos/programs/FontSel/Makefile.am ++++ demos/programs/FontSel/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/fontsel ++pkgdatadir = $(datadir)/Xm/fontsel + + bin_PROGRAMS = fontsel + fontsel_SOURCES = callbacks-c.c creation-c.c fontsel.c fontsel.h + EXTRA_DIST = Imakefile +-data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/IconB/Makefile.am ++++ demos/programs/IconB/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Icon ++pkgdatadir= $(datadir)/Xm/Icon + + EXTRA_DIST = Imakefile small.bm + bin_PROGRAMS = iconbuttondemo + iconbuttondemo_SOURCES = misc.c iconbuttondemo.c +-data_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/MultiList/Makefile.am ++++ demos/programs/MultiList/Makefile.am +@@ -1,13 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/MultiList ++pkgdatadir = $(datadir)/Xm/MultiList + + bin_PROGRAMS = multilist + SUBDIRS = pixmaps + multilist_SOURCES = bxutil-c.c callbacks-c.c creation.c multilist.c \ + extlist.h + EXTRA_DIST = Imakefile +-data_DATA = $(EXTRA_DIST) $(multilist_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(multilist_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/MultiList/pixmaps/Makefile.am ++++ demos/programs/MultiList/pixmaps/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/MultiList/pixmaps ++pkgdatadir = $(datadir)/Xm/MultiList/pixmaps + + EXTRA_DIST = clown.xbm crab.xpm eye.xpm porsche.xpm stopsign.xpm +-data_DATA = $(EXTRA_DIST) ++pkgdata_DATA = $(EXTRA_DIST) +--- demos/programs/Outline/Makefile.am ++++ demos/programs/Outline/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Outline ++pkgdatadir = $(datadir)/Xm/Outline + + EXTRA_DIST = Imakefile + bin_PROGRAMS = outline + outline_SOURCES = outline.c +-data_DATA = $(outline_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(outline_SOURCES) $(EXTRA_DIST) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Paned/Makefile.am ++++ demos/programs/Paned/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Paned2 ++pkgdatadir = $(datadir)/Xm/Paned2 + + EXTRA_DIST = Imakefile + bin_PROGRAMS = paned + paned_SOURCES = creation-c.c paned.c +-data_DATA = $(EXTRA_DIST) $(paned_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(paned_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/TabStack/Makefile.am ++++ demos/programs/TabStack/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Tabstack ++pkgdatadir = $(datadir)/Xm/Tabstack + + bin_PROGRAMS = tabstack + tabstack_SOURCES = bxutils.c callbacks.c creation.c main.c creation.h + EXTRA_DIST = Imakefile +-data_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/Tree/Makefile.am ++++ demos/programs/Tree/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Tree ++pkgdatadir = $(datadir)/Xm/Tree + + EXTRA_DIST = Imakefile + bin_PROGRAMS = tree + tree_SOURCES = bxutil-c.c tree.c +-data_DATA = $(EXTRA_DIST) $(tree_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(tree_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/airport/Makefile.am ++++ demos/programs/airport/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/airport ++pkgdatadir = $(datadir)/Xm/airport + + bin_PROGRAMS = airport + airport_SOURCES = main.c dragsource.c dropsite.c airport.h \ + dragsource.h dropsite.h main.h + EXTRA_DIST = Imakefile XmdAirport.ad README +-data_DATA = $(airport_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(airport_SOURCES) $(EXTRA_DIST) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/animate/Makefile.am ++++ demos/programs/animate/Makefile.am +@@ -1,6 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/animate ++pkgdatadir = $(datadir)/Xm/animate ++uiddir = $(datadir)/X11/uid + + EXTRA_DIST = dog.uil plane.uil superman.uil xmanimate.uil \ + superman1.xbm superman2.xbm superman3.xbm superman4.xbm \ +@@ -11,8 +12,8 @@ + + CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid + +-data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ +- $(EXTRA_DIST) ++pkgdata_DATA = $(xmanimate_SOURCES) $(EXTRA_DIST) ++uid_DATA = dog.uid plane.uid superman.uid xmanimate.uid + + bin_PROGRAMS = xmanimate + +--- demos/programs/draw/Makefile.am ++++ demos/programs/draw/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/draw ++pkgdatadir = $(datadir)/Xm/draw + + bin_PROGRAMS = draw + draw_SOURCES = draw.c + EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man +-data_DATA = $(EXTRA_DIST) $(draw_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(draw_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/earth/Makefile.am ++++ demos/programs/earth/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/earth ++pkgdatadir = $(datadir)/Xm/earth + + bin_PROGRAMS = earth + earth_SOURCES = earth.c + EXTRA_DIST = terre.xbm earth.man Imakefile README +-data_DATA = $(EXTRA_DIST) $(earth_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(earth_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/filemanager/Makefile.am ++++ demos/programs/filemanager/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/filemanager ++pkgdatadir = $(datadir)/Xm/filemanager + + bin_PROGRAMS = filemanager + filemanager_SOURCES = filemanager.c actions.c readdir.c convert.c \ +@@ -9,7 +9,7 @@ + Imakefile code.xpm dir.xpm exec.xpm file.xpm none.xpm \ + obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \ + s_none.xpm s_pix.xpm +-data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} + +--- demos/programs/fileview/Makefile.am ++++ demos/programs/fileview/Makefile.am +@@ -1,12 +1,14 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/fileview ++pkgdatadir = $(datadir)/Xm/fileview ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = fileview + fileview_SOURCES = main.c text.c file.c file.h fileE.h fileview.h main.h \ + mainE.h text.h textE.h + EXTRA_DIST = $(UILS) English.df French.df German.df README Fileview.ad +-data_DATA = French.uid German.uid English.uid $(fileview_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(fileview_SOURCES) $(EXTRA_DIST) ++uid_DATA = French.uid German.uid English.uid + + UILS= French.uil German.uil English.uil + +--- demos/programs/getsubres/Makefile.am ++++ demos/programs/getsubres/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/getsubres ++pkgdatadir = $(datadir)/Xm/getsubres + + bin_PROGRAMS = getsubres + EXTRA_DIST = getsubres.help getsubres.man README Imakefile + getsubres_SOURCES = getsubres.c +-data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/hellomotif/Makefile.am ++++ demos/programs/hellomotif/Makefile.am +@@ -1,11 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/hellomotif ++pkgdatadir = $(datadir)/Xm/hellomotif ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = hellomotif + EXTRA_DIST = hellomotif.uil Imakefile README + hellomotif_SOURCES = hellomotif.c +-data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid ++pkgdata_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) ++uid_DATA = hellomotif.uid + LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} + +--- demos/programs/hellomotifi18n/Makefile.am ++++ demos/programs/hellomotifi18n/Makefile.am +@@ -1,13 +1,15 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/helloint ++pkgdatadir = $(datadir)/Xm/helloint ++uiddir = $(datadir)/X11/uid + + SUBDIRS = C english french hebrew japan japanese swedish + EXTRA_DIST = README helloint.uil Imakefile helloint.man + CLEANFILES = helloint.uid + helloint_SOURCES = helloint.c + bin_PROGRAMS = helloint +-data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid ++pkgdata_DATA = $(EXTRA_DIST) $(helloint_SOURCES) ++uid_DATA = helloint.uid + helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid + + INCLUDES = -I$(top_srcdir)/lib ${X_CFLAGS} +--- demos/programs/i18ninput/Makefile.am ++++ demos/programs/i18ninput/Makefile.am +@@ -1,12 +1,12 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/i18ninput ++pkgdatadir = $(datadir)/Xm/i18ninput + + bin_PROGRAMS = i18ninput + i18ninput_SOURCES = i18ninput.c input.c + EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help \ + Imakefile +-data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/panner/Makefile.am ++++ demos/programs/panner/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/panner ++pkgdatadir = $(datadir)/Xm/panner + + bin_PROGRAMS = panner + panner_SOURCES = panner.c + EXTRA_DIST = README panner.man Imakefile +-data_DATA = $(EXTRA_DIST) $(panner_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(panner_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/periodic/Makefile.am ++++ demos/programs/periodic/Makefile.am +@@ -1,11 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/periodic ++pkgdatadir = $(datadir)/Xm/periodic ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = periodic + EXTRA_DIST = periodic.uil periodic_l.uil XmdPeriodic.ad Imakefile README + periodic_SOURCES = periodic.c +-data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid ++pkgdata_DATA = $(EXTRA_DIST) $(periodic_SOURCES) ++uid_DATA = periodic.uid + LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/piano/Makefile.am ++++ demos/programs/piano/Makefile.am +@@ -1,12 +1,12 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/piano ++pkgdatadir = $(datadir)/Xm/piano + + bin_PROGRAMS = piano + piano_SOURCES = piano.c + EXTRA_DIST = piano.images README Inv8_part1.piano Inv8_part2.piano \ + piano.man Imakefile +-data_DATA = $(EXTRA_DIST) $(piano_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(piano_SOURCES) + LDADD = ../../../lib/Xm/libXm.la -lm + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/pixmaps/Makefile.am ++++ demos/programs/pixmaps/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/pixmaps ++pkgdatadir = $(datadir)/Xm/pixmaps + + EXTRA_DIST = crab.xpm eye.xpm porsche.xpm stopsign.xpm clown.xbm + +-data_DATA = $(EXTRA_DIST) ++pkgdata_DATA = $(EXTRA_DIST) +--- demos/programs/popups/Makefile.am ++++ demos/programs/popups/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/autopopups ++pkgdatadir = $(datadir)/Xm/autopopups + + bin_PROGRAMS = autopopups + autopopups_SOURCES = autopopups.c + EXTRA_DIST = README autopopups.man Imakefile +-data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/sampler2_0/Makefile.am ++++ demos/programs/sampler2_0/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/sampler2_0 ++pkgdatadir = $(datadir)/Xm/sampler2_0 + + EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ + labir.xpm main.xpm pile.xpm prev.xpm spir.xpm stack.xpm \ +@@ -8,7 +8,7 @@ + XmdSampler2_0.ad + bin_PROGRAMS = sampler2_0 + sampler2_0_SOURCES = sampler2_0.c +-data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/setdate/Makefile.am ++++ demos/programs/setdate/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/setDate ++pkgdatadir = $(datadir)/Xm/setDate + + bin_PROGRAMS = setDate + EXTRA_DIST = XmdSetDate.ad README setDate.man Imakefile + setDate_SOURCES = setDate.c +-data_DATA = $(EXTRA_DIST) $(setDate_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(setDate_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/todo/Makefile.am ++++ demos/programs/todo/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/todo ++pkgdatadir = $(datadir)/Xm/todo + + EXTRA_DIST = README XmdTodo.ad example.todo todo.man todo.help Imakefile + bin_PROGRAMS = todo + todo_SOURCES = todo.c io.c actions.c page.h +-data_DATA = $(EXTRA_DIST) $(todo_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(todo_SOURCES) + + INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} + LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la +--- demos/programs/tooltips/Makefile.am ++++ demos/programs/tooltips/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/tooltips ++pkgdatadir = $(datadir)/Xm/tooltips + + EXTRA_DIST = Imakefile + bin_PROGRAMS = tooltips + tooltips_SOURCES = tooltips.c +-data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/workspace/Makefile.am ++++ demos/programs/workspace/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/wsm ++pkgdatadir = $(datadir)/Xm/wsm + + EXTRA_DIST = Imakefile README wsm.man + bin_PROGRAMS = wsm +@@ -8,6 +8,6 @@ + wsmSend.c wsmStruct.c wsm_cb.c wsm_create.c xrmLib.c \ + command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \ + wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h +-data_DATA = $(wsm_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(wsm_SOURCES) $(EXTRA_DIST) + INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} + LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm +--- lib/Xm/Hash.c ++++ lib/Xm/Hash.c +@@ -198,6 +198,8 @@ + } else { + table -> buckets[index] = current; + } ++ } else { ++ last = current; + } + current = next; + } +--- Makefile.in.orig 2004-10-13 19:58:10.000000000 +0200 ++++ Makefile.in 2013-08-02 12:20:30.518131626 +0200 +@@ -405,7 +405,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ ++mkdir_p = mkdir -p -- . + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index 7957f4dc3a..2e3fc1ae9f 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -15,17 +15,8 @@ sources = ['open%(name)s-%(version)s.tar.bz2'] # most patch files are obtained from source RPM patches = [ - 'datadir.patch', - 'openmotif-2.2.4.diff', - 'openmotif22-add_LONG64_define.diff', - 'openmotif22-strcmp.diff', - 'openmotif-uil.diff', - 'openmotif-xpm.diff', - 'PrintableString.diff', - 'sentinel.diff', - 'warn.patch', - 'XmResizeHashTable.patch', - 'motif-2.2.4_libXmu-prototypes.patch', + '%(name)s-%(version)s_various-fixes.patch', + '%(name)s-%(version)s_libXmu-prototypes.patch', ] builddependencies = [ diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch b/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch new file mode 100644 index 0000000000..6a8e75f5b7 --- /dev/null +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch @@ -0,0 +1,1803 @@ +this patch file is a concatenation of various patches for motif-2.2.4, obtained from the source RPM +the following patch files are included in here: +PrintableString.diff openmotif-2.2.4.diff openmotif-uil.diff openmotif-xpm.diff openmotif22-add_LONG64_define.diff +openmotif22-strcmp.diff sentinel.diff warn.patch datadir.patch XmResizeHashTable.patch mkdir.patch +--- lib/Xm/TextF.c ++++ lib/Xm/TextF.c +@@ -3723,15 +3723,15 @@ + cache_ptr = tmp = XmStackAlloc(buf_size, cache); + + tmp_str = (wchar_t *)str; +- ret_val = wctomb(tmp, *tmp_str); ++ ret_val = 0; + count = 0; +- while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) ++ while (count < n && buf_size >= MB_CUR_MAX && ++ (ret_val = wctomb(tmp, *tmp_str)) > 0) + { + count += 1; + tmp += ret_val; + buf_size -= ret_val; + tmp_str++; +- ret_val = wctomb(tmp, *tmp_str); + } + + if (ret_val == -1) /* bad character */ +--- Makefile.am ++++ Makefile.am +@@ -28,6 +28,5 @@ + include \ + tools \ + clients \ +- doc \ +- demos +-AUTOMAKE_OPTIONS = 1.4 ++ doc ++AUTOMAKE_OPTIONS = 1.4 foreign +--- clients/uil/Makefile.am ++++ clients/uil/Makefile.am +@@ -6,7 +6,7 @@ + # + bin_PROGRAMS = uil + +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++libUil_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + + UilParser.lo: UilParser.c + $(LTCOMPILE) -DCALLABLE -c UilParser.c +@@ -42,7 +42,7 @@ + UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c + + SRCS = $(COMMON_SRC) +-SRCS2 = $(COMMON_SRC) UilMain.c ++SRCS2 = UilMain.c + + HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ + UilDef.h XmAppl.uil +@@ -72,6 +72,7 @@ + $(LN_S) $(srcdir)/../../tools/wml/UilDBDef.h UilDBDef.h + + uil_SOURCES = $(SRCS2) ++uil_LDADD += libUil.la + + if MessageCatalog + +--- config/cf/Imake.cf ++++ config/cf/Imake.cf +@@ -570,6 +570,9 @@ + # ifdef i386 + # define i386Architecture + # undef i386 ++# undef i486 ++# undef i586 ++# undef i686 + # endif /* i386 */ + # ifdef __i386__ + # ifndef i386Architecture +@@ -593,6 +596,32 @@ + # define PowerPCArchitecture + # undef powerpc + # endif ++# ifdef __s390__ ++# define s390Architecture ++# undef __s390__ ++# endif ++# ifdef __s390x__ ++# define s390xArchitecture ++# undef __s390x__ ++# endif ++# ifdef __x86_64__ ++# define x86_64Architecture ++# undef __x86_64__ ++# endif ++# ifdef mips ++# define MipsArchitecture ++# undef mips ++# endif ++# ifdef sparc ++# define SparcArchitecture ++# undef sparc ++# endif ++# ifdef __sparc__ ++# ifndef SparcArchitecture ++# define SparcArchitecture ++# endif ++# undef __sparc__ ++# endif + # if defined(arm) || defined(__arm__) + # define ArmArchitecture + # undef arm +@@ -607,6 +636,10 @@ + # undef __ARM_ARCH_3__ + # endif + # endif ++# ifdef __ia64__ ++# define ia64Architecture ++# undef __ia64__ ++# endif /* __ia64__ */ + #endif /* linux */ + + #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) +--- config/cf/Imake.tmpl ++++ config/cf/Imake.tmpl +@@ -502,14 +502,18 @@ + #define DefaultUsrBin /usr/bin + #endif + ++#ifndef LibDirName ++# define LibDirName lib ++#endif ++ + #ifndef UsrLibDir + #ifdef ProjectRoot +-#define UsrLibDir Concat(ProjectRoot,/lib) ++#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir /usr/lib ++#define UsrLibDir Concat(/usr/,LibDirName) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +--- config/cf/linux.cf ++++ config/cf/linux.cf +@@ -41,8 +41,9 @@ + /* Set some defaults for the Default* values in case imake doesn't find them */ + #ifndef DefaultLinuxCLibMajorVersion + #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ +- defined(SparcArchitecture) || defined(ArmArchitecure) || \ +- defined(i386Architecture) ++ defined(SparcArchitecture) || defined(ArmArchitecure) || defined(MipsArchitecure) || \ ++ defined(i386Architecture) || defined(ia64Architecture) || defined(s390Architecture) || \ ++ defined(s390xArchitecture) || defined(x86_64Architecture) + #define DefaultLinuxCLibMajorVersion 6 + #else + #define DefaultLinuxCLibMajorVersion 5 +@@ -159,7 +160,24 @@ + #define UseStaticTermcapLib NO + #endif + ++#ifndef HaveLib64 ++# if defined (x86_64Architecture) || defined (s390xArchitecture) ++# define HaveLib64 YES ++# else ++# define HaveLib64 NO ++# endif ++#endif ++ + #define MkdirHierCmd mkdir -p ++ ++#ifndef HaveLib64 ++# if defined (x86_64Architecture) || defined (s390xArchitecture) ++# define HaveLib64 YES ++# else ++# define HaveLib64 NO ++# endif ++#endif ++ + #if LinuxElfDefault + #if UseElfFormat + #define CcCmd gcc +@@ -234,7 +252,7 @@ + #endif + #define CppCmd /lib/cpp + #ifdef USE_BYACC +-#define YaccCmd byacc ++#define YaccCmd yacc + #else + #define YaccCmd bison -y + #endif +@@ -261,6 +279,35 @@ + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 + #endif /* AlphaArchitecture */ + ++#ifdef s390xArchitecture ++#define DefaultCCOptions -fsigned-char ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__s390x__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#else ++#ifdef s390Architecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__s390__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#endif /* s390Architecture */ ++#endif /* s390xArchitecture */ ++ ++#ifdef ia64Architecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__ia64__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* ia64Architecture */ ++ ++#ifdef x86_64Architecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__x86_64__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* ia64Architecture */ ++ + #ifdef Mc68020Architecture + #define OptimizedCDebugFlags -O2 + #define LinuxMachineDefines -D__mc68000__ +@@ -276,6 +323,14 @@ + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines + #endif /* PowerPCArchitecture */ + ++#ifdef MipsArchitecture ++#define DefaultCCOptions -fsigned-char ++#define OptimizedCDebugFlags -O2 -mips2 ++#define LinuxMachineDefines -D__mips__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#endif /* MipsArchitecture */ ++ + #ifdef ArmArchitecture + #define DefaultCCOptions -fsigned-char + #define OptimizedCDebugFlags -O2 +@@ -284,6 +339,19 @@ + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines + #endif /* Arm */ + ++#ifdef SparcArchitecture ++#define OptimizedCDebugFlags -O2 ++#define LinuxMachineDefines -D__sparc__ ++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET ++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#define AsVISOption -Av9a ++#ifdef Sparc64Architecture ++#define AsOutputArchSize 64 ++#else ++#define AsOutputArchSize 32 ++#endif ++#endif ++ + #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines + + #ifndef TermcapLibrary +@@ -348,5 +416,11 @@ + #define MakeNamedTargetSubdir(dir,flags,subname)\ + $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname + ++#if HaveLib64 ++# ifndef LibDirName ++# define LibDirName lib64 ++# endif ++#endif ++ + #include + #include +--- config/imake/imakemdep.h ++++ config/imake/imakemdep.h +@@ -333,6 +333,18 @@ + # ifdef __i386__ + "-D__i386__", + # endif ++# ifdef __ia64__ ++ "-D__ia64__", ++# endif ++# ifdef __s390__ ++ "-D__s390__", ++# endif ++# ifdef __s390x__ ++ "-D__s390x__", ++# endif ++# ifdef __x86_64__ ++ "-D__x86_64__", ++# endif + # ifdef __sparc__ + "-D__sparc__", + # endif +@@ -936,6 +948,18 @@ + #ifdef __alpha__ + {"__alpha__", "1"}, + #endif ++#ifdef __ia64__ ++ {"__ia64__", "1"}, ++#endif ++#ifdef __x86_64__ ++ {"__x86_64__", "1"}, ++#endif ++#ifdef __s390__ ++ {"__s390__", "1"}, ++#endif ++#ifdef __s390x__ ++ {"__s390x__", "1"}, ++#endif + #ifdef __DECC + {"__DECC", "1"}, + #endif +--- configure.in ++++ configure.in +@@ -53,12 +53,13 @@ + save_CFLAGS="$CFLAGS" + LIBS="$X_LIBS $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" +-AC_CHECK_HEADERS(X11/Xmu/Editres.h, +-AC_CHECK_LIB(Xmu, _XEditResCheckMessages, ++AC_CHECK_HEADERS(X11/Xmu/Editres.h, [ ++AC_CHECK_LIB(Xmu, _XEditResCheckMessages, [ + X_XMU=-lXmu +-AC_DEFINE(HAVE_LIBXMU) +-, X_XMU="", -lXt -lX11) +-) ++AC_DEFINE(HAVE_LIBXMU, 1, [ ]) ++], X_XMU="", -lXt -lX11) ++], [], ++[#include ]) + AC_SUBST(X_XMU) + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +@@ -140,8 +141,8 @@ + AC_HEADER_STDC + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/malloc.h strings.h sys/file.h sys/time.h unistd.h wchar.h) +-AC_CHECK_HEADERS(wctype.h, AC_DEFINE(HAS_WIDECHAR_FUNCTIONS)) +-AC_CHECK_HEADER(langinfo.h,,AC_DEFINE(CSRG_BASED)) ++AC_CHECK_HEADERS(wctype.h, [AC_DEFINE(HAS_WIDECHAR_FUNCTIONS, 1, [Define if wctype.h is available])]) ++AC_CHECK_HEADER(langinfo.h,,[AC_DEFINE(CSRG_BASED, 1, [ ])]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +@@ -164,23 +165,23 @@ + AC_FUNC_VPRINTF + AM_FUNC_VOID_SPRINTF + AC_CHECK_FUNCS(wcslen wcscpy wcsncpy wcschr wcscat wcsncat getcwd gettimeofday mkdir re_comp regcmp select strcspn strerror strstr strtod strtol uname) +-AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP)) +-AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP)) +-AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV)) +-AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP)) +-AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE)) ++AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP, 1, [ ])) ++AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP, 1, [ ])) ++AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV, 1, [ ])) ++AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP, 1, [ ])) ++AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE, 1, [ ])) + + AC_ARG_ENABLE(message-catalog, [ --enable-message-catalog + Enable building of the message catalog (default=no)]) + if test "$enable_message_catalog" != "yes" + then +- AC_DEFINE(NO_MESSAGE_CATALOG) ++ AC_DEFINE(NO_MESSAGE_CATALOG, 1, [define to avoid building the message catalog]) + fi + AM_CONDITIONAL(MessageCatalog, test x$enable_message_catalog = xyes) + + if test -f $srcdir/lib/Xm/SlideC.h + then +- AC_DEFINE(HAVE_SLIDEC_H) ++ AC_DEFINE(HAVE_SLIDEC_H, 1, [ ]) + SLIDE_DIST="SlideC.c SlideC.h SlideCP.h" + fi + AC_SUBST(SLIDE_DIST) +@@ -190,7 +191,7 @@ + then + CFLAGS="$CFLAGS -Wall -Wno-unused -Wno-comment" + fi +-AC_DEFINE(NO_OL_COMPAT) ++AC_DEFINE(NO_OL_COMPAT, 1, [Define to disable OpenLook compatibility]) + + CDE_INSTALLATION_TOP="\${prefix}/dt" + AC_SUBST(CDE_INSTALLATION_TOP) +@@ -198,13 +199,13 @@ + CDE_CONFIGURATION_TOP="\${prefix}/etc/dt" + AC_SUBST(CDE_CONFIGURATION_TOP) + +-LIBDIR="${libdir}/X11" ++LIBDIR="${datadir}/X11" + AC_SUBST(LIBDIR) + + INCDIR="${includedir}/X11" + AC_SUBST(INCDIR) + +-XMBINDDIR_FALLBACK="${libdir}/X11/bindings" ++XMBINDDIR_FALLBACK="${datadir}/X11/bindings" + AC_SUBST(XMBINDDIR_FALLBACK) + + case "$target_os" in +--- demos/programs/Column/column.c ++++ demos/programs/Column/column.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + + #define phone_width 16 +--- demos/programs/DropDown/dropdown.c ++++ demos/programs/DropDown/dropdown.c +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + static int done = 0; + +--- demos/programs/getsubres/getsubres.c ++++ demos/programs/getsubres/getsubres.c +@@ -384,7 +384,8 @@ + } + + static String fallbacks[] = { +- "*help_manager.helpFile: getsubres" ++ "*help_manager.helpFile: getsubres", ++ NULL + }; + + #define APP_CLASS "XmdGetsubres" +--- lib/Mrm/Makefile.am ++++ lib/Mrm/Makefile.am +@@ -8,7 +8,7 @@ + + libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} + +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + + lib_LTLIBRARIES = libMrm.la + +--- lib/Mrm/MrmIheader.c ++++ lib/Mrm/MrmIheader.c +@@ -226,12 +226,7 @@ + file_id, NULL, MrmNOT_VALID); + } + +- { +- /* sscanf() may call ungetc(), which would write the XmConst string. */ +- char buf[XtNumber(idb__database_version) + 1]; +- strcpy(buf, idb__database_version); +- sscanf(buf, "URM %d.%d", &db_major, &db_minor); +- } ++ sscanf(idb__database_version, "URM %d.%d", &db_major, &db_minor); + + if ((file_major > db_major) || + ((file_major == db_major) && (file_minor > db_minor))) +--- lib/Mrm/MrmItop.c ++++ lib/Mrm/MrmItop.c +@@ -642,10 +642,12 @@ + * Local variables + */ + Cardinal result ; /* function results */ ++ IDBResource resource_id; + + if ( (result=Idb__FIL_Valid((IDBFile)file_id)) != MrmSUCCESS ) return result ; + result = Idb__RID_NextRID ((IDBFile)file_id, +- (IDBResource *)resource_id_return) ; ++ &resource_id) ; ++ *resource_id_return = resource_id; + return result ; + + } +--- lib/Xm/EditresCom.c ++++ lib/Xm/EditresCom.c +@@ -1772,7 +1772,7 @@ + XtFree((char *)widget_list); + } + +-#if 0 ++#if 1 + /************************************************************ + * + * All of the following routines are public. +@@ -1923,7 +1923,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGet8(stream, val) + ProtocolStream * stream; + unsigned char * val; +@@ -1943,7 +1943,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGet16(stream, val) + ProtocolStream * stream; + unsigned short * val; +@@ -1964,7 +1964,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGetSigned16(stream, val) + ProtocolStream * stream; + short * val; +@@ -1993,7 +1993,7 @@ + * Returns: TRUE if sucessful. + */ + +-Boolean ++Bool + _XEditResGet32(stream, val) + ProtocolStream * stream; + unsigned long * val; +@@ -2015,7 +2015,7 @@ + * Returns: True if retrieval was successful. + */ + +-Boolean ++Bool + _XEditResGetString8(stream, str) + ProtocolStream * stream; + char ** str; +@@ -2048,7 +2048,7 @@ + * Returns: True if retrieval was successful. + */ + +-Boolean ++Bool + _XEditResGetWidgetInfo(stream, info) + ProtocolStream * stream; + WidgetInfo * info; +--- lib/Xm/FontS.c ++++ lib/Xm/FontS.c +@@ -2865,7 +2865,7 @@ + + XmFontS_use_scaling(fsw) = info->set; + if (!info->set) { +- Boolean map_bad = (map = SizeMapping(cf->point_size) == 0); ++ Boolean map_bad = (map = SizeMapping(cf->point_size)) == 0; + Boolean bad_75 = (CheckFlag(XmFontS_user_state(fsw), DPI_75) && + !CheckLongFlag(family->sizes_75, map)); + Boolean bad_100 = (CheckFlag(XmFontS_user_state(fsw), DPI_100) && +--- lib/Xm/Makefile.am ++++ lib/Xm/Makefile.am +@@ -9,7 +9,7 @@ + ${X_CFLAGS} + xmdir = $(includedir)/Xm + +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + + lib_LTLIBRARIES = libXm.la + +--- lib/Xm/Resolve.c ++++ lib/Xm/Resolve.c +@@ -149,11 +149,11 @@ + * Update the part size value (initially, it is the size of this part) + */ + w_class->core_class.widget_size = +- _ALIGN(w_class->core_class.widget_size) + super->core_class.widget_size; ++ _ALIGN(w_class->core_class.widget_size) + _ALIGN(super->core_class.widget_size); + if (cc && scc) + cc->constraint_class.constraint_size = + _ALIGN(cc->constraint_class.constraint_size) + +- scc->constraint_class.constraint_size; ++ _ALIGN(scc->constraint_class.constraint_size); + + /* + * Count the number of superclasses and allocate the offset record(s) +@@ -186,7 +186,7 @@ + scc = (ConstraintWidgetClass)(scc->core_class.superclass), i--) + if (IsConstraintClass((WidgetClass)scc)) + (*constraint_offset)[i] = +- scc->constraint_class.constraint_size; ++ _ALIGN(scc->constraint_class.constraint_size); + else + (*constraint_offset)[i] = 0; + +--- lib/Xm/XmRenderT.c ++++ lib/Xm/XmRenderT.c +@@ -1461,6 +1461,7 @@ + else { + union { + long longval; ++ int intval; + short shortval; + char charval; + char* charptr; +@@ -1468,6 +1469,7 @@ + } u; + char *p = (char*)&u; + if (size == sizeof(long)) u.longval = (long)src; ++ else if (size == sizeof(int)) u.longval = (int)src; + else if (size == sizeof(short)) u.shortval = (short)src; + else if (size == sizeof(char)) u.charval = (char)src; + else if (size == sizeof(XtPointer)) u.ptr = (XtPointer)src; +@@ -1486,6 +1488,7 @@ + * but preserve for compatibility as long as arglist contains NULL. + */ + if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src; ++ else if (size == sizeof(int)) *dst = (XtArgVal)*(int*)src; + else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src; + else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src; + else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src; +@@ -1496,6 +1499,7 @@ + else { + /* proper GetValues semantics: argval is pointer to destination */ + if (size == sizeof(long)) *((long*)*dst) = *(long*)src; ++ else if (size == sizeof(int)) *((int*)*dst) = *(int*)src; + else if (size == sizeof(short)) *((short*)*dst) = *(short*)src; + else if (size == sizeof(char)) *((char*)*dst) = *(char*)src; + else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src; +--- localized/util/mkcatdefs.c ++++ localized/util/mkcatdefs.c +@@ -76,9 +76,8 @@ + #include + #include + +-#ifndef NL_TEXTMAX ++#undef NL_TEXTMAX + #define NL_TEXTMAX 8192 +-#endif + + #ifndef PATH_MAX + #define PATH_MAX 1024 +--- clients/uil/UilDiags.c ++++ clients/uil/UilDiags.c +@@ -207,9 +207,9 @@ + va_list ap; /* ptr to variable length parameter */ + int severity; /* severity of message */ + int message_number; /* message number */ +- char msg_buffer[132]; /* buffer to construct message */ ++ char *msg_buffer = 0; /* buffer to construct message */ + char ptr_buffer[buf_size]; /* buffer to construct pointer */ +- char loc_buffer[132]; /* buffer to construct location */ ++ char *loc_buffer = 0; /* buffer to construct location */ + char src_buffer[buf_size]; /* buffer to hold source line */ + + /* +@@ -293,19 +293,18 @@ + va_start(ap, l_start_column); + + #ifndef NO_MESSAGE_CATALOG +- vsprintf( msg_buffer, ++ vasprintf(&msg_buffer, + catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ], + diag_rz_msg_table[ message_number ].ac_text), + ap ); + #else +- vsprintf( msg_buffer, ++ vasprintf(&msg_buffer, + diag_rz_msg_table[ message_number ].ac_text, + ap ); + #endif + va_end(ap); + + src_buffer[ 0 ] = 0; +- loc_buffer[ 0 ] = 0; + ptr_buffer[ 0 ] = 0; + + if (az_src_rec != diag_k_no_source) +@@ -317,13 +316,13 @@ + */ + + #ifndef NO_MESSAGE_CATALOG +- sprintf( loc_buffer, ++ asprintf(&loc_buffer, + catgets(uil_catd, UIL_SET_MISC, + UIL_MISC_0, "\t\t line: %d file: %s"), + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); + #else +- sprintf( loc_buffer, ++ asprintf(&loc_buffer, + "\t\t line: %d file: %s", + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); +@@ -371,7 +370,7 @@ + + if (l_start_column != diag_k_no_column) + #ifndef NO_MESSAGE_CATALOG +- sprintf(loc_buffer, ++ asprintf(&loc_buffer, + catgets(uil_catd, UIL_SET_MISC, + UIL_MISC_1, + "\t\t line: %d position: %d file: %s"), +@@ -379,7 +378,7 @@ + l_start_column + 1, + src_get_file_name( az_src_rec ) ); + #else +- sprintf(loc_buffer, ++ asprintf(&loc_buffer, + "\t\t line: %d position: %d file: %s", + az_src_rec->w_line_number, + l_start_column + 1, +@@ -387,13 +386,13 @@ + #endif + else + #ifndef NO_MESSAGE_CATALOG +- sprintf( loc_buffer, catgets(uil_catd, UIL_SET_MISC, ++ asprintf(&loc_buffer, catgets(uil_catd, UIL_SET_MISC, + UIL_MISC_0, + "\t\t line: %d file: %s"), + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); + #else +- sprintf( loc_buffer, ++ asprintf(&loc_buffer, + "\t\t line: %d file: %s", + az_src_rec->w_line_number, + src_get_file_name( az_src_rec ) ); +@@ -406,7 +405,8 @@ + */ + + write_msg_to_standard_error +- ( message_number, src_buffer, ptr_buffer, msg_buffer, loc_buffer ); ++ ( message_number, src_buffer, ptr_buffer, msg_buffer, ++ loc_buffer ? loc_buffer : ""); + + /* + ** if we have a listing, place message in the source structure +@@ -428,6 +428,8 @@ + uil_exit( uil_k_severe_status ); + } + ++ free (loc_buffer); ++ free (msg_buffer); + } + + /* +--- clients/uil/UilIODef.h ++++ clients/uil/UilIODef.h +@@ -75,7 +75,7 @@ + char *c_buffer; + boolean v_position_before_get; + z_key last_key; +- char expanded_name[ 256 ]; ++ char *expanded_name; + } uil_fcb_type; + + #endif /* UilIODef_h */ +--- clients/uil/UilSrcSrc.c ++++ clients/uil/UilSrcSrc.c +@@ -271,6 +271,7 @@ + diag_k_no_source, diag_k_no_column, + src_az_source_file_table[i]->expanded_name); + } ++ _free_memory (src_az_source_file_table[i]->expanded_name); + _free_memory ((char*)src_az_source_file_table [i]); + src_az_source_file_table[i] = NULL; + } +@@ -626,12 +627,13 @@ + static unsigned short main_dir_len = 0; + boolean main_file; + int i; /* loop index through include files */ +- char buffer[256]; ++ char *buffer; + + + /* place the file name in the expanded_name buffer */ + +- strcpy(buffer, c_file_name); ++ buffer = _get_memory (strlen (c_file_name) + 1); ++ strcpy (buffer, c_file_name); + + /* Determine if this is the main file or an include file. */ + +@@ -673,11 +675,10 @@ + } + + if (!specific_directory) { ++ buffer = XtRealloc (buffer, main_dir_len + strlen (c_file_name) + 1); + _move (buffer, main_fcb -> expanded_name, main_dir_len); + _move (& buffer [main_dir_len], + c_file_name, strlen (c_file_name) + 1); /* + NULL */ +- } else { +- strcpy (buffer, c_file_name); + } + + /* Open the include file. */ +@@ -700,6 +701,7 @@ + if (inc_dir_len == 0) { + search_user_include = False; + } ++ buffer = XtRealloc (buffer, inc_dir_len + strlen (c_file_name) + 1); + _move (buffer, Uil_cmd_z_command.ac_include_dir[i], inc_dir_len); + + /* Add '/' if not specified at end of directory */ +@@ -723,6 +725,7 @@ + + /* Look in the default include directory. */ + if (search_user_include) { ++ buffer = XtRealloc (buffer, sizeof c_include_dir - 1 + strlen (c_file_name) + 1); + _move(buffer, c_include_dir, sizeof c_include_dir - 1); /* no NULL */ + _move(&buffer[sizeof c_include_dir - 1], + c_file_name, strlen (c_file_name) + 1); /* + NULL */ +@@ -736,14 +739,16 @@ + + /* check the open status. */ + +- if (az_fcb->az_file_ptr == NULL) ++ if (az_fcb->az_file_ptr == NULL) { ++ _free_memory (buffer); + return src_k_open_error; ++ } + + /* open succeeded - place buffer address in fcb */ + + az_fcb->c_buffer = az_source_buffer->c_text; + az_fcb->c_buffer[ src_k_max_source_line_length ] = 0; +- strcpy(az_fcb->expanded_name, buffer); ++ az_fcb->expanded_name = buffer; + + return src_k_open_normal; + } +--- tools/wml/Uil.y ++++ tools/wml/Uil.y +@@ -559,7 +559,7 @@ + + object_specification + : CLASS_NAME +- { sar_set_object_class (&$1); } ++ { sar_set_object_class (&$1); $$ = gz_yynullval;} + opt_create_proc_ref + opt_variant + object_spec +--- lib/Xm/XpmAttrib.c ++++ lib/Xm/XpmAttrib.c +@@ -41,7 +41,7 @@ + #include "XpmI.h" + + /* 3.2 backward compatibility code */ +-LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, ++LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, + XpmColor ***oldct)); + + LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); +@@ -52,15 +52,12 @@ + static int + CreateOldColorTable(ct, ncolors, oldct) + XpmColor *ct; +- unsigned int ncolors; ++ int ncolors; + XpmColor ***oldct; + { + XpmColor **colorTable, **color; + int a; + +- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) +- return XpmNoMemory; +- + colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); + if (!colorTable) { + *oldct = NULL; +--- lib/Xm/XpmCrBufFrI.c ++++ lib/Xm/XpmCrBufFrI.c +@@ -43,20 +43,20 @@ + + #include "XpmI.h" + +-LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size, +- unsigned int *used_size, XpmColor *colors, ++LFUNC(WriteColors, int, (char **dataptr, size_t *data_size, ++ size_t *used_size, XpmColor *colors, + unsigned int ncolors, unsigned int cpp)); + +-LFUNC(WritePixels, void, (char *dataptr, unsigned int *used_size, ++LFUNC(WritePixels, void, (char *dataptr, size_t *used_size, + unsigned int width, unsigned int height, + unsigned int cpp, unsigned int *pixels, + XpmColor *colors)); + +-LFUNC(WriteExtensions, void, (char *dataptr, unsigned int *used_size, ++LFUNC(WriteExtensions, void, (char *dataptr, size_t *used_size, + XpmExtension *ext, unsigned int num)); + +-LFUNC(ExtensionsSize, int, (XpmExtension *ext, unsigned int num)); +-LFUNC(CommentsSize, int, (XpmInfo *info)); ++LFUNC(ExtensionsSize, size_t, (XpmExtension *ext, unsigned int num)); ++LFUNC(CommentsSize, size_t, (XpmInfo *info)); + + int + XpmCreateBufferFromImage(display, buffer_return, image, shapeimage, attributes) +@@ -113,10 +113,11 @@ + /* calculation variables */ + int ErrorStatus; + char buf[BUFSIZ]; +- unsigned int cmts, extensions, ext_size = 0; +- unsigned int l, cmt_size = 0; ++ unsigned int cmts, extensions; ++ size_t ext_size = 0; ++ size_t l, cmt_size = 0; + char *ptr = NULL, *p; +- unsigned int ptr_size, used_size; ++ size_t ptr_size, used_size; + + *buffer_return = NULL; + +@@ -253,8 +254,8 @@ + static int + WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) + char **dataptr; +- unsigned int *data_size; +- unsigned int *used_size; ++ size_t *data_size; ++ size_t *used_size; + XpmColor *colors; + unsigned int ncolors; + unsigned int cpp; +@@ -299,7 +300,7 @@ + static void + WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) + char *dataptr; +- unsigned int *used_size; ++ size_t *used_size; + unsigned int width; + unsigned int height; + unsigned int cpp; +@@ -329,12 +330,13 @@ + *used_size += s - dataptr; + } + +-static int ++static size_t + ExtensionsSize(ext, num) + XpmExtension *ext; + unsigned int num; + { +- unsigned int x, y, a, size; ++ unsigned int x, y, a; ++ size_t size; + char **line; + + size = 0; +@@ -353,7 +355,7 @@ + static void + WriteExtensions(dataptr, used_size, ext, num) + char *dataptr; +- unsigned int *used_size; ++ size_t *used_size; + XpmExtension *ext; + unsigned int num; + { +@@ -384,11 +386,11 @@ + *used_size += s - dataptr + 13; + } + +-static int ++static size_t + CommentsSize(info) + XpmInfo *info; + { +- int size = 0; ++ size_t size = 0; + + /* 5 = 2 (for "/_*") + 3 (for "*_/\n") */ + if (info->hints_cmt) +--- lib/Xm/XpmCrDatFrI.c ++++ lib/Xm/XpmCrDatFrI.c +@@ -134,8 +134,6 @@ + */ + header_nlines = 1 + image->ncolors; + header_size = sizeof(char *) * header_nlines; +- if (header_size >= SIZE_MAX / sizeof(char *)) +- return (XpmNoMemory); + header = (char **) XpmCalloc(header_size, sizeof(char *)); + if (!header) + return (XpmNoMemory); +--- lib/Xm/XpmI.h ++++ lib/Xm/XpmI.h +@@ -179,26 +179,14 @@ + boundCheckingCalloc((long)(nelem),(long) (elsize)) + #endif + +-#if defined(SCO) || defined(__USLC__) +-#include /* For SIZE_MAX */ +-#endif +-#include +-#ifndef SIZE_MAX +-# ifdef ULONG_MAX +-# define SIZE_MAX ULONG_MAX +-# else +-# define SIZE_MAX UINT_MAX +-# endif +-#endif +- + #define XPMMAXCMTLEN BUFSIZ + typedef struct { + unsigned int type; + union { + FILE *file; +- char **data; ++ unsigned char **data; + } stream; +- char *cptr; ++ unsigned char *cptr; + unsigned int line; + int CommentLength; + char Comment[XPMMAXCMTLEN]; +@@ -288,9 +276,9 @@ + } *xpmHashAtom; + + typedef struct { +- unsigned int size; +- unsigned int limit; +- unsigned int used; ++ int size; ++ int limit; ++ int used; + xpmHashAtom *atomTable; + } xpmHashTable; + +--- lib/Xm/XpmRdFToI.c ++++ lib/Xm/XpmRdFToI.c +@@ -124,6 +124,27 @@ + return (ErrorStatus); + } + ++ ++/* Quote filename and prepend prefix. */ ++static char *quote_file(prefix, filename, len) ++ const char *prefix, *filename; ++ size_t len; ++{ ++ char *buf = XpmMalloc(strlen(prefix) + len * 2 + 1); ++ char *p = buf, *q; ++ ++ if (!buf) ++ return 0; ++ strcpy(p, prefix); ++ p += strlen(p); ++ for (q = filename; *q; q++) { ++ *p++ = '\\'; ++ *p++ = *q; ++ } ++ return buf; ++} ++ ++ + /* + * open the given file to be read as an xpmData which is returned. + */ +@@ -133,7 +154,7 @@ + xpmData *mdata; + { + #ifndef NO_ZPIPE +- char *compressfile, buf[(2*MAXPATHLEN) + 1]; ++ char *compressfile, *buf; + # ifdef STAT_ZFILE + struct stat status; + # endif +@@ -144,17 +165,25 @@ + mdata->type = XPMFILE; + } else { + #ifndef NO_ZPIPE +- int len = strlen(filename); ++ size_t len = strlen(filename); + if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { + mdata->type = XPMPIPE; +- sprintf(buf, "uncompress -c \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "r"))) ++ buf = quote_file("uncompress -c ", filename, len); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { + mdata->type = XPMPIPE; +- sprintf(buf, "gunzip -qc \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "r"))) ++ buf = quote_file("gunzip -qc ", filename, len); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + } else { +@@ -164,28 +193,32 @@ + + sprintf(compressfile, "%s.Z", filename); + if (!stat(compressfile, &status)) { +- sprintf(buf, "uncompress -c \"%s\"", compressfile); +- if (!(mdata->stream.file = popen(buf, "r"))) { +- XpmFree(compressfile); ++ buf = quote_file("uncompress -c ", compressfile, len + 2); ++ XpmFree(compressfile); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); +- } + mdata->type = XPMPIPE; + } else { + sprintf(compressfile, "%s.gz", filename); + if (!stat(compressfile, &status)) { +- sprintf(buf, "gunzip -c \"%s\"", compressfile); +- if (!(mdata->stream.file = popen(buf, "r"))) { +- XpmFree(compressfile); ++ buf = quote_file("gunzip -c ", compressfile, len + 3); ++ XpmFree(compressfile); ++ if (!buf) ++ return (XpmNoMemory); ++ mdata->stream.file = popen(buf, "r"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); +- } + mdata->type = XPMPIPE; + } else { ++ XpmFree(compressfile); + # endif + #endif + if (!(mdata->stream.file = fopen(filename, "r"))) { +-#if !defined(NO_ZPIPE) && defined(STAT_ZFILE) +- XpmFree(compressfile); +-#endif + return (XpmOpenFailed); + } + mdata->type = XPMFILE; +@@ -193,7 +226,6 @@ + # ifdef STAT_ZFILE + } + } +- XpmFree(compressfile); + # endif + } + #endif +--- lib/Xm/XpmWrFFrI.c ++++ lib/Xm/XpmWrFFrI.c +@@ -117,7 +117,8 @@ + #endif + /* let's try to make a valid C syntax name */ + if ((dot = index(name, '.'))) { +- strcpy(new_name, name); ++ strncpy(new_name, name, sizeof(new_name)); ++ new_name[sizeof(new_name) - 1] = 0; + /* change '.' to '_' */ + name = s = new_name; + while ((dot = index(s, '.'))) { +@@ -127,7 +128,8 @@ + } + if ((dot = index(name, '-'))) { + if (name != new_name) { +- strcpy(new_name, name); ++ strncpy(new_name, name, sizeof(new_name)); ++ new_name[sizeof(new_name) - 1] = 0; + name = new_name; + } + /* change '-' to '_' */ +@@ -243,10 +245,13 @@ + char *s, *p, *buf; + unsigned int x, y, h; + ++ if (height == 0) ++ return XpmFileInvalid; ++ + h = height - 1; +- if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) ++ if (cpp != 0 && width >= ((size_t)-1 - 3)/cpp) + return XpmNoMemory; +- p = buf = (char *) XpmMalloc(width * cpp + 3); ++ p = buf = (char *) XpmMalloc((size_t)width * cpp + 3); + if (!buf) + return (XpmNoMemory); + *buf = '"'; +@@ -293,6 +298,25 @@ + fprintf(file, ",\n\"XPMENDEXT\""); + } + ++/* Quote filename and prepend prefix. */ ++static char *quote_file(prefix, filename, len) ++ const char *prefix, *filename; ++ size_t len; ++{ ++ char *buf = XpmMalloc(strlen(prefix) + len * 2 + 1); ++ char *p = buf, *q; ++ ++ if (!buf) ++ return 0; ++ strcpy(p, prefix); ++ p += strlen(p); ++ for (q = filename; *q; q++) { ++ *p++ = '\\'; ++ *p++ = *q; ++ } ++ return buf; ++} ++ + /* + * open the given file to be written as an xpmData which is returned + */ +@@ -302,7 +326,7 @@ + xpmData *mdata; + { + #ifndef NO_ZPIPE +- char buf[BUFSIZ]; ++ char *buf; + + #endif + +@@ -311,16 +335,24 @@ + mdata->type = XPMFILE; + } else { + #ifndef NO_ZPIPE +- int len = strlen(filename); ++ size_t len = strlen(filename); + if (len > 2 && !strcmp(".Z", filename + (len - 2))) { +- sprintf(buf, "compress > \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "w"))) ++ buf = quote_file("compress > ", filename, len); ++ if (!buf) ++ return XpmNoMemory; ++ mdata->stream.file = popen(buf, "w"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + mdata->type = XPMPIPE; + } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { +- sprintf(buf, "gzip -q > \"%s\"", filename); +- if (!(mdata->stream.file = popen(buf, "w"))) ++ buf = quote_file("gzip -q > ", filename, len); ++ if (!buf) ++ return XpmNoMemory; ++ mdata->stream.file = popen(buf, "w"); ++ XpmFree(buf); ++ if (!mdata->stream.file) + return (XpmOpenFailed); + + mdata->type = XPMPIPE; +--- lib/Xm/Xpmcreate.c ++++ lib/Xm/Xpmcreate.c +@@ -804,9 +804,6 @@ + + ErrorStatus = XpmSuccess; + +- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) +- return (XpmNoMemory); +- + /* malloc pixels index tables */ + image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); + if (!image_pixels) +@@ -950,8 +947,6 @@ + return (XpmNoMemory); + + #ifndef FOR_MSW +- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) +- return (XpmNoMemory); + /* now that bytes_per_line must have been set properly alloc data */ + (*image_return)->data = + (char *) XpmMalloc((*image_return)->bytes_per_line * height); +@@ -1997,9 +1992,6 @@ + xpmGetCmt(data, &colors_cmt); + + /* malloc pixels index tables */ +- if (ncolors >= SIZE_MAX / sizeof(Pixel)) +- return XpmNoMemory; +- + image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); + if (!image_pixels) + RETURN(XpmNoMemory); +@@ -2215,9 +2207,6 @@ + { + unsigned short colidx[256]; + +- if (ncolors > 256) +- return (XpmFileInvalid); +- + bzero((char *)colidx, 256 * sizeof(short)); + for (a = 0; a < ncolors; a++) + colidx[(unsigned char)colorTable[a].string[0]] = a + 1; +@@ -2316,9 +2305,6 @@ + char *s; + char buf[BUFSIZ]; + +- if (cpp >= sizeof(buf)) +- return (XpmFileInvalid); +- + buf[cpp] = '\0'; + if (USE_HASHTABLE) { + xpmHashAtom *slot; +--- lib/Xm/Xpmdata.c ++++ lib/Xm/Xpmdata.c +@@ -297,7 +297,7 @@ + + if (!mdata->type || mdata->type == XPMBUFFER) { + if (mdata->cptr) { +- char *start = mdata->cptr; ++ unsigned char *start = mdata->cptr; + while ((c = *mdata->cptr) && c != mdata->Eos) + mdata->cptr++; + n = mdata->cptr - start + 1; +@@ -376,7 +376,7 @@ + { + if (!mdata->type) + *cmt = NULL; +- else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) { ++ else if (mdata->CommentLength) { + *cmt = (char *) XpmMalloc(mdata->CommentLength + 1); + strncpy(*cmt, mdata->Comment, mdata->CommentLength); + (*cmt)[mdata->CommentLength] = '\0'; +--- lib/Xm/Xpmhashtab.c ++++ lib/Xm/Xpmhashtab.c +@@ -141,17 +141,17 @@ + xpmHashTable *table; + { + xpmHashAtom *atomTable = table->atomTable; +- unsigned int size = table->size; ++ int size = table->size; + xpmHashAtom *t, *p; + int i; + int oldSize = size; + + t = atomTable; + HASH_TABLE_GROWS +- table->size = size; +- table->limit = size / 3; +- if (size >= SIZE_MAX / sizeof(*atomTable)) ++ if (size <= 0) + return (XpmNoMemory); ++ table->size = size; ++ table->limit = size / 3; + atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); + if (!atomTable) + return (XpmNoMemory); +@@ -212,8 +212,6 @@ + table->size = INITIAL_HASH_SIZE; + table->limit = table->size / 3; + table->used = 0; +- if (table->size >= SIZE_MAX / sizeof(*atomTable)) +- return (XpmNoMemory); + atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); + if (!atomTable) + return (XpmNoMemory); +--- lib/Xm/Xpmmisc.c ++++ lib/Xm/Xpmmisc.c +@@ -52,7 +52,7 @@ + char *s1; + { + char *s2; +- int l = strlen(s1) + 1; ++ size_t l = strlen(s1) + 1; + + if (s2 = (char *) XpmMalloc(l)) + strcpy(s2, s1); +--- lib/Xm/Xpmparse.c ++++ lib/Xm/Xpmparse.c +@@ -46,25 +46,6 @@ + + #include "XpmI.h" + #include +-#include +- +-#ifdef HAS_STRLCAT +-# define STRLCAT(dst, src, dstsize) { \ +- if (strlcat(dst, src, dstsize) >= (dstsize)) \ +- return (XpmFileInvalid); } +-# define STRLCPY(dst, src, dstsize) { \ +- if (strlcpy(dst, src, dstsize) >= (dstsize)) \ +- return (XpmFileInvalid); } +-#else +-# define STRLCAT(dst, src, dstsize) { \ +- if ((strlen(dst) + strlen(src)) < (dstsize)) \ +- strcat(dst, src); \ +- else return (XpmFileInvalid); } +-# define STRLCPY(dst, src, dstsize) { \ +- if (strlen(src) < (dstsize)) \ +- strcpy(dst, src); \ +- else return (XpmFileInvalid); } +-#endif + + LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, + unsigned int height, unsigned int ncolors, +@@ -234,7 +215,7 @@ + unsigned int *extensions; + { + unsigned int l; +- char buf[BUFSIZ + 1]; ++ char buf[BUFSIZ]; + + if (!data->format) { /* XPM 2 or 3 */ + +@@ -332,6 +313,17 @@ + *hotspot = 0; + *extensions = 0; + } ++ ++ /* Do some plausibility checks. */ ++ if (*width == 0 || *height == 0 || *ncolors == 0 || *cpp == 0) ++ return XpmFileInvalid; ++ if (*cpp > 8) ++ return XpmFileInvalid; ++ if (*width > (1 << (sizeof(int) * 8 - 4)) / *height) ++ return XpmFileInvalid; ++ if (*ncolors > (1 << (sizeof(int) * 8 - 4)) / (*width * *height)) ++ return XpmFileInvalid; ++ + return (XpmSuccess); + } + +@@ -343,10 +335,10 @@ + XpmColor **colorTablePtr; + xpmHashTable *hashtable; + { +- unsigned int key, l, a, b, len; ++ unsigned int key, l, a, b; + unsigned int curkey; /* current color key */ + unsigned int lastwaskey; /* key read */ +- char buf[BUFSIZ + 1]; ++ char buf[BUFSIZ]; + char curbuf[BUFSIZ]; /* current buffer */ + char **sptr, *s; + XpmColor *color; +@@ -354,8 +346,6 @@ + char **defaults; + int ErrorStatus; + +- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) +- return (XpmNoMemory); + colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); + if (!colorTable) + return (XpmNoMemory); +@@ -367,10 +357,6 @@ + /* + * read pixel value + */ +- if (cpp >= SIZE_MAX - 1) { +- xpmFreeColorTable(colorTable, ncolors); +- return (XpmNoMemory); +- } + color->string = (char *) XpmMalloc(cpp + 1); + if (!color->string) { + xpmFreeColorTable(colorTable, ncolors); +@@ -408,14 +394,13 @@ + } + if (!lastwaskey && key < NKEYS) { /* open new key */ + if (curkey) { /* flush string */ +- len = strlen(curbuf) + 1; +- s = (char *) XpmMalloc(len); ++ s = (char *) XpmMalloc(strlen(curbuf) + 1); + if (!s) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } + defaults[curkey] = s; +- memcpy(s, curbuf, len); ++ strcpy(s, curbuf); + } + curkey = key + 1; /* set new key */ + *curbuf = '\0'; /* reset curbuf */ +@@ -425,10 +410,14 @@ + xpmFreeColorTable(colorTable, ncolors); + return (XpmFileInvalid); + } ++ if (strlen(curbuf) + l + 2 >= sizeof(curbuf)) { ++ xpmFreeColorTable(colorTable, ncolors); ++ return (XpmNoMemory); ++ } + if (!lastwaskey) +- STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ ++ strcat(curbuf, " "); /* append space */ + buf[l] = '\0'; +- STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ ++ strcat(curbuf, buf);/* append buf */ + lastwaskey = 0; + } + } +@@ -436,13 +425,12 @@ + xpmFreeColorTable(colorTable, ncolors); + return (XpmFileInvalid); + } +- len = strlen(curbuf) + 1; +- s = defaults[curkey] = (char *) XpmMalloc(len); ++ s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); + if (!s) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } +- memcpy(s, curbuf, len); ++ strcpy(s, curbuf); + } + } else { /* XPM 1 */ + /* get to the beginning of the first string */ +@@ -455,10 +443,6 @@ + /* + * read pixel value + */ +- if (cpp >= SIZE_MAX - 1) { +- xpmFreeColorTable(colorTable, ncolors); +- return (XpmNoMemory); +- } + color->string = (char *) XpmMalloc(cpp + 1); + if (!color->string) { + xpmFreeColorTable(colorTable, ncolors); +@@ -486,18 +470,21 @@ + xpmNextString(data); /* get to the next string */ + *curbuf = '\0'; /* init curbuf */ + while ((l = xpmNextWord(data, buf, BUFSIZ))) { ++ if (strlen(curbuf) + l + 2 >= sizeof(curbuf)) { ++ xpmFreeColorTable(colorTable, ncolors); ++ return (XpmNoMemory); ++ } + if (*curbuf != '\0') +- STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ ++ strcat(curbuf, " ");/* append space */ + buf[l] = '\0'; +- STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ ++ strcat(curbuf, buf); /* append buf */ + } +- len = strlen(curbuf) + 1; +- s = (char *) XpmMalloc(len); ++ s = (char *) XpmMalloc(strlen(curbuf) + 1); + if (!s) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } +- memcpy(s, curbuf, len); ++ strcpy(s, curbuf); + color->c_color = s; + *curbuf = '\0'; /* reset curbuf */ + if (a < ncolors - 1) +@@ -522,9 +509,6 @@ + unsigned int *iptr, *iptr2; + unsigned int a, x, y; + +- if ((height > 0 && width >= SIZE_MAX / height) || +- width * height >= SIZE_MAX / sizeof(unsigned int)) +- return XpmNoMemory; + #ifndef FOR_MSW + iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); + #else +@@ -548,9 +532,6 @@ + { + unsigned short colidx[256]; + +- if (ncolors > 256) +- return (XpmFileInvalid); +- + bzero((char *)colidx, 256 * sizeof(short)); + for (a = 0; a < ncolors; a++) + colidx[(unsigned char)colorTable[a].string[0]] = a + 1; +@@ -585,7 +566,7 @@ + + bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ + for (a = 0; a < ncolors; a++) { +- char1 = colorTable[a].string[0]; ++ char1 = (unsigned char)colorTable[a].string[0]; + if (cidx[char1] == NULL) { /* get new memory */ + cidx[char1] = (unsigned short *) + XpmCalloc(256, sizeof(unsigned short)); +@@ -628,9 +609,6 @@ + char *s; + char buf[BUFSIZ]; + +- if (cpp >= sizeof(buf)) +- return (XpmFileInvalid); +- + buf[cpp] = '\0'; + if (USE_HASHTABLE) { + xpmHashAtom *slot; +--- lib/Xm/Xpmscan.c ++++ lib/Xm/Xpmscan.c +@@ -98,8 +98,7 @@ + LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, + XpmAttributes *attributes)); + +-LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, +- unsigned int ncolors, ++LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, + Pixel *pixels, unsigned int mask, + unsigned int cpp, XpmAttributes *attributes)); + +@@ -226,17 +225,11 @@ + else + cpp = 0; + +- if ((height > 0 && width >= SIZE_MAX / height) || +- width * height >= SIZE_MAX / sizeof(unsigned int)) +- RETURN(XpmNoMemory); + pmap.pixelindex = + (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); + if (!pmap.pixelindex) + RETURN(XpmNoMemory); + +- if (pmap.size >= SIZE_MAX / sizeof(Pixel)) +- RETURN(XpmNoMemory); +- + pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); + if (!pmap.pixels) + RETURN(XpmNoMemory); +@@ -291,8 +284,7 @@ + * get rgb values and a string of char, and possibly a name for each + * color + */ +- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) +- RETURN(XpmNoMemory); ++ + colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); + if (!colorTable) + RETURN(XpmNoMemory); +@@ -340,8 +332,6 @@ + + /* first get a character string */ + a = 0; +- if (cpp >= SIZE_MAX - 1) +- return (XpmNoMemory); + if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) + return (XpmNoMemory); + *s++ = printable[c = a % MAXPRINTABLE]; +@@ -389,7 +379,7 @@ + ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) + Display *display; + XpmColor *colors; +- unsigned int ncolors; ++ int ncolors; + Pixel *pixels; + unsigned int mask; + unsigned int cpp; +@@ -433,8 +423,6 @@ + } + + /* first get character strings and rgb values */ +- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) +- return (XpmNoMemory); + xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); + if (!xcolors) + return (XpmNoMemory); +--- lib/Xm/XpmI.h ++++ lib/Xm/XpmI.h +@@ -110,6 +110,7 @@ + + #include + #include ++#include + /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ + #ifdef sequent + extern FILE *popen(); +--- lib/Xm/XmString.c ++++ lib/Xm/XmString.c +@@ -7707,7 +7707,7 @@ + case XmMULTIBYTE_TEXT: + /* Non-NULL values (except _MOTIF_DEFAULT_LOCALE) + are not accepted in Motif 2.0. */ +- if (tag != NULL && !(tag == _MOTIF_DEFAULT_LOCALE || ++ if (tag != NULL && !(/* tag == _MOTIF_DEFAULT_LOCALE || */ + strcmp(tag, _MOTIF_DEFAULT_LOCALE) == 0)) + { + _XmProcessUnlock(); +@@ -8317,7 +8317,7 @@ + _XmProcessUnlock(); + return NULL; + } +- if ((value != _MOTIF_DEFAULT_LOCALE) && ++ if (/* (value != _MOTIF_DEFAULT_LOCALE) && */ + (strcmp((char*) value, _MOTIF_DEFAULT_LOCALE) != 0)) { + _XmProcessUnlock(); + return NULL; +--- clients/mwm/WmFunction.c ++++ clients/mwm/WmFunction.c +@@ -1124,12 +1124,12 @@ + directory, then we must call execlp and not execl + */ + shellname = shell; +- execlp (shell, shellname, "-c", args, 0); ++ execlp (shell, shellname, "-c", args, (char *) 0); + } + else + { + shellname++; +- execl (shell, shellname, "-c", args, 0); ++ execl (shell, shellname, "-c", args, (char *) 0); + } + } + +@@ -1138,9 +1138,9 @@ + * Try /bin/sh . + */ + #ifdef SVR4 +- execl ("/usr/bin/sh", "sh", "-c", args, 0); ++ execl ("/usr/bin/sh", "sh", "-c", args, (char *) 0); + #else +- execl ("/bin/sh", "sh", "-c", args, 0); ++ execl ("/bin/sh", "sh", "-c", args, (char *) 0); + #endif + + +--- demos/lib/Xmd/onHelp.c ++++ demos/lib/Xmd/onHelp.c +@@ -66,7 +66,7 @@ + Widget dismiss; + + toplevel = XtVaAppInitialize(&app_context, "HelpOnHelp", NULL, 0, +- &argc, argv, NULL, 0); ++ &argc, argv, NULL, NULL); + n = 0; + XtSetArg(args[n], XmdNhelpFile, "helpOn"); n++; + help = XmdCreateHelp(toplevel, "help", args, n); +--- demos/programs/Exm/simple_app/simpleDemo.c ++++ demos/programs/Exm/simple_app/simpleDemo.c +@@ -162,7 +162,7 @@ + + menu = XmCreatePulldownMenu(menuBar, "FileMenu", NULL, 0); + +- XtVaSetValues(cascade, XmNsubMenuId, menu, 0); ++ XtVaSetValues(cascade, XmNsubMenuId, menu, NULL); + + str = XmStringCreateLocalized("Quit"); + menuitem = XtVaCreateManagedWidget("item", xmPushButtonWidgetClass, +--- demos/programs/filemanager/actions.c ++++ demos/programs/filemanager/actions.c +@@ -91,7 +91,7 @@ + XtVaSetValues(fileviewer, + XmNlayoutType, spatial, + XmNentryViewType, size, +- 0, 0); ++ NULL); + + fixViewerSize(XtParent(fileviewer), NULL, NULL); + +--- demos/programs/filemanager/filemanager.c ++++ demos/programs/filemanager/filemanager.c +@@ -118,7 +118,7 @@ + + XtSetArg(args[n], XmNallowShellResize, True); n++; + toplevel = XtVaAppInitialize(&app_context, APP_CLASS, NULL, 0, &argc, argv, +- fallback_resources, 0); ++ fallback_resources, NULL); + + app_class_quark = XrmStringToQuark(APP_CLASS); + app_quark = XrmStringToQuark(argv[0]); +--- demos/programs/fileview/text.c ++++ demos/programs/fileview/text.c +@@ -160,7 +160,7 @@ + XtSetValues(XtParent(new->text), args, n); + XmTextSetTopCharacter(new->text, + XmTextGetTopCharacter(this->current_pane->text)); +- XtVaSetValues(target, XmNheight, (Dimension) height/2); ++ XtVaSetValues(target, XmNheight, (Dimension) height/2, NULL); + } + printf("source text set\n"); + XtManageChild(new->text); +--- demos/programs/popups/autopopups.c ++++ demos/programs/popups/autopopups.c +@@ -83,7 +83,7 @@ + XmString str, tmp1, tmp2; + + shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv, +- NULL, 0); ++ NULL, NULL); + + frame1 = XmCreateFrame(shell, "outerframe", NULL, 0); + XtManageChild(frame1); +--- demos/programs/setdate/setDate.c ++++ demos/programs/setdate/setDate.c +@@ -95,7 +95,7 @@ + char *str; + + shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv, +- fallback_resources, 0); ++ fallback_resources, NULL); + + time(&timer); + thetime = localtime(&timer); +--- demos/programs/todo/todo.c ++++ demos/programs/todo/todo.c +@@ -150,7 +150,7 @@ + shell = XtVaAppInitialize(&context, APP_CLASS, + optionDesc, XtNumber(optionDesc), + &argc, argv, +- fallback_resources, 0); ++ fallback_resources, NULL); + + XtGetApplicationResources(shell, (XtPointer) &options, + resources, XtNumber(resources), (Arg *) NULL, 0); +--- lib/Xm/Label.c ++++ lib/Xm/Label.c +@@ -2595,7 +2595,7 @@ + { + XmString value; + +- XtVaGetValues(w, XmNlabelString, &value, 0); ++ XtVaGetValues(w, XmNlabelString, &value, NULL); + + if (type == XmFORMAT_XmSTRING) + { -- GitLab From a11a93072e797da6edf320d701c424fc9f3b20f2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 17:48:44 +0100 Subject: [PATCH 168/811] fix patch collapse fail --- .../m/motif/motif-2.2.4-goolf-1.4.10.eb | 666 ------------------ .../m/motif/motif-2.2.4_various-fixes.patch | 666 ++++++++++++++++++ 2 files changed, 666 insertions(+), 666 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 0d499644bc..22fb85436c 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -55,669 +55,3 @@ sanity_check_paths = { } moduleclass = 'vis' ---- demos/programs/ButtonBox/bboxdemo.c -+++ demos/programs/ButtonBox/bboxdemo.c -@@ -668,4 +668,5 @@ - XtRealizeWidget(top); - - XtAppMainLoop(app); -+ return 0; - } ---- demos/programs/ColorSel/bxutil-c.c -+++ demos/programs/ColorSel/bxutil-c.c -@@ -3471,6 +3471,7 @@ - default: - return -1; - } -+ abort(); - } - - -@@ -3494,6 +3495,7 @@ - default: - return -1; - } -+ abort(); - } - - /* ---- demos/programs/FontSel/fontsel.c -+++ demos/programs/FontSel/fontsel.c -@@ -68,6 +68,7 @@ - * Returns: nothing - * - */ -+void - InitializeDemoForm(Widget form) - { - Widget w; -@@ -119,5 +120,6 @@ - XtRealizeWidget(top); - - XtAppMainLoop(app); -+ return 0; - } - ---- demos/programs/MultiList/bxutil-c.c -+++ demos/programs/MultiList/bxutil-c.c -@@ -3469,6 +3469,7 @@ - } - return (c); - } -+ abort(); - } - - -@@ -3490,6 +3491,7 @@ - mdata->InsideString = !mdata->InsideString; - return (ungetc(c, mdata->stream.file)); - } -+ abort(); - } - - /* ---- demos/programs/Tree/bxutil-c.c -+++ demos/programs/Tree/bxutil-c.c -@@ -3471,6 +3471,7 @@ - default: - return -1; - } -+ abort(); - } - - -@@ -3494,6 +3495,7 @@ - default: - return -1; - } -+ abort(); - } - - /* ---- tools/wml/wmlresolve.c -+++ tools/wml/wmlresolve.c -@@ -69,6 +69,7 @@ - - #if defined(__STDC__) - #include -+#include - #endif - #include - ---- demos/programs/ButtonBox/Makefile.am -+++ demos/programs/ButtonBox/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/ButtonBox -+pkgdatadir = $(datadir)/Xm/ButtonBox - - bin_PROGRAMS = bboxdemo - EXTRA_DIST = Imakefile - bboxdemo_SOURCES = bboxdemo.c --data_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/ColorSel/Makefile.am -+++ demos/programs/ColorSel/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Color -+pkgdatadir = $(datadir)/Xm/Color - - bin_PROGRAMS = colordemo - colordemo_SOURCES = bxutil-c.c colordemo.c - EXTRA_DIST = Imakefile --data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) - LDADD = $(TOPDIR)/lib/Xm/libXm.la - TOPDIR = ../../.. - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/Column/Makefile.am -+++ demos/programs/Column/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Column -+pkgdatadir = $(datadir)/Xm/Column - - bin_PROGRAMS = column - column_SOURCES = column.c - EXTRA_DIST = Imakefile Column.ad --data_DATA = $(EXTRA_DIST) $(column_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(column_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/DropDown/Makefile.am -+++ demos/programs/DropDown/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/DropDown -+pkgdatadir = $(datadir)/Xm/DropDown - - bin_PROGRAMS = dropdown - EXTRA_DIST = DropDown.ad Imakefile - dropdown_SOURCES = dropdown.c --data_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/Exm/app_in_c/Makefile.am -+++ demos/programs/Exm/app_in_c/Makefile.am -@@ -1,10 +1,9 @@ - MAINTAINERCLEANFILES = Makefile.in - --bindir = ${prefix}/share/Xm/Exm/app_in_c --datadir = ${prefix}/share/Xm/Exm/app_in_c -+pkgdatadir = $(datadir)/Xm/Exm/app_in_c - - man_MANS = exm_in_c.man --bin_PROGRAMS = exm_in_c -+pkgdata_PROGRAMS = exm_in_c - exm_in_c_SOURCES = exm_in_c.c - - EXTRA_DIST = exm_in_c.man Imakefile ---- demos/programs/Exm/simple_app/Makefile.am -+++ demos/programs/Exm/simple_app/Makefile.am -@@ -1,7 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - --bindir = ${prefix}/share/Xm/Exm/simple_app --datadir = ${prefix}/share/Xm/Exm/simple_app -+bindir = @datadir@/Xm/Exm/simple_app -+datadir = @datadir@/Xm/Exm/simple_app - - data_DATA = README - man_MANS = simpleDemo.man ---- demos/programs/FontSel/Makefile.am -+++ demos/programs/FontSel/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/fontsel -+pkgdatadir = $(datadir)/Xm/fontsel - - bin_PROGRAMS = fontsel - fontsel_SOURCES = callbacks-c.c creation-c.c fontsel.c fontsel.h - EXTRA_DIST = Imakefile --data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) - LDADD = $(TOPDIR)/lib/Xm/libXm.la - TOPDIR = ../../.. - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/IconB/Makefile.am -+++ demos/programs/IconB/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Icon -+pkgdatadir= $(datadir)/Xm/Icon - - EXTRA_DIST = Imakefile small.bm - bin_PROGRAMS = iconbuttondemo - iconbuttondemo_SOURCES = misc.c iconbuttondemo.c --data_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/MultiList/Makefile.am -+++ demos/programs/MultiList/Makefile.am -@@ -1,13 +1,13 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/MultiList -+pkgdatadir = $(datadir)/Xm/MultiList - - bin_PROGRAMS = multilist - SUBDIRS = pixmaps - multilist_SOURCES = bxutil-c.c callbacks-c.c creation.c multilist.c \ - extlist.h - EXTRA_DIST = Imakefile --data_DATA = $(EXTRA_DIST) $(multilist_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(multilist_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/MultiList/pixmaps/Makefile.am -+++ demos/programs/MultiList/pixmaps/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/MultiList/pixmaps -+pkgdatadir = $(datadir)/Xm/MultiList/pixmaps - - EXTRA_DIST = clown.xbm crab.xpm eye.xpm porsche.xpm stopsign.xpm --data_DATA = $(EXTRA_DIST) -+pkgdata_DATA = $(EXTRA_DIST) ---- demos/programs/Outline/Makefile.am -+++ demos/programs/Outline/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Outline -+pkgdatadir = $(datadir)/Xm/Outline - - EXTRA_DIST = Imakefile - bin_PROGRAMS = outline - outline_SOURCES = outline.c --data_DATA = $(outline_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(outline_SOURCES) $(EXTRA_DIST) - LDADD = $(TOPDIR)/lib/Xm/libXm.la - TOPDIR = ../../.. - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/Paned/Makefile.am -+++ demos/programs/Paned/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Paned2 -+pkgdatadir = $(datadir)/Xm/Paned2 - - EXTRA_DIST = Imakefile - bin_PROGRAMS = paned - paned_SOURCES = creation-c.c paned.c --data_DATA = $(EXTRA_DIST) $(paned_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(paned_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/TabStack/Makefile.am -+++ demos/programs/TabStack/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Tabstack -+pkgdatadir = $(datadir)/Xm/Tabstack - - bin_PROGRAMS = tabstack - tabstack_SOURCES = bxutils.c callbacks.c creation.c main.c creation.h - EXTRA_DIST = Imakefile --data_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/Tree/Makefile.am -+++ demos/programs/Tree/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Tree -+pkgdatadir = $(datadir)/Xm/Tree - - EXTRA_DIST = Imakefile - bin_PROGRAMS = tree - tree_SOURCES = bxutil-c.c tree.c --data_DATA = $(EXTRA_DIST) $(tree_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(tree_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/airport/Makefile.am -+++ demos/programs/airport/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/airport -+pkgdatadir = $(datadir)/Xm/airport - - bin_PROGRAMS = airport - airport_SOURCES = main.c dragsource.c dropsite.c airport.h \ - dragsource.h dropsite.h main.h - EXTRA_DIST = Imakefile XmdAirport.ad README --data_DATA = $(airport_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(airport_SOURCES) $(EXTRA_DIST) - LDADD = ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/animate/Makefile.am -+++ demos/programs/animate/Makefile.am -@@ -1,6 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/animate -+pkgdatadir = $(datadir)/Xm/animate -+uiddir = $(datadir)/X11/uid - - EXTRA_DIST = dog.uil plane.uil superman.uil xmanimate.uil \ - superman1.xbm superman2.xbm superman3.xbm superman4.xbm \ -@@ -11,8 +12,8 @@ - - CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid - --data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ -- $(EXTRA_DIST) -+pkgdata_DATA = $(xmanimate_SOURCES) $(EXTRA_DIST) -+uid_DATA = dog.uid plane.uid superman.uid xmanimate.uid - - bin_PROGRAMS = xmanimate - ---- demos/programs/draw/Makefile.am -+++ demos/programs/draw/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/draw -+pkgdatadir = $(datadir)/Xm/draw - - bin_PROGRAMS = draw - draw_SOURCES = draw.c - EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man --data_DATA = $(EXTRA_DIST) $(draw_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(draw_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/earth/Makefile.am -+++ demos/programs/earth/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/earth -+pkgdatadir = $(datadir)/Xm/earth - - bin_PROGRAMS = earth - earth_SOURCES = earth.c - EXTRA_DIST = terre.xbm earth.man Imakefile README --data_DATA = $(EXTRA_DIST) $(earth_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(earth_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/filemanager/Makefile.am -+++ demos/programs/filemanager/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/filemanager -+pkgdatadir = $(datadir)/Xm/filemanager - - bin_PROGRAMS = filemanager - filemanager_SOURCES = filemanager.c actions.c readdir.c convert.c \ -@@ -9,7 +9,7 @@ - Imakefile code.xpm dir.xpm exec.xpm file.xpm none.xpm \ - obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \ - s_none.xpm s_pix.xpm --data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} - ---- demos/programs/fileview/Makefile.am -+++ demos/programs/fileview/Makefile.am -@@ -1,12 +1,14 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/fileview -+pkgdatadir = $(datadir)/Xm/fileview -+uiddir = $(datadir)/X11/uid - - bin_PROGRAMS = fileview - fileview_SOURCES = main.c text.c file.c file.h fileE.h fileview.h main.h \ - mainE.h text.h textE.h - EXTRA_DIST = $(UILS) English.df French.df German.df README Fileview.ad --data_DATA = French.uid German.uid English.uid $(fileview_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(fileview_SOURCES) $(EXTRA_DIST) -+uid_DATA = French.uid German.uid English.uid - - UILS= French.uil German.uil English.uil - ---- demos/programs/getsubres/Makefile.am -+++ demos/programs/getsubres/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/getsubres -+pkgdatadir = $(datadir)/Xm/getsubres - - bin_PROGRAMS = getsubres - EXTRA_DIST = getsubres.help getsubres.man README Imakefile - getsubres_SOURCES = getsubres.c --data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/hellomotif/Makefile.am -+++ demos/programs/hellomotif/Makefile.am -@@ -1,11 +1,13 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/hellomotif -+pkgdatadir = $(datadir)/Xm/hellomotif -+uiddir = $(datadir)/X11/uid - - bin_PROGRAMS = hellomotif - EXTRA_DIST = hellomotif.uil Imakefile README - hellomotif_SOURCES = hellomotif.c --data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid -+pkgdata_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) -+uid_DATA = hellomotif.uid - LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} - ---- demos/programs/hellomotifi18n/Makefile.am -+++ demos/programs/hellomotifi18n/Makefile.am -@@ -1,13 +1,15 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/helloint -+pkgdatadir = $(datadir)/Xm/helloint -+uiddir = $(datadir)/X11/uid - - SUBDIRS = C english french hebrew japan japanese swedish - EXTRA_DIST = README helloint.uil Imakefile helloint.man - CLEANFILES = helloint.uid - helloint_SOURCES = helloint.c - bin_PROGRAMS = helloint --data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid -+pkgdata_DATA = $(EXTRA_DIST) $(helloint_SOURCES) -+uid_DATA = helloint.uid - helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid - - INCLUDES = -I$(top_srcdir)/lib ${X_CFLAGS} ---- demos/programs/i18ninput/Makefile.am -+++ demos/programs/i18ninput/Makefile.am -@@ -1,12 +1,12 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/i18ninput -+pkgdatadir = $(datadir)/Xm/i18ninput - - bin_PROGRAMS = i18ninput - i18ninput_SOURCES = i18ninput.c input.c - EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help \ - Imakefile --data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/panner/Makefile.am -+++ demos/programs/panner/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/panner -+pkgdatadir = $(datadir)/Xm/panner - - bin_PROGRAMS = panner - panner_SOURCES = panner.c - EXTRA_DIST = README panner.man Imakefile --data_DATA = $(EXTRA_DIST) $(panner_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(panner_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/periodic/Makefile.am -+++ demos/programs/periodic/Makefile.am -@@ -1,11 +1,13 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/periodic -+pkgdatadir = $(datadir)/Xm/periodic -+uiddir = $(datadir)/X11/uid - - bin_PROGRAMS = periodic - EXTRA_DIST = periodic.uil periodic_l.uil XmdPeriodic.ad Imakefile README - periodic_SOURCES = periodic.c --data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid -+pkgdata_DATA = $(EXTRA_DIST) $(periodic_SOURCES) -+uid_DATA = periodic.uid - LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/piano/Makefile.am -+++ demos/programs/piano/Makefile.am -@@ -1,12 +1,12 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/piano -+pkgdatadir = $(datadir)/Xm/piano - - bin_PROGRAMS = piano - piano_SOURCES = piano.c - EXTRA_DIST = piano.images README Inv8_part1.piano Inv8_part2.piano \ - piano.man Imakefile --data_DATA = $(EXTRA_DIST) $(piano_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(piano_SOURCES) - LDADD = ../../../lib/Xm/libXm.la -lm - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/pixmaps/Makefile.am -+++ demos/programs/pixmaps/Makefile.am -@@ -1,7 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/pixmaps -+pkgdatadir = $(datadir)/Xm/pixmaps - - EXTRA_DIST = crab.xpm eye.xpm porsche.xpm stopsign.xpm clown.xbm - --data_DATA = $(EXTRA_DIST) -+pkgdata_DATA = $(EXTRA_DIST) ---- demos/programs/popups/Makefile.am -+++ demos/programs/popups/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/autopopups -+pkgdatadir = $(datadir)/Xm/autopopups - - bin_PROGRAMS = autopopups - autopopups_SOURCES = autopopups.c - EXTRA_DIST = README autopopups.man Imakefile --data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/sampler2_0/Makefile.am -+++ demos/programs/sampler2_0/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/sampler2_0 -+pkgdatadir = $(datadir)/Xm/sampler2_0 - - EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ - labir.xpm main.xpm pile.xpm prev.xpm spir.xpm stack.xpm \ -@@ -8,7 +8,7 @@ - XmdSampler2_0.ad - bin_PROGRAMS = sampler2_0 - sampler2_0_SOURCES = sampler2_0.c --data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/setdate/Makefile.am -+++ demos/programs/setdate/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/setDate -+pkgdatadir = $(datadir)/Xm/setDate - - bin_PROGRAMS = setDate - EXTRA_DIST = XmdSetDate.ad README setDate.man Imakefile - setDate_SOURCES = setDate.c --data_DATA = $(EXTRA_DIST) $(setDate_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(setDate_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/todo/Makefile.am -+++ demos/programs/todo/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/todo -+pkgdatadir = $(datadir)/Xm/todo - - EXTRA_DIST = README XmdTodo.ad example.todo todo.man todo.help Imakefile - bin_PROGRAMS = todo - todo_SOURCES = todo.c io.c actions.c page.h --data_DATA = $(EXTRA_DIST) $(todo_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(todo_SOURCES) - - INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} - LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la ---- demos/programs/tooltips/Makefile.am -+++ demos/programs/tooltips/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/tooltips -+pkgdatadir = $(datadir)/Xm/tooltips - - EXTRA_DIST = Imakefile - bin_PROGRAMS = tooltips - tooltips_SOURCES = tooltips.c --data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) - LDADD = ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/workspace/Makefile.am -+++ demos/programs/workspace/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/wsm -+pkgdatadir = $(datadir)/Xm/wsm - - EXTRA_DIST = Imakefile README wsm.man - bin_PROGRAMS = wsm -@@ -8,6 +8,6 @@ - wsmSend.c wsmStruct.c wsm_cb.c wsm_create.c xrmLib.c \ - command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \ - wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h --data_DATA = $(wsm_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(wsm_SOURCES) $(EXTRA_DIST) - INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} - LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm ---- lib/Xm/Hash.c -+++ lib/Xm/Hash.c -@@ -198,6 +198,8 @@ - } else { - table -> buckets[index] = current; - } -+ } else { -+ last = current; - } - current = next; - } ---- Makefile.in.orig 2004-10-13 19:58:10.000000000 +0200 -+++ Makefile.in 2013-08-02 12:20:30.518131626 +0200 -@@ -405,7 +405,7 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ -+mkdir_p = mkdir -p -- . - oldincludedir = @oldincludedir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch b/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch index 6a8e75f5b7..1ca3a220e5 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4_various-fixes.patch @@ -1801,3 +1801,669 @@ openmotif22-strcmp.diff sentinel.diff warn.patch datadir.patch XmResizeHashTable if (type == XmFORMAT_XmSTRING) { +--- demos/programs/ButtonBox/bboxdemo.c ++++ demos/programs/ButtonBox/bboxdemo.c +@@ -668,4 +668,5 @@ + XtRealizeWidget(top); + + XtAppMainLoop(app); ++ return 0; + } +--- demos/programs/ColorSel/bxutil-c.c ++++ demos/programs/ColorSel/bxutil-c.c +@@ -3471,6 +3471,7 @@ + default: + return -1; + } ++ abort(); + } + + +@@ -3494,6 +3495,7 @@ + default: + return -1; + } ++ abort(); + } + + /* +--- demos/programs/FontSel/fontsel.c ++++ demos/programs/FontSel/fontsel.c +@@ -68,6 +68,7 @@ + * Returns: nothing + * + */ ++void + InitializeDemoForm(Widget form) + { + Widget w; +@@ -119,5 +120,6 @@ + XtRealizeWidget(top); + + XtAppMainLoop(app); ++ return 0; + } + +--- demos/programs/MultiList/bxutil-c.c ++++ demos/programs/MultiList/bxutil-c.c +@@ -3469,6 +3469,7 @@ + } + return (c); + } ++ abort(); + } + + +@@ -3490,6 +3491,7 @@ + mdata->InsideString = !mdata->InsideString; + return (ungetc(c, mdata->stream.file)); + } ++ abort(); + } + + /* +--- demos/programs/Tree/bxutil-c.c ++++ demos/programs/Tree/bxutil-c.c +@@ -3471,6 +3471,7 @@ + default: + return -1; + } ++ abort(); + } + + +@@ -3494,6 +3495,7 @@ + default: + return -1; + } ++ abort(); + } + + /* +--- tools/wml/wmlresolve.c ++++ tools/wml/wmlresolve.c +@@ -69,6 +69,7 @@ + + #if defined(__STDC__) + #include ++#include + #endif + #include + +--- demos/programs/ButtonBox/Makefile.am ++++ demos/programs/ButtonBox/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/ButtonBox ++pkgdatadir = $(datadir)/Xm/ButtonBox + + bin_PROGRAMS = bboxdemo + EXTRA_DIST = Imakefile + bboxdemo_SOURCES = bboxdemo.c +-data_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/ColorSel/Makefile.am ++++ demos/programs/ColorSel/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Color ++pkgdatadir = $(datadir)/Xm/Color + + bin_PROGRAMS = colordemo + colordemo_SOURCES = bxutil-c.c colordemo.c + EXTRA_DIST = Imakefile +-data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Column/Makefile.am ++++ demos/programs/Column/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Column ++pkgdatadir = $(datadir)/Xm/Column + + bin_PROGRAMS = column + column_SOURCES = column.c + EXTRA_DIST = Imakefile Column.ad +-data_DATA = $(EXTRA_DIST) $(column_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(column_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/DropDown/Makefile.am ++++ demos/programs/DropDown/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/DropDown ++pkgdatadir = $(datadir)/Xm/DropDown + + bin_PROGRAMS = dropdown + EXTRA_DIST = DropDown.ad Imakefile + dropdown_SOURCES = dropdown.c +-data_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Exm/app_in_c/Makefile.am ++++ demos/programs/Exm/app_in_c/Makefile.am +@@ -1,10 +1,9 @@ + MAINTAINERCLEANFILES = Makefile.in + +-bindir = ${prefix}/share/Xm/Exm/app_in_c +-datadir = ${prefix}/share/Xm/Exm/app_in_c ++pkgdatadir = $(datadir)/Xm/Exm/app_in_c + + man_MANS = exm_in_c.man +-bin_PROGRAMS = exm_in_c ++pkgdata_PROGRAMS = exm_in_c + exm_in_c_SOURCES = exm_in_c.c + + EXTRA_DIST = exm_in_c.man Imakefile +--- demos/programs/Exm/simple_app/Makefile.am ++++ demos/programs/Exm/simple_app/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-bindir = ${prefix}/share/Xm/Exm/simple_app +-datadir = ${prefix}/share/Xm/Exm/simple_app ++bindir = @datadir@/Xm/Exm/simple_app ++datadir = @datadir@/Xm/Exm/simple_app + + data_DATA = README + man_MANS = simpleDemo.man +--- demos/programs/FontSel/Makefile.am ++++ demos/programs/FontSel/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/fontsel ++pkgdatadir = $(datadir)/Xm/fontsel + + bin_PROGRAMS = fontsel + fontsel_SOURCES = callbacks-c.c creation-c.c fontsel.c fontsel.h + EXTRA_DIST = Imakefile +-data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/IconB/Makefile.am ++++ demos/programs/IconB/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Icon ++pkgdatadir= $(datadir)/Xm/Icon + + EXTRA_DIST = Imakefile small.bm + bin_PROGRAMS = iconbuttondemo + iconbuttondemo_SOURCES = misc.c iconbuttondemo.c +-data_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/MultiList/Makefile.am ++++ demos/programs/MultiList/Makefile.am +@@ -1,13 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/MultiList ++pkgdatadir = $(datadir)/Xm/MultiList + + bin_PROGRAMS = multilist + SUBDIRS = pixmaps + multilist_SOURCES = bxutil-c.c callbacks-c.c creation.c multilist.c \ + extlist.h + EXTRA_DIST = Imakefile +-data_DATA = $(EXTRA_DIST) $(multilist_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(multilist_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/MultiList/pixmaps/Makefile.am ++++ demos/programs/MultiList/pixmaps/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/MultiList/pixmaps ++pkgdatadir = $(datadir)/Xm/MultiList/pixmaps + + EXTRA_DIST = clown.xbm crab.xpm eye.xpm porsche.xpm stopsign.xpm +-data_DATA = $(EXTRA_DIST) ++pkgdata_DATA = $(EXTRA_DIST) +--- demos/programs/Outline/Makefile.am ++++ demos/programs/Outline/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Outline ++pkgdatadir = $(datadir)/Xm/Outline + + EXTRA_DIST = Imakefile + bin_PROGRAMS = outline + outline_SOURCES = outline.c +-data_DATA = $(outline_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(outline_SOURCES) $(EXTRA_DIST) + LDADD = $(TOPDIR)/lib/Xm/libXm.la + TOPDIR = ../../.. + INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} +--- demos/programs/Paned/Makefile.am ++++ demos/programs/Paned/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Paned2 ++pkgdatadir = $(datadir)/Xm/Paned2 + + EXTRA_DIST = Imakefile + bin_PROGRAMS = paned + paned_SOURCES = creation-c.c paned.c +-data_DATA = $(EXTRA_DIST) $(paned_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(paned_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/TabStack/Makefile.am ++++ demos/programs/TabStack/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Tabstack ++pkgdatadir = $(datadir)/Xm/Tabstack + + bin_PROGRAMS = tabstack + tabstack_SOURCES = bxutils.c callbacks.c creation.c main.c creation.h + EXTRA_DIST = Imakefile +-data_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/Tree/Makefile.am ++++ demos/programs/Tree/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/Tree ++pkgdatadir = $(datadir)/Xm/Tree + + EXTRA_DIST = Imakefile + bin_PROGRAMS = tree + tree_SOURCES = bxutil-c.c tree.c +-data_DATA = $(EXTRA_DIST) $(tree_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(tree_SOURCES) + TOPDIR = ../../.. + LDADD = $(TOPDIR)/lib/Xm/libXm.la + +--- demos/programs/airport/Makefile.am ++++ demos/programs/airport/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/airport ++pkgdatadir = $(datadir)/Xm/airport + + bin_PROGRAMS = airport + airport_SOURCES = main.c dragsource.c dropsite.c airport.h \ + dragsource.h dropsite.h main.h + EXTRA_DIST = Imakefile XmdAirport.ad README +-data_DATA = $(airport_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(airport_SOURCES) $(EXTRA_DIST) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/animate/Makefile.am ++++ demos/programs/animate/Makefile.am +@@ -1,6 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/animate ++pkgdatadir = $(datadir)/Xm/animate ++uiddir = $(datadir)/X11/uid + + EXTRA_DIST = dog.uil plane.uil superman.uil xmanimate.uil \ + superman1.xbm superman2.xbm superman3.xbm superman4.xbm \ +@@ -11,8 +12,8 @@ + + CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid + +-data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ +- $(EXTRA_DIST) ++pkgdata_DATA = $(xmanimate_SOURCES) $(EXTRA_DIST) ++uid_DATA = dog.uid plane.uid superman.uid xmanimate.uid + + bin_PROGRAMS = xmanimate + +--- demos/programs/draw/Makefile.am ++++ demos/programs/draw/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/draw ++pkgdatadir = $(datadir)/Xm/draw + + bin_PROGRAMS = draw + draw_SOURCES = draw.c + EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man +-data_DATA = $(EXTRA_DIST) $(draw_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(draw_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/earth/Makefile.am ++++ demos/programs/earth/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/earth ++pkgdatadir = $(datadir)/Xm/earth + + bin_PROGRAMS = earth + earth_SOURCES = earth.c + EXTRA_DIST = terre.xbm earth.man Imakefile README +-data_DATA = $(EXTRA_DIST) $(earth_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(earth_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/filemanager/Makefile.am ++++ demos/programs/filemanager/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/filemanager ++pkgdatadir = $(datadir)/Xm/filemanager + + bin_PROGRAMS = filemanager + filemanager_SOURCES = filemanager.c actions.c readdir.c convert.c \ +@@ -9,7 +9,7 @@ + Imakefile code.xpm dir.xpm exec.xpm file.xpm none.xpm \ + obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \ + s_none.xpm s_pix.xpm +-data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} + +--- demos/programs/fileview/Makefile.am ++++ demos/programs/fileview/Makefile.am +@@ -1,12 +1,14 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/fileview ++pkgdatadir = $(datadir)/Xm/fileview ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = fileview + fileview_SOURCES = main.c text.c file.c file.h fileE.h fileview.h main.h \ + mainE.h text.h textE.h + EXTRA_DIST = $(UILS) English.df French.df German.df README Fileview.ad +-data_DATA = French.uid German.uid English.uid $(fileview_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(fileview_SOURCES) $(EXTRA_DIST) ++uid_DATA = French.uid German.uid English.uid + + UILS= French.uil German.uil English.uil + +--- demos/programs/getsubres/Makefile.am ++++ demos/programs/getsubres/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/getsubres ++pkgdatadir = $(datadir)/Xm/getsubres + + bin_PROGRAMS = getsubres + EXTRA_DIST = getsubres.help getsubres.man README Imakefile + getsubres_SOURCES = getsubres.c +-data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/hellomotif/Makefile.am ++++ demos/programs/hellomotif/Makefile.am +@@ -1,11 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/hellomotif ++pkgdatadir = $(datadir)/Xm/hellomotif ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = hellomotif + EXTRA_DIST = hellomotif.uil Imakefile README + hellomotif_SOURCES = hellomotif.c +-data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid ++pkgdata_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) ++uid_DATA = hellomotif.uid + LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} + +--- demos/programs/hellomotifi18n/Makefile.am ++++ demos/programs/hellomotifi18n/Makefile.am +@@ -1,13 +1,15 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/helloint ++pkgdatadir = $(datadir)/Xm/helloint ++uiddir = $(datadir)/X11/uid + + SUBDIRS = C english french hebrew japan japanese swedish + EXTRA_DIST = README helloint.uil Imakefile helloint.man + CLEANFILES = helloint.uid + helloint_SOURCES = helloint.c + bin_PROGRAMS = helloint +-data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid ++pkgdata_DATA = $(EXTRA_DIST) $(helloint_SOURCES) ++uid_DATA = helloint.uid + helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid + + INCLUDES = -I$(top_srcdir)/lib ${X_CFLAGS} +--- demos/programs/i18ninput/Makefile.am ++++ demos/programs/i18ninput/Makefile.am +@@ -1,12 +1,12 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/i18ninput ++pkgdatadir = $(datadir)/Xm/i18ninput + + bin_PROGRAMS = i18ninput + i18ninput_SOURCES = i18ninput.c input.c + EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help \ + Imakefile +-data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/panner/Makefile.am ++++ demos/programs/panner/Makefile.am +@@ -1,10 +1,10 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/panner ++pkgdatadir = $(datadir)/Xm/panner + + bin_PROGRAMS = panner + panner_SOURCES = panner.c + EXTRA_DIST = README panner.man Imakefile +-data_DATA = $(EXTRA_DIST) $(panner_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(panner_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/periodic/Makefile.am ++++ demos/programs/periodic/Makefile.am +@@ -1,11 +1,13 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/periodic ++pkgdatadir = $(datadir)/Xm/periodic ++uiddir = $(datadir)/X11/uid + + bin_PROGRAMS = periodic + EXTRA_DIST = periodic.uil periodic_l.uil XmdPeriodic.ad Imakefile README + periodic_SOURCES = periodic.c +-data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid ++pkgdata_DATA = $(EXTRA_DIST) $(periodic_SOURCES) ++uid_DATA = periodic.uid + LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/piano/Makefile.am ++++ demos/programs/piano/Makefile.am +@@ -1,12 +1,12 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/piano ++pkgdatadir = $(datadir)/Xm/piano + + bin_PROGRAMS = piano + piano_SOURCES = piano.c + EXTRA_DIST = piano.images README Inv8_part1.piano Inv8_part2.piano \ + piano.man Imakefile +-data_DATA = $(EXTRA_DIST) $(piano_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(piano_SOURCES) + LDADD = ../../../lib/Xm/libXm.la -lm + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/pixmaps/Makefile.am ++++ demos/programs/pixmaps/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/pixmaps ++pkgdatadir = $(datadir)/Xm/pixmaps + + EXTRA_DIST = crab.xpm eye.xpm porsche.xpm stopsign.xpm clown.xbm + +-data_DATA = $(EXTRA_DIST) ++pkgdata_DATA = $(EXTRA_DIST) +--- demos/programs/popups/Makefile.am ++++ demos/programs/popups/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/autopopups ++pkgdatadir = $(datadir)/Xm/autopopups + + bin_PROGRAMS = autopopups + autopopups_SOURCES = autopopups.c + EXTRA_DIST = README autopopups.man Imakefile +-data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/sampler2_0/Makefile.am ++++ demos/programs/sampler2_0/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/sampler2_0 ++pkgdatadir = $(datadir)/Xm/sampler2_0 + + EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ + labir.xpm main.xpm pile.xpm prev.xpm spir.xpm stack.xpm \ +@@ -8,7 +8,7 @@ + XmdSampler2_0.ad + bin_PROGRAMS = sampler2_0 + sampler2_0_SOURCES = sampler2_0.c +-data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) + LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/setdate/Makefile.am ++++ demos/programs/setdate/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/setDate ++pkgdatadir = $(datadir)/Xm/setDate + + bin_PROGRAMS = setDate + EXTRA_DIST = XmdSetDate.ad README setDate.man Imakefile + setDate_SOURCES = setDate.c +-data_DATA = $(EXTRA_DIST) $(setDate_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(setDate_SOURCES) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/todo/Makefile.am ++++ demos/programs/todo/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/todo ++pkgdatadir = $(datadir)/Xm/todo + + EXTRA_DIST = README XmdTodo.ad example.todo todo.man todo.help Imakefile + bin_PROGRAMS = todo + todo_SOURCES = todo.c io.c actions.c page.h +-data_DATA = $(EXTRA_DIST) $(todo_SOURCES) ++pkgdata_DATA = $(EXTRA_DIST) $(todo_SOURCES) + + INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} + LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la +--- demos/programs/tooltips/Makefile.am ++++ demos/programs/tooltips/Makefile.am +@@ -1,11 +1,11 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/tooltips ++pkgdatadir = $(datadir)/Xm/tooltips + + EXTRA_DIST = Imakefile + bin_PROGRAMS = tooltips + tooltips_SOURCES = tooltips.c +-data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) + LDADD = ../../../lib/Xm/libXm.la + + INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} +--- demos/programs/workspace/Makefile.am ++++ demos/programs/workspace/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-datadir = ${prefix}/share/Xm/wsm ++pkgdatadir = $(datadir)/Xm/wsm + + EXTRA_DIST = Imakefile README wsm.man + bin_PROGRAMS = wsm +@@ -8,6 +8,6 @@ + wsmSend.c wsmStruct.c wsm_cb.c wsm_create.c xrmLib.c \ + command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \ + wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h +-data_DATA = $(wsm_SOURCES) $(EXTRA_DIST) ++pkgdata_DATA = $(wsm_SOURCES) $(EXTRA_DIST) + INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} + LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm +--- lib/Xm/Hash.c ++++ lib/Xm/Hash.c +@@ -198,6 +198,8 @@ + } else { + table -> buckets[index] = current; + } ++ } else { ++ last = current; + } + current = next; + } +--- Makefile.in.orig 2004-10-13 19:58:10.000000000 +0200 ++++ Makefile.in 2013-08-02 12:20:30.518131626 +0200 +@@ -405,7 +405,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ ++mkdir_p = mkdir -p -- . + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ -- GitLab From a9cf37a6f3958f0a4dadb3ed1a57772db9fa7301 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 17:56:40 +0100 Subject: [PATCH 169/811] enforce that ARB sources are versioned, need to be downloaded manually for now --- easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb | 4 ++-- easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb index 0017c13626..5aa0f9160c 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb @@ -8,8 +8,8 @@ to the respective sequence entries is structured according to phylogeny or other toolchain = {'name': 'goolf', 'version': '1.4.10'} -sources = ['%(namelower)ssrc.tgz'] -source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] +# download from http://download.arb-home.de/release/arb_5.5, and rename to include version +sources = ['%(namelower)s-%(version)s-src.tgz'] patches = [ '%(name)s-%(version)s_xmkmf.patch', diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb index 359b78e779..6cfa20d12c 100644 --- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb @@ -7,8 +7,8 @@ handling and data analysis. A central database of processed (aligned) sequences to the respective sequence entries is structured according to phylogeny or other user defined criteria.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) -sources = ['%(namelower)ssrc.tgz'] -source_urls = ['http://download.arb-home.de/release/arb_%(version)s'] +# download from http://download.arb-home.de/release/arb_5.5, and rename to include version +sources = ['%(namelower)s-%(version)s-src.tgz'] patches = [ '%(name)s-%(version)s_xmkmf.patch', -- GitLab From 8f38fdb9c7e9f3d253a88da85bd95d9adf71ea98 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 20:17:14 +0100 Subject: [PATCH 170/811] remove individual motif patch files that were collapsed into one big patch file --- .../easyconfigs/m/motif/PrintableString.diff | 21 - .../m/motif/XmResizeHashTable.patch | 11 - easybuild/easyconfigs/m/motif/datadir.patch | 555 ------------ easybuild/easyconfigs/m/motif/mkdir.patch | 11 - .../easyconfigs/m/motif/openmotif-2.2.4.diff | 611 ------------- .../easyconfigs/m/motif/openmotif-uil.diff | 201 ----- .../easyconfigs/m/motif/openmotif-xpm.diff | 808 ------------------ .../motif/openmotif22-add_LONG64_define.diff | 10 - .../m/motif/openmotif22-strcmp.diff | 20 - easybuild/easyconfigs/m/motif/sentinel.diff | 128 --- easybuild/easyconfigs/m/motif/warn.patch | 89 -- 11 files changed, 2465 deletions(-) delete mode 100644 easybuild/easyconfigs/m/motif/PrintableString.diff delete mode 100644 easybuild/easyconfigs/m/motif/XmResizeHashTable.patch delete mode 100644 easybuild/easyconfigs/m/motif/datadir.patch delete mode 100644 easybuild/easyconfigs/m/motif/mkdir.patch delete mode 100644 easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff delete mode 100644 easybuild/easyconfigs/m/motif/openmotif-uil.diff delete mode 100644 easybuild/easyconfigs/m/motif/openmotif-xpm.diff delete mode 100644 easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff delete mode 100644 easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff delete mode 100644 easybuild/easyconfigs/m/motif/sentinel.diff delete mode 100644 easybuild/easyconfigs/m/motif/warn.patch diff --git a/easybuild/easyconfigs/m/motif/PrintableString.diff b/easybuild/easyconfigs/m/motif/PrintableString.diff deleted file mode 100644 index 87691b5bc1..0000000000 --- a/easybuild/easyconfigs/m/motif/PrintableString.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/Xm/TextF.c -+++ lib/Xm/TextF.c -@@ -3723,15 +3723,15 @@ - cache_ptr = tmp = XmStackAlloc(buf_size, cache); - - tmp_str = (wchar_t *)str; -- ret_val = wctomb(tmp, *tmp_str); -+ ret_val = 0; - count = 0; -- while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) -+ while (count < n && buf_size >= MB_CUR_MAX && -+ (ret_val = wctomb(tmp, *tmp_str)) > 0) - { - count += 1; - tmp += ret_val; - buf_size -= ret_val; - tmp_str++; -- ret_val = wctomb(tmp, *tmp_str); - } - - if (ret_val == -1) /* bad character */ diff --git a/easybuild/easyconfigs/m/motif/XmResizeHashTable.patch b/easybuild/easyconfigs/m/motif/XmResizeHashTable.patch deleted file mode 100644 index 5982f72249..0000000000 --- a/easybuild/easyconfigs/m/motif/XmResizeHashTable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Xm/Hash.c -+++ lib/Xm/Hash.c -@@ -198,6 +198,8 @@ - } else { - table -> buckets[index] = current; - } -+ } else { -+ last = current; - } - current = next; - } diff --git a/easybuild/easyconfigs/m/motif/datadir.patch b/easybuild/easyconfigs/m/motif/datadir.patch deleted file mode 100644 index 64e4922111..0000000000 --- a/easybuild/easyconfigs/m/motif/datadir.patch +++ /dev/null @@ -1,555 +0,0 @@ ---- demos/programs/ButtonBox/Makefile.am -+++ demos/programs/ButtonBox/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/ButtonBox -+pkgdatadir = $(datadir)/Xm/ButtonBox - - bin_PROGRAMS = bboxdemo - EXTRA_DIST = Imakefile - bboxdemo_SOURCES = bboxdemo.c --data_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/ColorSel/Makefile.am -+++ demos/programs/ColorSel/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Color -+pkgdatadir = $(datadir)/Xm/Color - - bin_PROGRAMS = colordemo - colordemo_SOURCES = bxutil-c.c colordemo.c - EXTRA_DIST = Imakefile --data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(colordemo_SOURCES) $(EXTRA_DIST) - LDADD = $(TOPDIR)/lib/Xm/libXm.la - TOPDIR = ../../.. - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/Column/Makefile.am -+++ demos/programs/Column/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Column -+pkgdatadir = $(datadir)/Xm/Column - - bin_PROGRAMS = column - column_SOURCES = column.c - EXTRA_DIST = Imakefile Column.ad --data_DATA = $(EXTRA_DIST) $(column_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(column_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/DropDown/Makefile.am -+++ demos/programs/DropDown/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/DropDown -+pkgdatadir = $(datadir)/Xm/DropDown - - bin_PROGRAMS = dropdown - EXTRA_DIST = DropDown.ad Imakefile - dropdown_SOURCES = dropdown.c --data_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(dropdown_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/Exm/app_in_c/Makefile.am -+++ demos/programs/Exm/app_in_c/Makefile.am -@@ -1,10 +1,9 @@ - MAINTAINERCLEANFILES = Makefile.in - --bindir = ${prefix}/share/Xm/Exm/app_in_c --datadir = ${prefix}/share/Xm/Exm/app_in_c -+pkgdatadir = $(datadir)/Xm/Exm/app_in_c - - man_MANS = exm_in_c.man --bin_PROGRAMS = exm_in_c -+pkgdata_PROGRAMS = exm_in_c - exm_in_c_SOURCES = exm_in_c.c - - EXTRA_DIST = exm_in_c.man Imakefile ---- demos/programs/Exm/simple_app/Makefile.am -+++ demos/programs/Exm/simple_app/Makefile.am -@@ -1,7 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - --bindir = ${prefix}/share/Xm/Exm/simple_app --datadir = ${prefix}/share/Xm/Exm/simple_app -+bindir = @datadir@/Xm/Exm/simple_app -+datadir = @datadir@/Xm/Exm/simple_app - - data_DATA = README - man_MANS = simpleDemo.man ---- demos/programs/FontSel/Makefile.am -+++ demos/programs/FontSel/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/fontsel -+pkgdatadir = $(datadir)/Xm/fontsel - - bin_PROGRAMS = fontsel - fontsel_SOURCES = callbacks-c.c creation-c.c fontsel.c fontsel.h - EXTRA_DIST = Imakefile --data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(fontsel_SOURCES) - LDADD = $(TOPDIR)/lib/Xm/libXm.la - TOPDIR = ../../.. - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/IconB/Makefile.am -+++ demos/programs/IconB/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Icon -+pkgdatadir= $(datadir)/Xm/Icon - - EXTRA_DIST = Imakefile small.bm - bin_PROGRAMS = iconbuttondemo - iconbuttondemo_SOURCES = misc.c iconbuttondemo.c --data_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/MultiList/Makefile.am -+++ demos/programs/MultiList/Makefile.am -@@ -1,13 +1,13 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/MultiList -+pkgdatadir = $(datadir)/Xm/MultiList - - bin_PROGRAMS = multilist - SUBDIRS = pixmaps - multilist_SOURCES = bxutil-c.c callbacks-c.c creation.c multilist.c \ - extlist.h - EXTRA_DIST = Imakefile --data_DATA = $(EXTRA_DIST) $(multilist_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(multilist_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/MultiList/pixmaps/Makefile.am -+++ demos/programs/MultiList/pixmaps/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/MultiList/pixmaps -+pkgdatadir = $(datadir)/Xm/MultiList/pixmaps - - EXTRA_DIST = clown.xbm crab.xpm eye.xpm porsche.xpm stopsign.xpm --data_DATA = $(EXTRA_DIST) -+pkgdata_DATA = $(EXTRA_DIST) ---- demos/programs/Outline/Makefile.am -+++ demos/programs/Outline/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Outline -+pkgdatadir = $(datadir)/Xm/Outline - - EXTRA_DIST = Imakefile - bin_PROGRAMS = outline - outline_SOURCES = outline.c --data_DATA = $(outline_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(outline_SOURCES) $(EXTRA_DIST) - LDADD = $(TOPDIR)/lib/Xm/libXm.la - TOPDIR = ../../.. - INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} ---- demos/programs/Paned/Makefile.am -+++ demos/programs/Paned/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Paned2 -+pkgdatadir = $(datadir)/Xm/Paned2 - - EXTRA_DIST = Imakefile - bin_PROGRAMS = paned - paned_SOURCES = creation-c.c paned.c --data_DATA = $(EXTRA_DIST) $(paned_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(paned_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/TabStack/Makefile.am -+++ demos/programs/TabStack/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Tabstack -+pkgdatadir = $(datadir)/Xm/Tabstack - - bin_PROGRAMS = tabstack - tabstack_SOURCES = bxutils.c callbacks.c creation.c main.c creation.h - EXTRA_DIST = Imakefile --data_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(tabstack_SOURCES) $(EXTRA_DIST) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/Tree/Makefile.am -+++ demos/programs/Tree/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/Tree -+pkgdatadir = $(datadir)/Xm/Tree - - EXTRA_DIST = Imakefile - bin_PROGRAMS = tree - tree_SOURCES = bxutil-c.c tree.c --data_DATA = $(EXTRA_DIST) $(tree_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(tree_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - ---- demos/programs/airport/Makefile.am -+++ demos/programs/airport/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/airport -+pkgdatadir = $(datadir)/Xm/airport - - bin_PROGRAMS = airport - airport_SOURCES = main.c dragsource.c dropsite.c airport.h \ - dragsource.h dropsite.h main.h - EXTRA_DIST = Imakefile XmdAirport.ad README --data_DATA = $(airport_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(airport_SOURCES) $(EXTRA_DIST) - LDADD = ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/animate/Makefile.am -+++ demos/programs/animate/Makefile.am -@@ -1,6 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/animate -+pkgdatadir = $(datadir)/Xm/animate -+uiddir = $(datadir)/X11/uid - - EXTRA_DIST = dog.uil plane.uil superman.uil xmanimate.uil \ - superman1.xbm superman2.xbm superman3.xbm superman4.xbm \ -@@ -11,8 +12,8 @@ - - CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid - --data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ -- $(EXTRA_DIST) -+pkgdata_DATA = $(xmanimate_SOURCES) $(EXTRA_DIST) -+uid_DATA = dog.uid plane.uid superman.uid xmanimate.uid - - bin_PROGRAMS = xmanimate - ---- demos/programs/draw/Makefile.am -+++ demos/programs/draw/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/draw -+pkgdatadir = $(datadir)/Xm/draw - - bin_PROGRAMS = draw - draw_SOURCES = draw.c - EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man --data_DATA = $(EXTRA_DIST) $(draw_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(draw_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/earth/Makefile.am -+++ demos/programs/earth/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/earth -+pkgdatadir = $(datadir)/Xm/earth - - bin_PROGRAMS = earth - earth_SOURCES = earth.c - EXTRA_DIST = terre.xbm earth.man Imakefile README --data_DATA = $(EXTRA_DIST) $(earth_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(earth_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/filemanager/Makefile.am -+++ demos/programs/filemanager/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/filemanager -+pkgdatadir = $(datadir)/Xm/filemanager - - bin_PROGRAMS = filemanager - filemanager_SOURCES = filemanager.c actions.c readdir.c convert.c \ -@@ -9,7 +9,7 @@ - Imakefile code.xpm dir.xpm exec.xpm file.xpm none.xpm \ - obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \ - s_none.xpm s_pix.xpm --data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} - ---- demos/programs/fileview/Makefile.am -+++ demos/programs/fileview/Makefile.am -@@ -1,12 +1,14 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/fileview -+pkgdatadir = $(datadir)/Xm/fileview -+uiddir = $(datadir)/X11/uid - - bin_PROGRAMS = fileview - fileview_SOURCES = main.c text.c file.c file.h fileE.h fileview.h main.h \ - mainE.h text.h textE.h - EXTRA_DIST = $(UILS) English.df French.df German.df README Fileview.ad --data_DATA = French.uid German.uid English.uid $(fileview_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(fileview_SOURCES) $(EXTRA_DIST) -+uid_DATA = French.uid German.uid English.uid - - UILS= French.uil German.uil English.uil - ---- demos/programs/getsubres/Makefile.am -+++ demos/programs/getsubres/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/getsubres -+pkgdatadir = $(datadir)/Xm/getsubres - - bin_PROGRAMS = getsubres - EXTRA_DIST = getsubres.help getsubres.man README Imakefile - getsubres_SOURCES = getsubres.c --data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/hellomotif/Makefile.am -+++ demos/programs/hellomotif/Makefile.am -@@ -1,11 +1,13 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/hellomotif -+pkgdatadir = $(datadir)/Xm/hellomotif -+uiddir = $(datadir)/X11/uid - - bin_PROGRAMS = hellomotif - EXTRA_DIST = hellomotif.uil Imakefile README - hellomotif_SOURCES = hellomotif.c --data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid -+pkgdata_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) -+uid_DATA = hellomotif.uid - LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} - ---- demos/programs/hellomotifi18n/Makefile.am -+++ demos/programs/hellomotifi18n/Makefile.am -@@ -1,13 +1,15 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/helloint -+pkgdatadir = $(datadir)/Xm/helloint -+uiddir = $(datadir)/X11/uid - - SUBDIRS = C english french hebrew japan japanese swedish - EXTRA_DIST = README helloint.uil Imakefile helloint.man - CLEANFILES = helloint.uid - helloint_SOURCES = helloint.c - bin_PROGRAMS = helloint --data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid -+pkgdata_DATA = $(EXTRA_DIST) $(helloint_SOURCES) -+uid_DATA = helloint.uid - helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid - - INCLUDES = -I$(top_srcdir)/lib ${X_CFLAGS} ---- demos/programs/i18ninput/Makefile.am -+++ demos/programs/i18ninput/Makefile.am -@@ -1,12 +1,12 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/i18ninput -+pkgdatadir = $(datadir)/Xm/i18ninput - - bin_PROGRAMS = i18ninput - i18ninput_SOURCES = i18ninput.c input.c - EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help \ - Imakefile --data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/panner/Makefile.am -+++ demos/programs/panner/Makefile.am -@@ -1,10 +1,10 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/panner -+pkgdatadir = $(datadir)/Xm/panner - - bin_PROGRAMS = panner - panner_SOURCES = panner.c - EXTRA_DIST = README panner.man Imakefile --data_DATA = $(EXTRA_DIST) $(panner_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(panner_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/periodic/Makefile.am -+++ demos/programs/periodic/Makefile.am -@@ -1,11 +1,13 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/periodic -+pkgdatadir = $(datadir)/Xm/periodic -+uiddir = $(datadir)/X11/uid - - bin_PROGRAMS = periodic - EXTRA_DIST = periodic.uil periodic_l.uil XmdPeriodic.ad Imakefile README - periodic_SOURCES = periodic.c --data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid -+pkgdata_DATA = $(EXTRA_DIST) $(periodic_SOURCES) -+uid_DATA = periodic.uid - LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/piano/Makefile.am -+++ demos/programs/piano/Makefile.am -@@ -1,12 +1,12 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/piano -+pkgdatadir = $(datadir)/Xm/piano - - bin_PROGRAMS = piano - piano_SOURCES = piano.c - EXTRA_DIST = piano.images README Inv8_part1.piano Inv8_part2.piano \ - piano.man Imakefile --data_DATA = $(EXTRA_DIST) $(piano_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(piano_SOURCES) - LDADD = ../../../lib/Xm/libXm.la -lm - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/pixmaps/Makefile.am -+++ demos/programs/pixmaps/Makefile.am -@@ -1,7 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/pixmaps -+pkgdatadir = $(datadir)/Xm/pixmaps - - EXTRA_DIST = crab.xpm eye.xpm porsche.xpm stopsign.xpm clown.xbm - --data_DATA = $(EXTRA_DIST) -+pkgdata_DATA = $(EXTRA_DIST) ---- demos/programs/popups/Makefile.am -+++ demos/programs/popups/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/autopopups -+pkgdatadir = $(datadir)/Xm/autopopups - - bin_PROGRAMS = autopopups - autopopups_SOURCES = autopopups.c - EXTRA_DIST = README autopopups.man Imakefile --data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(autopopups_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/sampler2_0/Makefile.am -+++ demos/programs/sampler2_0/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/sampler2_0 -+pkgdatadir = $(datadir)/Xm/sampler2_0 - - EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ - labir.xpm main.xpm pile.xpm prev.xpm spir.xpm stack.xpm \ -@@ -8,7 +8,7 @@ - XmdSampler2_0.ad - bin_PROGRAMS = sampler2_0 - sampler2_0_SOURCES = sampler2_0.c --data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) - LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/setdate/Makefile.am -+++ demos/programs/setdate/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/setDate -+pkgdatadir = $(datadir)/Xm/setDate - - bin_PROGRAMS = setDate - EXTRA_DIST = XmdSetDate.ad README setDate.man Imakefile - setDate_SOURCES = setDate.c --data_DATA = $(EXTRA_DIST) $(setDate_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(setDate_SOURCES) - LDADD = ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/todo/Makefile.am -+++ demos/programs/todo/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/todo -+pkgdatadir = $(datadir)/Xm/todo - - EXTRA_DIST = README XmdTodo.ad example.todo todo.man todo.help Imakefile - bin_PROGRAMS = todo - todo_SOURCES = todo.c io.c actions.c page.h --data_DATA = $(EXTRA_DIST) $(todo_SOURCES) -+pkgdata_DATA = $(EXTRA_DIST) $(todo_SOURCES) - - INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} - LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la ---- demos/programs/tooltips/Makefile.am -+++ demos/programs/tooltips/Makefile.am -@@ -1,11 +1,11 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/tooltips -+pkgdatadir = $(datadir)/Xm/tooltips - - EXTRA_DIST = Imakefile - bin_PROGRAMS = tooltips - tooltips_SOURCES = tooltips.c --data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(tooltips_SOURCES) $(EXTRA_DIST) - LDADD = ../../../lib/Xm/libXm.la - - INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS} ---- demos/programs/workspace/Makefile.am -+++ demos/programs/workspace/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - --datadir = ${prefix}/share/Xm/wsm -+pkgdatadir = $(datadir)/Xm/wsm - - EXTRA_DIST = Imakefile README wsm.man - bin_PROGRAMS = wsm -@@ -8,6 +8,6 @@ - wsmSend.c wsmStruct.c wsm_cb.c wsm_create.c xrmLib.c \ - command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \ - wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h --data_DATA = $(wsm_SOURCES) $(EXTRA_DIST) -+pkgdata_DATA = $(wsm_SOURCES) $(EXTRA_DIST) - INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS} - LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm diff --git a/easybuild/easyconfigs/m/motif/mkdir.patch b/easybuild/easyconfigs/m/motif/mkdir.patch deleted file mode 100644 index ca5787bf45..0000000000 --- a/easybuild/easyconfigs/m/motif/mkdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2004-10-13 19:58:10.000000000 +0200 -+++ Makefile.in 2013-08-02 12:20:30.518131626 +0200 -@@ -405,7 +405,7 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ -+mkdir_p = mkdir -p -- . - oldincludedir = @oldincludedir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ diff --git a/easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff b/easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff deleted file mode 100644 index 9aa3db8a9c..0000000000 --- a/easybuild/easyconfigs/m/motif/openmotif-2.2.4.diff +++ /dev/null @@ -1,611 +0,0 @@ ---- Makefile.am -+++ Makefile.am -@@ -28,6 +28,5 @@ - include \ - tools \ - clients \ -- doc \ -- demos --AUTOMAKE_OPTIONS = 1.4 -+ doc -+AUTOMAKE_OPTIONS = 1.4 foreign ---- clients/uil/Makefile.am -+++ clients/uil/Makefile.am -@@ -6,7 +6,7 @@ - # - bin_PROGRAMS = uil - --LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ -+libUil_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ - - UilParser.lo: UilParser.c - $(LTCOMPILE) -DCALLABLE -c UilParser.c -@@ -42,7 +42,7 @@ - UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c - - SRCS = $(COMMON_SRC) --SRCS2 = $(COMMON_SRC) UilMain.c -+SRCS2 = UilMain.c - - HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ - UilDef.h XmAppl.uil -@@ -72,6 +72,7 @@ - $(LN_S) $(srcdir)/../../tools/wml/UilDBDef.h UilDBDef.h - - uil_SOURCES = $(SRCS2) -+uil_LDADD += libUil.la - - if MessageCatalog - ---- config/cf/Imake.cf -+++ config/cf/Imake.cf -@@ -570,6 +570,9 @@ - # ifdef i386 - # define i386Architecture - # undef i386 -+# undef i486 -+# undef i586 -+# undef i686 - # endif /* i386 */ - # ifdef __i386__ - # ifndef i386Architecture -@@ -593,6 +596,32 @@ - # define PowerPCArchitecture - # undef powerpc - # endif -+# ifdef __s390__ -+# define s390Architecture -+# undef __s390__ -+# endif -+# ifdef __s390x__ -+# define s390xArchitecture -+# undef __s390x__ -+# endif -+# ifdef __x86_64__ -+# define x86_64Architecture -+# undef __x86_64__ -+# endif -+# ifdef mips -+# define MipsArchitecture -+# undef mips -+# endif -+# ifdef sparc -+# define SparcArchitecture -+# undef sparc -+# endif -+# ifdef __sparc__ -+# ifndef SparcArchitecture -+# define SparcArchitecture -+# endif -+# undef __sparc__ -+# endif - # if defined(arm) || defined(__arm__) - # define ArmArchitecture - # undef arm -@@ -607,6 +636,10 @@ - # undef __ARM_ARCH_3__ - # endif - # endif -+# ifdef __ia64__ -+# define ia64Architecture -+# undef __ia64__ -+# endif /* __ia64__ */ - #endif /* linux */ - - #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) ---- config/cf/Imake.tmpl -+++ config/cf/Imake.tmpl -@@ -502,14 +502,18 @@ - #define DefaultUsrBin /usr/bin - #endif - -+#ifndef LibDirName -+# define LibDirName lib -+#endif -+ - #ifndef UsrLibDir - #ifdef ProjectRoot --#define UsrLibDir Concat(ProjectRoot,/lib) -+#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir /usr/lib -+#define UsrLibDir Concat(/usr/,LibDirName) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif ---- config/cf/linux.cf -+++ config/cf/linux.cf -@@ -41,8 +41,9 @@ - /* Set some defaults for the Default* values in case imake doesn't find them */ - #ifndef DefaultLinuxCLibMajorVersion - #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ -- defined(SparcArchitecture) || defined(ArmArchitecure) || \ -- defined(i386Architecture) -+ defined(SparcArchitecture) || defined(ArmArchitecure) || defined(MipsArchitecure) || \ -+ defined(i386Architecture) || defined(ia64Architecture) || defined(s390Architecture) || \ -+ defined(s390xArchitecture) || defined(x86_64Architecture) - #define DefaultLinuxCLibMajorVersion 6 - #else - #define DefaultLinuxCLibMajorVersion 5 -@@ -159,7 +160,24 @@ - #define UseStaticTermcapLib NO - #endif - -+#ifndef HaveLib64 -+# if defined (x86_64Architecture) || defined (s390xArchitecture) -+# define HaveLib64 YES -+# else -+# define HaveLib64 NO -+# endif -+#endif -+ - #define MkdirHierCmd mkdir -p -+ -+#ifndef HaveLib64 -+# if defined (x86_64Architecture) || defined (s390xArchitecture) -+# define HaveLib64 YES -+# else -+# define HaveLib64 NO -+# endif -+#endif -+ - #if LinuxElfDefault - #if UseElfFormat - #define CcCmd gcc -@@ -234,7 +252,7 @@ - #endif - #define CppCmd /lib/cpp - #ifdef USE_BYACC --#define YaccCmd byacc -+#define YaccCmd yacc - #else - #define YaccCmd bison -y - #endif -@@ -261,6 +279,35 @@ - #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 - #endif /* AlphaArchitecture */ - -+#ifdef s390xArchitecture -+#define DefaultCCOptions -fsigned-char -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__s390x__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -+#else -+#ifdef s390Architecture -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__s390__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#endif /* s390Architecture */ -+#endif /* s390xArchitecture */ -+ -+#ifdef ia64Architecture -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__ia64__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -+#endif /* ia64Architecture */ -+ -+#ifdef x86_64Architecture -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__x86_64__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -+#endif /* ia64Architecture */ -+ - #ifdef Mc68020Architecture - #define OptimizedCDebugFlags -O2 - #define LinuxMachineDefines -D__mc68000__ -@@ -276,6 +323,14 @@ - #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* PowerPCArchitecture */ - -+#ifdef MipsArchitecture -+#define DefaultCCOptions -fsigned-char -+#define OptimizedCDebugFlags -O2 -mips2 -+#define LinuxMachineDefines -D__mips__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#endif /* MipsArchitecture */ -+ - #ifdef ArmArchitecture - #define DefaultCCOptions -fsigned-char - #define OptimizedCDebugFlags -O2 -@@ -284,6 +339,19 @@ - #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* Arm */ - -+#ifdef SparcArchitecture -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__sparc__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#define AsVISOption -Av9a -+#ifdef Sparc64Architecture -+#define AsOutputArchSize 64 -+#else -+#define AsOutputArchSize 32 -+#endif -+#endif -+ - #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines - - #ifndef TermcapLibrary -@@ -348,5 +416,11 @@ - #define MakeNamedTargetSubdir(dir,flags,subname)\ - $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname - -+#if HaveLib64 -+# ifndef LibDirName -+# define LibDirName lib64 -+# endif -+#endif -+ - #include - #include ---- config/imake/imakemdep.h -+++ config/imake/imakemdep.h -@@ -333,6 +333,18 @@ - # ifdef __i386__ - "-D__i386__", - # endif -+# ifdef __ia64__ -+ "-D__ia64__", -+# endif -+# ifdef __s390__ -+ "-D__s390__", -+# endif -+# ifdef __s390x__ -+ "-D__s390x__", -+# endif -+# ifdef __x86_64__ -+ "-D__x86_64__", -+# endif - # ifdef __sparc__ - "-D__sparc__", - # endif -@@ -936,6 +948,18 @@ - #ifdef __alpha__ - {"__alpha__", "1"}, - #endif -+#ifdef __ia64__ -+ {"__ia64__", "1"}, -+#endif -+#ifdef __x86_64__ -+ {"__x86_64__", "1"}, -+#endif -+#ifdef __s390__ -+ {"__s390__", "1"}, -+#endif -+#ifdef __s390x__ -+ {"__s390x__", "1"}, -+#endif - #ifdef __DECC - {"__DECC", "1"}, - #endif ---- configure.in -+++ configure.in -@@ -53,12 +53,13 @@ - save_CFLAGS="$CFLAGS" - LIBS="$X_LIBS $LIBS" - CFLAGS="$X_CFLAGS $CFLAGS" --AC_CHECK_HEADERS(X11/Xmu/Editres.h, --AC_CHECK_LIB(Xmu, _XEditResCheckMessages, -+AC_CHECK_HEADERS(X11/Xmu/Editres.h, [ -+AC_CHECK_LIB(Xmu, _XEditResCheckMessages, [ - X_XMU=-lXmu --AC_DEFINE(HAVE_LIBXMU) --, X_XMU="", -lXt -lX11) --) -+AC_DEFINE(HAVE_LIBXMU, 1, [ ]) -+], X_XMU="", -lXt -lX11) -+], [], -+[#include ]) - AC_SUBST(X_XMU) - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -@@ -140,8 +141,8 @@ - AC_HEADER_STDC - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/malloc.h strings.h sys/file.h sys/time.h unistd.h wchar.h) --AC_CHECK_HEADERS(wctype.h, AC_DEFINE(HAS_WIDECHAR_FUNCTIONS)) --AC_CHECK_HEADER(langinfo.h,,AC_DEFINE(CSRG_BASED)) -+AC_CHECK_HEADERS(wctype.h, [AC_DEFINE(HAS_WIDECHAR_FUNCTIONS, 1, [Define if wctype.h is available])]) -+AC_CHECK_HEADER(langinfo.h,,[AC_DEFINE(CSRG_BASED, 1, [ ])]) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -@@ -164,23 +165,23 @@ - AC_FUNC_VPRINTF - AM_FUNC_VOID_SPRINTF - AC_CHECK_FUNCS(wcslen wcscpy wcsncpy wcschr wcscat wcsncat getcwd gettimeofday mkdir re_comp regcmp select strcspn strerror strstr strtod strtol uname) --AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP)) --AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP)) --AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV)) --AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP)) --AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE)) -+AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP, 1, [ ])) -+AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP, 1, [ ])) -+AC_CHECK_FUNCS(putenv,,AC_DEFINE(NO_PUTENV, 1, [ ])) -+AC_CHECK_FUNCS(regcomp,,AC_DEFINE(NO_REGCOMP, 1, [ ])) -+AC_CHECK_FUNCS(memmove,,AC_DEFINE(NO_MEMMOVE, 1, [ ])) - - AC_ARG_ENABLE(message-catalog, [ --enable-message-catalog - Enable building of the message catalog (default=no)]) - if test "$enable_message_catalog" != "yes" - then -- AC_DEFINE(NO_MESSAGE_CATALOG) -+ AC_DEFINE(NO_MESSAGE_CATALOG, 1, [define to avoid building the message catalog]) - fi - AM_CONDITIONAL(MessageCatalog, test x$enable_message_catalog = xyes) - - if test -f $srcdir/lib/Xm/SlideC.h - then -- AC_DEFINE(HAVE_SLIDEC_H) -+ AC_DEFINE(HAVE_SLIDEC_H, 1, [ ]) - SLIDE_DIST="SlideC.c SlideC.h SlideCP.h" - fi - AC_SUBST(SLIDE_DIST) -@@ -190,7 +191,7 @@ - then - CFLAGS="$CFLAGS -Wall -Wno-unused -Wno-comment" - fi --AC_DEFINE(NO_OL_COMPAT) -+AC_DEFINE(NO_OL_COMPAT, 1, [Define to disable OpenLook compatibility]) - - CDE_INSTALLATION_TOP="\${prefix}/dt" - AC_SUBST(CDE_INSTALLATION_TOP) -@@ -198,13 +199,13 @@ - CDE_CONFIGURATION_TOP="\${prefix}/etc/dt" - AC_SUBST(CDE_CONFIGURATION_TOP) - --LIBDIR="${libdir}/X11" -+LIBDIR="${datadir}/X11" - AC_SUBST(LIBDIR) - - INCDIR="${includedir}/X11" - AC_SUBST(INCDIR) - --XMBINDDIR_FALLBACK="${libdir}/X11/bindings" -+XMBINDDIR_FALLBACK="${datadir}/X11/bindings" - AC_SUBST(XMBINDDIR_FALLBACK) - - case "$target_os" in ---- demos/programs/Column/column.c -+++ demos/programs/Column/column.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - - #define phone_width 16 ---- demos/programs/DropDown/dropdown.c -+++ demos/programs/DropDown/dropdown.c -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - static int done = 0; - ---- demos/programs/getsubres/getsubres.c -+++ demos/programs/getsubres/getsubres.c -@@ -384,7 +384,8 @@ - } - - static String fallbacks[] = { -- "*help_manager.helpFile: getsubres" -+ "*help_manager.helpFile: getsubres", -+ NULL - }; - - #define APP_CLASS "XmdGetsubres" ---- lib/Mrm/Makefile.am -+++ lib/Mrm/Makefile.am -@@ -8,7 +8,7 @@ - - libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} - --LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ -+libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ - - lib_LTLIBRARIES = libMrm.la - ---- lib/Mrm/MrmIheader.c -+++ lib/Mrm/MrmIheader.c -@@ -226,12 +226,7 @@ - file_id, NULL, MrmNOT_VALID); - } - -- { -- /* sscanf() may call ungetc(), which would write the XmConst string. */ -- char buf[XtNumber(idb__database_version) + 1]; -- strcpy(buf, idb__database_version); -- sscanf(buf, "URM %d.%d", &db_major, &db_minor); -- } -+ sscanf(idb__database_version, "URM %d.%d", &db_major, &db_minor); - - if ((file_major > db_major) || - ((file_major == db_major) && (file_minor > db_minor))) ---- lib/Mrm/MrmItop.c -+++ lib/Mrm/MrmItop.c -@@ -642,10 +642,12 @@ - * Local variables - */ - Cardinal result ; /* function results */ -+ IDBResource resource_id; - - if ( (result=Idb__FIL_Valid((IDBFile)file_id)) != MrmSUCCESS ) return result ; - result = Idb__RID_NextRID ((IDBFile)file_id, -- (IDBResource *)resource_id_return) ; -+ &resource_id) ; -+ *resource_id_return = resource_id; - return result ; - - } ---- lib/Xm/EditresCom.c -+++ lib/Xm/EditresCom.c -@@ -1772,7 +1772,7 @@ - XtFree((char *)widget_list); - } - --#if 0 -+#if 1 - /************************************************************ - * - * All of the following routines are public. -@@ -1923,7 +1923,7 @@ - * Returns: TRUE if sucessful. - */ - --Boolean -+Bool - _XEditResGet8(stream, val) - ProtocolStream * stream; - unsigned char * val; -@@ -1943,7 +1943,7 @@ - * Returns: TRUE if sucessful. - */ - --Boolean -+Bool - _XEditResGet16(stream, val) - ProtocolStream * stream; - unsigned short * val; -@@ -1964,7 +1964,7 @@ - * Returns: TRUE if sucessful. - */ - --Boolean -+Bool - _XEditResGetSigned16(stream, val) - ProtocolStream * stream; - short * val; -@@ -1993,7 +1993,7 @@ - * Returns: TRUE if sucessful. - */ - --Boolean -+Bool - _XEditResGet32(stream, val) - ProtocolStream * stream; - unsigned long * val; -@@ -2015,7 +2015,7 @@ - * Returns: True if retrieval was successful. - */ - --Boolean -+Bool - _XEditResGetString8(stream, str) - ProtocolStream * stream; - char ** str; -@@ -2048,7 +2048,7 @@ - * Returns: True if retrieval was successful. - */ - --Boolean -+Bool - _XEditResGetWidgetInfo(stream, info) - ProtocolStream * stream; - WidgetInfo * info; ---- lib/Xm/FontS.c -+++ lib/Xm/FontS.c -@@ -2865,7 +2865,7 @@ - - XmFontS_use_scaling(fsw) = info->set; - if (!info->set) { -- Boolean map_bad = (map = SizeMapping(cf->point_size) == 0); -+ Boolean map_bad = (map = SizeMapping(cf->point_size)) == 0; - Boolean bad_75 = (CheckFlag(XmFontS_user_state(fsw), DPI_75) && - !CheckLongFlag(family->sizes_75, map)); - Boolean bad_100 = (CheckFlag(XmFontS_user_state(fsw), DPI_100) && ---- lib/Xm/Makefile.am -+++ lib/Xm/Makefile.am -@@ -9,7 +9,7 @@ - ${X_CFLAGS} - xmdir = $(includedir)/Xm - --LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ -+libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ - - lib_LTLIBRARIES = libXm.la - ---- lib/Xm/Resolve.c -+++ lib/Xm/Resolve.c -@@ -149,11 +149,11 @@ - * Update the part size value (initially, it is the size of this part) - */ - w_class->core_class.widget_size = -- _ALIGN(w_class->core_class.widget_size) + super->core_class.widget_size; -+ _ALIGN(w_class->core_class.widget_size) + _ALIGN(super->core_class.widget_size); - if (cc && scc) - cc->constraint_class.constraint_size = - _ALIGN(cc->constraint_class.constraint_size) + -- scc->constraint_class.constraint_size; -+ _ALIGN(scc->constraint_class.constraint_size); - - /* - * Count the number of superclasses and allocate the offset record(s) -@@ -186,7 +186,7 @@ - scc = (ConstraintWidgetClass)(scc->core_class.superclass), i--) - if (IsConstraintClass((WidgetClass)scc)) - (*constraint_offset)[i] = -- scc->constraint_class.constraint_size; -+ _ALIGN(scc->constraint_class.constraint_size); - else - (*constraint_offset)[i] = 0; - ---- lib/Xm/XmRenderT.c -+++ lib/Xm/XmRenderT.c -@@ -1461,6 +1461,7 @@ - else { - union { - long longval; -+ int intval; - short shortval; - char charval; - char* charptr; -@@ -1468,6 +1469,7 @@ - } u; - char *p = (char*)&u; - if (size == sizeof(long)) u.longval = (long)src; -+ else if (size == sizeof(int)) u.longval = (int)src; - else if (size == sizeof(short)) u.shortval = (short)src; - else if (size == sizeof(char)) u.charval = (char)src; - else if (size == sizeof(XtPointer)) u.ptr = (XtPointer)src; -@@ -1486,6 +1488,7 @@ - * but preserve for compatibility as long as arglist contains NULL. - */ - if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src; -+ else if (size == sizeof(int)) *dst = (XtArgVal)*(int*)src; - else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src; - else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src; - else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src; -@@ -1496,6 +1499,7 @@ - else { - /* proper GetValues semantics: argval is pointer to destination */ - if (size == sizeof(long)) *((long*)*dst) = *(long*)src; -+ else if (size == sizeof(int)) *((int*)*dst) = *(int*)src; - else if (size == sizeof(short)) *((short*)*dst) = *(short*)src; - else if (size == sizeof(char)) *((char*)*dst) = *(char*)src; - else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src; ---- localized/util/mkcatdefs.c -+++ localized/util/mkcatdefs.c -@@ -76,9 +76,8 @@ - #include - #include - --#ifndef NL_TEXTMAX -+#undef NL_TEXTMAX - #define NL_TEXTMAX 8192 --#endif - - #ifndef PATH_MAX - #define PATH_MAX 1024 diff --git a/easybuild/easyconfigs/m/motif/openmotif-uil.diff b/easybuild/easyconfigs/m/motif/openmotif-uil.diff deleted file mode 100644 index 9b09a41c9a..0000000000 --- a/easybuild/easyconfigs/m/motif/openmotif-uil.diff +++ /dev/null @@ -1,201 +0,0 @@ ---- clients/uil/UilDiags.c -+++ clients/uil/UilDiags.c -@@ -207,9 +207,9 @@ - va_list ap; /* ptr to variable length parameter */ - int severity; /* severity of message */ - int message_number; /* message number */ -- char msg_buffer[132]; /* buffer to construct message */ -+ char *msg_buffer = 0; /* buffer to construct message */ - char ptr_buffer[buf_size]; /* buffer to construct pointer */ -- char loc_buffer[132]; /* buffer to construct location */ -+ char *loc_buffer = 0; /* buffer to construct location */ - char src_buffer[buf_size]; /* buffer to hold source line */ - - /* -@@ -293,19 +293,18 @@ - va_start(ap, l_start_column); - - #ifndef NO_MESSAGE_CATALOG -- vsprintf( msg_buffer, -+ vasprintf(&msg_buffer, - catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ], - diag_rz_msg_table[ message_number ].ac_text), - ap ); - #else -- vsprintf( msg_buffer, -+ vasprintf(&msg_buffer, - diag_rz_msg_table[ message_number ].ac_text, - ap ); - #endif - va_end(ap); - - src_buffer[ 0 ] = 0; -- loc_buffer[ 0 ] = 0; - ptr_buffer[ 0 ] = 0; - - if (az_src_rec != diag_k_no_source) -@@ -317,13 +316,13 @@ - */ - - #ifndef NO_MESSAGE_CATALOG -- sprintf( loc_buffer, -+ asprintf(&loc_buffer, - catgets(uil_catd, UIL_SET_MISC, - UIL_MISC_0, "\t\t line: %d file: %s"), - az_src_rec->w_line_number, - src_get_file_name( az_src_rec ) ); - #else -- sprintf( loc_buffer, -+ asprintf(&loc_buffer, - "\t\t line: %d file: %s", - az_src_rec->w_line_number, - src_get_file_name( az_src_rec ) ); -@@ -371,7 +370,7 @@ - - if (l_start_column != diag_k_no_column) - #ifndef NO_MESSAGE_CATALOG -- sprintf(loc_buffer, -+ asprintf(&loc_buffer, - catgets(uil_catd, UIL_SET_MISC, - UIL_MISC_1, - "\t\t line: %d position: %d file: %s"), -@@ -379,7 +378,7 @@ - l_start_column + 1, - src_get_file_name( az_src_rec ) ); - #else -- sprintf(loc_buffer, -+ asprintf(&loc_buffer, - "\t\t line: %d position: %d file: %s", - az_src_rec->w_line_number, - l_start_column + 1, -@@ -387,13 +386,13 @@ - #endif - else - #ifndef NO_MESSAGE_CATALOG -- sprintf( loc_buffer, catgets(uil_catd, UIL_SET_MISC, -+ asprintf(&loc_buffer, catgets(uil_catd, UIL_SET_MISC, - UIL_MISC_0, - "\t\t line: %d file: %s"), - az_src_rec->w_line_number, - src_get_file_name( az_src_rec ) ); - #else -- sprintf( loc_buffer, -+ asprintf(&loc_buffer, - "\t\t line: %d file: %s", - az_src_rec->w_line_number, - src_get_file_name( az_src_rec ) ); -@@ -406,7 +405,8 @@ - */ - - write_msg_to_standard_error -- ( message_number, src_buffer, ptr_buffer, msg_buffer, loc_buffer ); -+ ( message_number, src_buffer, ptr_buffer, msg_buffer, -+ loc_buffer ? loc_buffer : ""); - - /* - ** if we have a listing, place message in the source structure -@@ -428,6 +428,8 @@ - uil_exit( uil_k_severe_status ); - } - -+ free (loc_buffer); -+ free (msg_buffer); - } - - /* ---- clients/uil/UilIODef.h -+++ clients/uil/UilIODef.h -@@ -75,7 +75,7 @@ - char *c_buffer; - boolean v_position_before_get; - z_key last_key; -- char expanded_name[ 256 ]; -+ char *expanded_name; - } uil_fcb_type; - - #endif /* UilIODef_h */ ---- clients/uil/UilSrcSrc.c -+++ clients/uil/UilSrcSrc.c -@@ -271,6 +271,7 @@ - diag_k_no_source, diag_k_no_column, - src_az_source_file_table[i]->expanded_name); - } -+ _free_memory (src_az_source_file_table[i]->expanded_name); - _free_memory ((char*)src_az_source_file_table [i]); - src_az_source_file_table[i] = NULL; - } -@@ -626,12 +627,13 @@ - static unsigned short main_dir_len = 0; - boolean main_file; - int i; /* loop index through include files */ -- char buffer[256]; -+ char *buffer; - - - /* place the file name in the expanded_name buffer */ - -- strcpy(buffer, c_file_name); -+ buffer = _get_memory (strlen (c_file_name) + 1); -+ strcpy (buffer, c_file_name); - - /* Determine if this is the main file or an include file. */ - -@@ -673,11 +675,10 @@ - } - - if (!specific_directory) { -+ buffer = XtRealloc (buffer, main_dir_len + strlen (c_file_name) + 1); - _move (buffer, main_fcb -> expanded_name, main_dir_len); - _move (& buffer [main_dir_len], - c_file_name, strlen (c_file_name) + 1); /* + NULL */ -- } else { -- strcpy (buffer, c_file_name); - } - - /* Open the include file. */ -@@ -700,6 +701,7 @@ - if (inc_dir_len == 0) { - search_user_include = False; - } -+ buffer = XtRealloc (buffer, inc_dir_len + strlen (c_file_name) + 1); - _move (buffer, Uil_cmd_z_command.ac_include_dir[i], inc_dir_len); - - /* Add '/' if not specified at end of directory */ -@@ -723,6 +725,7 @@ - - /* Look in the default include directory. */ - if (search_user_include) { -+ buffer = XtRealloc (buffer, sizeof c_include_dir - 1 + strlen (c_file_name) + 1); - _move(buffer, c_include_dir, sizeof c_include_dir - 1); /* no NULL */ - _move(&buffer[sizeof c_include_dir - 1], - c_file_name, strlen (c_file_name) + 1); /* + NULL */ -@@ -736,14 +739,16 @@ - - /* check the open status. */ - -- if (az_fcb->az_file_ptr == NULL) -+ if (az_fcb->az_file_ptr == NULL) { -+ _free_memory (buffer); - return src_k_open_error; -+ } - - /* open succeeded - place buffer address in fcb */ - - az_fcb->c_buffer = az_source_buffer->c_text; - az_fcb->c_buffer[ src_k_max_source_line_length ] = 0; -- strcpy(az_fcb->expanded_name, buffer); -+ az_fcb->expanded_name = buffer; - - return src_k_open_normal; - } ---- tools/wml/Uil.y -+++ tools/wml/Uil.y -@@ -559,7 +559,7 @@ - - object_specification - : CLASS_NAME -- { sar_set_object_class (&$1); } -+ { sar_set_object_class (&$1); $$ = gz_yynullval;} - opt_create_proc_ref - opt_variant - object_spec diff --git a/easybuild/easyconfigs/m/motif/openmotif-xpm.diff b/easybuild/easyconfigs/m/motif/openmotif-xpm.diff deleted file mode 100644 index 90ee2fc48e..0000000000 --- a/easybuild/easyconfigs/m/motif/openmotif-xpm.diff +++ /dev/null @@ -1,808 +0,0 @@ ---- lib/Xm/XpmAttrib.c -+++ lib/Xm/XpmAttrib.c -@@ -41,7 +41,7 @@ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ --LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, -+LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, - XpmColor ***oldct)); - - LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -@@ -52,15 +52,12 @@ - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- unsigned int ncolors; -+ int ncolors; - XpmColor ***oldct; - { - XpmColor **colorTable, **color; - int a; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -- return XpmNoMemory; -- - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { - *oldct = NULL; ---- lib/Xm/XpmCrBufFrI.c -+++ lib/Xm/XpmCrBufFrI.c -@@ -43,20 +43,20 @@ - - #include "XpmI.h" - --LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size, -- unsigned int *used_size, XpmColor *colors, -+LFUNC(WriteColors, int, (char **dataptr, size_t *data_size, -+ size_t *used_size, XpmColor *colors, - unsigned int ncolors, unsigned int cpp)); - --LFUNC(WritePixels, void, (char *dataptr, unsigned int *used_size, -+LFUNC(WritePixels, void, (char *dataptr, size_t *used_size, - unsigned int width, unsigned int height, - unsigned int cpp, unsigned int *pixels, - XpmColor *colors)); - --LFUNC(WriteExtensions, void, (char *dataptr, unsigned int *used_size, -+LFUNC(WriteExtensions, void, (char *dataptr, size_t *used_size, - XpmExtension *ext, unsigned int num)); - --LFUNC(ExtensionsSize, int, (XpmExtension *ext, unsigned int num)); --LFUNC(CommentsSize, int, (XpmInfo *info)); -+LFUNC(ExtensionsSize, size_t, (XpmExtension *ext, unsigned int num)); -+LFUNC(CommentsSize, size_t, (XpmInfo *info)); - - int - XpmCreateBufferFromImage(display, buffer_return, image, shapeimage, attributes) -@@ -113,10 +113,11 @@ - /* calculation variables */ - int ErrorStatus; - char buf[BUFSIZ]; -- unsigned int cmts, extensions, ext_size = 0; -- unsigned int l, cmt_size = 0; -+ unsigned int cmts, extensions; -+ size_t ext_size = 0; -+ size_t l, cmt_size = 0; - char *ptr = NULL, *p; -- unsigned int ptr_size, used_size; -+ size_t ptr_size, used_size; - - *buffer_return = NULL; - -@@ -253,8 +254,8 @@ - static int - WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) - char **dataptr; -- unsigned int *data_size; -- unsigned int *used_size; -+ size_t *data_size; -+ size_t *used_size; - XpmColor *colors; - unsigned int ncolors; - unsigned int cpp; -@@ -299,7 +300,7 @@ - static void - WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) - char *dataptr; -- unsigned int *used_size; -+ size_t *used_size; - unsigned int width; - unsigned int height; - unsigned int cpp; -@@ -329,12 +330,13 @@ - *used_size += s - dataptr; - } - --static int -+static size_t - ExtensionsSize(ext, num) - XpmExtension *ext; - unsigned int num; - { -- unsigned int x, y, a, size; -+ unsigned int x, y, a; -+ size_t size; - char **line; - - size = 0; -@@ -353,7 +355,7 @@ - static void - WriteExtensions(dataptr, used_size, ext, num) - char *dataptr; -- unsigned int *used_size; -+ size_t *used_size; - XpmExtension *ext; - unsigned int num; - { -@@ -384,11 +386,11 @@ - *used_size += s - dataptr + 13; - } - --static int -+static size_t - CommentsSize(info) - XpmInfo *info; - { -- int size = 0; -+ size_t size = 0; - - /* 5 = 2 (for "/_*") + 3 (for "*_/\n") */ - if (info->hints_cmt) ---- lib/Xm/XpmCrDatFrI.c -+++ lib/Xm/XpmCrDatFrI.c -@@ -134,8 +134,6 @@ - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -- if (header_size >= SIZE_MAX / sizeof(char *)) -- return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) - return (XpmNoMemory); ---- lib/Xm/XpmI.h -+++ lib/Xm/XpmI.h -@@ -179,26 +179,14 @@ - boundCheckingCalloc((long)(nelem),(long) (elsize)) - #endif - --#if defined(SCO) || defined(__USLC__) --#include /* For SIZE_MAX */ --#endif --#include --#ifndef SIZE_MAX --# ifdef ULONG_MAX --# define SIZE_MAX ULONG_MAX --# else --# define SIZE_MAX UINT_MAX --# endif --#endif -- - #define XPMMAXCMTLEN BUFSIZ - typedef struct { - unsigned int type; - union { - FILE *file; -- char **data; -+ unsigned char **data; - } stream; -- char *cptr; -+ unsigned char *cptr; - unsigned int line; - int CommentLength; - char Comment[XPMMAXCMTLEN]; -@@ -288,9 +276,9 @@ - } *xpmHashAtom; - - typedef struct { -- unsigned int size; -- unsigned int limit; -- unsigned int used; -+ int size; -+ int limit; -+ int used; - xpmHashAtom *atomTable; - } xpmHashTable; - ---- lib/Xm/XpmRdFToI.c -+++ lib/Xm/XpmRdFToI.c -@@ -124,6 +124,27 @@ - return (ErrorStatus); - } - -+ -+/* Quote filename and prepend prefix. */ -+static char *quote_file(prefix, filename, len) -+ const char *prefix, *filename; -+ size_t len; -+{ -+ char *buf = XpmMalloc(strlen(prefix) + len * 2 + 1); -+ char *p = buf, *q; -+ -+ if (!buf) -+ return 0; -+ strcpy(p, prefix); -+ p += strlen(p); -+ for (q = filename; *q; q++) { -+ *p++ = '\\'; -+ *p++ = *q; -+ } -+ return buf; -+} -+ -+ - /* - * open the given file to be read as an xpmData which is returned. - */ -@@ -133,7 +154,7 @@ - xpmData *mdata; - { - #ifndef NO_ZPIPE -- char *compressfile, buf[(2*MAXPATHLEN) + 1]; -+ char *compressfile, *buf; - # ifdef STAT_ZFILE - struct stat status; - # endif -@@ -144,17 +165,25 @@ - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- int len = strlen(filename); -+ size_t len = strlen(filename); - if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { - mdata->type = XPMPIPE; -- sprintf(buf, "uncompress -c \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "r"))) -+ buf = quote_file("uncompress -c ", filename, len); -+ if (!buf) -+ return (XpmNoMemory); -+ mdata->stream.file = popen(buf, "r"); -+ XpmFree(buf); -+ if (!mdata->stream.file) - return (XpmOpenFailed); - - } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { - mdata->type = XPMPIPE; -- sprintf(buf, "gunzip -qc \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "r"))) -+ buf = quote_file("gunzip -qc ", filename, len); -+ if (!buf) -+ return (XpmNoMemory); -+ mdata->stream.file = popen(buf, "r"); -+ XpmFree(buf); -+ if (!mdata->stream.file) - return (XpmOpenFailed); - - } else { -@@ -164,28 +193,32 @@ - - sprintf(compressfile, "%s.Z", filename); - if (!stat(compressfile, &status)) { -- sprintf(buf, "uncompress -c \"%s\"", compressfile); -- if (!(mdata->stream.file = popen(buf, "r"))) { -- XpmFree(compressfile); -+ buf = quote_file("uncompress -c ", compressfile, len + 2); -+ XpmFree(compressfile); -+ if (!buf) -+ return (XpmNoMemory); -+ mdata->stream.file = popen(buf, "r"); -+ XpmFree(buf); -+ if (!mdata->stream.file) - return (XpmOpenFailed); -- } - mdata->type = XPMPIPE; - } else { - sprintf(compressfile, "%s.gz", filename); - if (!stat(compressfile, &status)) { -- sprintf(buf, "gunzip -c \"%s\"", compressfile); -- if (!(mdata->stream.file = popen(buf, "r"))) { -- XpmFree(compressfile); -+ buf = quote_file("gunzip -c ", compressfile, len + 3); -+ XpmFree(compressfile); -+ if (!buf) -+ return (XpmNoMemory); -+ mdata->stream.file = popen(buf, "r"); -+ XpmFree(buf); -+ if (!mdata->stream.file) - return (XpmOpenFailed); -- } - mdata->type = XPMPIPE; - } else { -+ XpmFree(compressfile); - # endif - #endif - if (!(mdata->stream.file = fopen(filename, "r"))) { --#if !defined(NO_ZPIPE) && defined(STAT_ZFILE) -- XpmFree(compressfile); --#endif - return (XpmOpenFailed); - } - mdata->type = XPMFILE; -@@ -193,7 +226,6 @@ - # ifdef STAT_ZFILE - } - } -- XpmFree(compressfile); - # endif - } - #endif ---- lib/Xm/XpmWrFFrI.c -+++ lib/Xm/XpmWrFFrI.c -@@ -117,7 +117,8 @@ - #endif - /* let's try to make a valid C syntax name */ - if ((dot = index(name, '.'))) { -- strcpy(new_name, name); -+ strncpy(new_name, name, sizeof(new_name)); -+ new_name[sizeof(new_name) - 1] = 0; - /* change '.' to '_' */ - name = s = new_name; - while ((dot = index(s, '.'))) { -@@ -127,7 +128,8 @@ - } - if ((dot = index(name, '-'))) { - if (name != new_name) { -- strcpy(new_name, name); -+ strncpy(new_name, name, sizeof(new_name)); -+ new_name[sizeof(new_name) - 1] = 0; - name = new_name; - } - /* change '-' to '_' */ -@@ -243,10 +245,13 @@ - char *s, *p, *buf; - unsigned int x, y, h; - -+ if (height == 0) -+ return XpmFileInvalid; -+ - h = height - 1; -- if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ if (cpp != 0 && width >= ((size_t)-1 - 3)/cpp) - return XpmNoMemory; -- p = buf = (char *) XpmMalloc(width * cpp + 3); -+ p = buf = (char *) XpmMalloc((size_t)width * cpp + 3); - if (!buf) - return (XpmNoMemory); - *buf = '"'; -@@ -293,6 +298,25 @@ - fprintf(file, ",\n\"XPMENDEXT\""); - } - -+/* Quote filename and prepend prefix. */ -+static char *quote_file(prefix, filename, len) -+ const char *prefix, *filename; -+ size_t len; -+{ -+ char *buf = XpmMalloc(strlen(prefix) + len * 2 + 1); -+ char *p = buf, *q; -+ -+ if (!buf) -+ return 0; -+ strcpy(p, prefix); -+ p += strlen(p); -+ for (q = filename; *q; q++) { -+ *p++ = '\\'; -+ *p++ = *q; -+ } -+ return buf; -+} -+ - /* - * open the given file to be written as an xpmData which is returned - */ -@@ -302,7 +326,7 @@ - xpmData *mdata; - { - #ifndef NO_ZPIPE -- char buf[BUFSIZ]; -+ char *buf; - - #endif - -@@ -311,16 +335,24 @@ - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- int len = strlen(filename); -+ size_t len = strlen(filename); - if (len > 2 && !strcmp(".Z", filename + (len - 2))) { -- sprintf(buf, "compress > \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "w"))) -+ buf = quote_file("compress > ", filename, len); -+ if (!buf) -+ return XpmNoMemory; -+ mdata->stream.file = popen(buf, "w"); -+ XpmFree(buf); -+ if (!mdata->stream.file) - return (XpmOpenFailed); - - mdata->type = XPMPIPE; - } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { -- sprintf(buf, "gzip -q > \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "w"))) -+ buf = quote_file("gzip -q > ", filename, len); -+ if (!buf) -+ return XpmNoMemory; -+ mdata->stream.file = popen(buf, "w"); -+ XpmFree(buf); -+ if (!mdata->stream.file) - return (XpmOpenFailed); - - mdata->type = XPMPIPE; ---- lib/Xm/Xpmcreate.c -+++ lib/Xm/Xpmcreate.c -@@ -804,9 +804,6 @@ - - ErrorStatus = XpmSuccess; - -- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -- return (XpmNoMemory); -- - /* malloc pixels index tables */ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); - if (!image_pixels) -@@ -950,8 +947,6 @@ - return (XpmNoMemory); - - #ifndef FOR_MSW -- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -- return (XpmNoMemory); - /* now that bytes_per_line must have been set properly alloc data */ - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -1997,9 +1992,6 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -- if (ncolors >= SIZE_MAX / sizeof(Pixel)) -- return XpmNoMemory; -- - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2215,9 +2207,6 @@ - { - unsigned short colidx[256]; - -- if (ncolors > 256) -- return (XpmFileInvalid); -- - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) - colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -2316,9 +2305,6 @@ - char *s; - char buf[BUFSIZ]; - -- if (cpp >= sizeof(buf)) -- return (XpmFileInvalid); -- - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; ---- lib/Xm/Xpmdata.c -+++ lib/Xm/Xpmdata.c -@@ -297,7 +297,7 @@ - - if (!mdata->type || mdata->type == XPMBUFFER) { - if (mdata->cptr) { -- char *start = mdata->cptr; -+ unsigned char *start = mdata->cptr; - while ((c = *mdata->cptr) && c != mdata->Eos) - mdata->cptr++; - n = mdata->cptr - start + 1; -@@ -376,7 +376,7 @@ - { - if (!mdata->type) - *cmt = NULL; -- else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) { -+ else if (mdata->CommentLength) { - *cmt = (char *) XpmMalloc(mdata->CommentLength + 1); - strncpy(*cmt, mdata->Comment, mdata->CommentLength); - (*cmt)[mdata->CommentLength] = '\0'; ---- lib/Xm/Xpmhashtab.c -+++ lib/Xm/Xpmhashtab.c -@@ -141,17 +141,17 @@ - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- unsigned int size = table->size; -+ int size = table->size; - xpmHashAtom *t, *p; - int i; - int oldSize = size; - - t = atomTable; - HASH_TABLE_GROWS -- table->size = size; -- table->limit = size / 3; -- if (size >= SIZE_MAX / sizeof(*atomTable)) -+ if (size <= 0) - return (XpmNoMemory); -+ table->size = size; -+ table->limit = size / 3; - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -@@ -212,8 +212,6 @@ - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -- if (table->size >= SIZE_MAX / sizeof(*atomTable)) -- return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); ---- lib/Xm/Xpmmisc.c -+++ lib/Xm/Xpmmisc.c -@@ -52,7 +52,7 @@ - char *s1; - { - char *s2; -- int l = strlen(s1) + 1; -+ size_t l = strlen(s1) + 1; - - if (s2 = (char *) XpmMalloc(l)) - strcpy(s2, s1); ---- lib/Xm/Xpmparse.c -+++ lib/Xm/Xpmparse.c -@@ -46,25 +46,6 @@ - - #include "XpmI.h" - #include --#include -- --#ifdef HAS_STRLCAT --# define STRLCAT(dst, src, dstsize) { \ -- if (strlcat(dst, src, dstsize) >= (dstsize)) \ -- return (XpmFileInvalid); } --# define STRLCPY(dst, src, dstsize) { \ -- if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -- return (XpmFileInvalid); } --#else --# define STRLCAT(dst, src, dstsize) { \ -- if ((strlen(dst) + strlen(src)) < (dstsize)) \ -- strcat(dst, src); \ -- else return (XpmFileInvalid); } --# define STRLCPY(dst, src, dstsize) { \ -- if (strlen(src) < (dstsize)) \ -- strcpy(dst, src); \ -- else return (XpmFileInvalid); } --#endif - - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, - unsigned int height, unsigned int ncolors, -@@ -234,7 +215,7 @@ - unsigned int *extensions; - { - unsigned int l; -- char buf[BUFSIZ + 1]; -+ char buf[BUFSIZ]; - - if (!data->format) { /* XPM 2 or 3 */ - -@@ -332,6 +313,17 @@ - *hotspot = 0; - *extensions = 0; - } -+ -+ /* Do some plausibility checks. */ -+ if (*width == 0 || *height == 0 || *ncolors == 0 || *cpp == 0) -+ return XpmFileInvalid; -+ if (*cpp > 8) -+ return XpmFileInvalid; -+ if (*width > (1 << (sizeof(int) * 8 - 4)) / *height) -+ return XpmFileInvalid; -+ if (*ncolors > (1 << (sizeof(int) * 8 - 4)) / (*width * *height)) -+ return XpmFileInvalid; -+ - return (XpmSuccess); - } - -@@ -343,10 +335,10 @@ - XpmColor **colorTablePtr; - xpmHashTable *hashtable; - { -- unsigned int key, l, a, b, len; -+ unsigned int key, l, a, b; - unsigned int curkey; /* current color key */ - unsigned int lastwaskey; /* key read */ -- char buf[BUFSIZ + 1]; -+ char buf[BUFSIZ]; - char curbuf[BUFSIZ]; /* current buffer */ - char **sptr, *s; - XpmColor *color; -@@ -354,8 +346,6 @@ - char **defaults; - int ErrorStatus; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -- return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) - return (XpmNoMemory); -@@ -367,10 +357,6 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -- xpmFreeColorTable(colorTable, ncolors); -- return (XpmNoMemory); -- } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -408,14 +394,13 @@ - } - if (!lastwaskey && key < NKEYS) { /* open new key */ - if (curkey) { /* flush string */ -- len = strlen(curbuf) + 1; -- s = (char *) XpmMalloc(len); -+ s = (char *) XpmMalloc(strlen(curbuf) + 1); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } - defaults[curkey] = s; -- memcpy(s, curbuf, len); -+ strcpy(s, curbuf); - } - curkey = key + 1; /* set new key */ - *curbuf = '\0'; /* reset curbuf */ -@@ -425,10 +410,14 @@ - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -+ if (strlen(curbuf) + l + 2 >= sizeof(curbuf)) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - if (!lastwaskey) -- STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ -+ strcat(curbuf, " "); /* append space */ - buf[l] = '\0'; -- STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ -+ strcat(curbuf, buf);/* append buf */ - lastwaskey = 0; - } - } -@@ -436,13 +425,12 @@ - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- len = strlen(curbuf) + 1; -- s = defaults[curkey] = (char *) XpmMalloc(len); -+ s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- memcpy(s, curbuf, len); -+ strcpy(s, curbuf); - } - } else { /* XPM 1 */ - /* get to the beginning of the first string */ -@@ -455,10 +443,6 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -- xpmFreeColorTable(colorTable, ncolors); -- return (XpmNoMemory); -- } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -486,18 +470,21 @@ - xpmNextString(data); /* get to the next string */ - *curbuf = '\0'; /* init curbuf */ - while ((l = xpmNextWord(data, buf, BUFSIZ))) { -+ if (strlen(curbuf) + l + 2 >= sizeof(curbuf)) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - if (*curbuf != '\0') -- STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ -+ strcat(curbuf, " ");/* append space */ - buf[l] = '\0'; -- STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ -+ strcat(curbuf, buf); /* append buf */ - } -- len = strlen(curbuf) + 1; -- s = (char *) XpmMalloc(len); -+ s = (char *) XpmMalloc(strlen(curbuf) + 1); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- memcpy(s, curbuf, len); -+ strcpy(s, curbuf); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) -@@ -522,9 +509,6 @@ - unsigned int *iptr, *iptr2; - unsigned int a, x, y; - -- if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -- return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); - #else -@@ -548,9 +532,6 @@ - { - unsigned short colidx[256]; - -- if (ncolors > 256) -- return (XpmFileInvalid); -- - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) - colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -585,7 +566,7 @@ - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -- char1 = colorTable[a].string[0]; -+ char1 = (unsigned char)colorTable[a].string[0]; - if (cidx[char1] == NULL) { /* get new memory */ - cidx[char1] = (unsigned short *) - XpmCalloc(256, sizeof(unsigned short)); -@@ -628,9 +609,6 @@ - char *s; - char buf[BUFSIZ]; - -- if (cpp >= sizeof(buf)) -- return (XpmFileInvalid); -- - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; ---- lib/Xm/Xpmscan.c -+++ lib/Xm/Xpmscan.c -@@ -98,8 +98,7 @@ - LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, - XpmAttributes *attributes)); - --LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, -- unsigned int ncolors, -+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, - Pixel *pixels, unsigned int mask, - unsigned int cpp, XpmAttributes *attributes)); - -@@ -226,17 +225,11 @@ - else - cpp = 0; - -- if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -- RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -- if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -- RETURN(XpmNoMemory); -- - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) - RETURN(XpmNoMemory); -@@ -291,8 +284,7 @@ - * get rgb values and a string of char, and possibly a name for each - * color - */ -- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -- RETURN(XpmNoMemory); -+ - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) - RETURN(XpmNoMemory); -@@ -340,8 +332,6 @@ - - /* first get a character string */ - a = 0; -- if (cpp >= SIZE_MAX - 1) -- return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); - *s++ = printable[c = a % MAXPRINTABLE]; -@@ -389,7 +379,7 @@ - ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) - Display *display; - XpmColor *colors; -- unsigned int ncolors; -+ int ncolors; - Pixel *pixels; - unsigned int mask; - unsigned int cpp; -@@ -433,8 +423,6 @@ - } - - /* first get character strings and rgb values */ -- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -- return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) - return (XpmNoMemory); diff --git a/easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff b/easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff deleted file mode 100644 index eb9d5c035c..0000000000 --- a/easybuild/easyconfigs/m/motif/openmotif22-add_LONG64_define.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Xm/XpmI.h -+++ lib/Xm/XpmI.h -@@ -110,6 +110,7 @@ - - #include - #include -+#include - /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ - #ifdef sequent - extern FILE *popen(); diff --git a/easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff b/easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff deleted file mode 100644 index 2501561137..0000000000 --- a/easybuild/easyconfigs/m/motif/openmotif22-strcmp.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/Xm/XmString.c -+++ lib/Xm/XmString.c -@@ -7707,7 +7707,7 @@ - case XmMULTIBYTE_TEXT: - /* Non-NULL values (except _MOTIF_DEFAULT_LOCALE) - are not accepted in Motif 2.0. */ -- if (tag != NULL && !(tag == _MOTIF_DEFAULT_LOCALE || -+ if (tag != NULL && !(/* tag == _MOTIF_DEFAULT_LOCALE || */ - strcmp(tag, _MOTIF_DEFAULT_LOCALE) == 0)) - { - _XmProcessUnlock(); -@@ -8317,7 +8317,7 @@ - _XmProcessUnlock(); - return NULL; - } -- if ((value != _MOTIF_DEFAULT_LOCALE) && -+ if (/* (value != _MOTIF_DEFAULT_LOCALE) && */ - (strcmp((char*) value, _MOTIF_DEFAULT_LOCALE) != 0)) { - _XmProcessUnlock(); - return NULL; diff --git a/easybuild/easyconfigs/m/motif/sentinel.diff b/easybuild/easyconfigs/m/motif/sentinel.diff deleted file mode 100644 index d633b67211..0000000000 --- a/easybuild/easyconfigs/m/motif/sentinel.diff +++ /dev/null @@ -1,128 +0,0 @@ ---- clients/mwm/WmFunction.c -+++ clients/mwm/WmFunction.c -@@ -1124,12 +1124,12 @@ - directory, then we must call execlp and not execl - */ - shellname = shell; -- execlp (shell, shellname, "-c", args, 0); -+ execlp (shell, shellname, "-c", args, (char *) 0); - } - else - { - shellname++; -- execl (shell, shellname, "-c", args, 0); -+ execl (shell, shellname, "-c", args, (char *) 0); - } - } - -@@ -1138,9 +1138,9 @@ - * Try /bin/sh . - */ - #ifdef SVR4 -- execl ("/usr/bin/sh", "sh", "-c", args, 0); -+ execl ("/usr/bin/sh", "sh", "-c", args, (char *) 0); - #else -- execl ("/bin/sh", "sh", "-c", args, 0); -+ execl ("/bin/sh", "sh", "-c", args, (char *) 0); - #endif - - ---- demos/lib/Xmd/onHelp.c -+++ demos/lib/Xmd/onHelp.c -@@ -66,7 +66,7 @@ - Widget dismiss; - - toplevel = XtVaAppInitialize(&app_context, "HelpOnHelp", NULL, 0, -- &argc, argv, NULL, 0); -+ &argc, argv, NULL, NULL); - n = 0; - XtSetArg(args[n], XmdNhelpFile, "helpOn"); n++; - help = XmdCreateHelp(toplevel, "help", args, n); ---- demos/programs/Exm/simple_app/simpleDemo.c -+++ demos/programs/Exm/simple_app/simpleDemo.c -@@ -162,7 +162,7 @@ - - menu = XmCreatePulldownMenu(menuBar, "FileMenu", NULL, 0); - -- XtVaSetValues(cascade, XmNsubMenuId, menu, 0); -+ XtVaSetValues(cascade, XmNsubMenuId, menu, NULL); - - str = XmStringCreateLocalized("Quit"); - menuitem = XtVaCreateManagedWidget("item", xmPushButtonWidgetClass, ---- demos/programs/filemanager/actions.c -+++ demos/programs/filemanager/actions.c -@@ -91,7 +91,7 @@ - XtVaSetValues(fileviewer, - XmNlayoutType, spatial, - XmNentryViewType, size, -- 0, 0); -+ NULL); - - fixViewerSize(XtParent(fileviewer), NULL, NULL); - ---- demos/programs/filemanager/filemanager.c -+++ demos/programs/filemanager/filemanager.c -@@ -118,7 +118,7 @@ - - XtSetArg(args[n], XmNallowShellResize, True); n++; - toplevel = XtVaAppInitialize(&app_context, APP_CLASS, NULL, 0, &argc, argv, -- fallback_resources, 0); -+ fallback_resources, NULL); - - app_class_quark = XrmStringToQuark(APP_CLASS); - app_quark = XrmStringToQuark(argv[0]); ---- demos/programs/fileview/text.c -+++ demos/programs/fileview/text.c -@@ -160,7 +160,7 @@ - XtSetValues(XtParent(new->text), args, n); - XmTextSetTopCharacter(new->text, - XmTextGetTopCharacter(this->current_pane->text)); -- XtVaSetValues(target, XmNheight, (Dimension) height/2); -+ XtVaSetValues(target, XmNheight, (Dimension) height/2, NULL); - } - printf("source text set\n"); - XtManageChild(new->text); ---- demos/programs/popups/autopopups.c -+++ demos/programs/popups/autopopups.c -@@ -83,7 +83,7 @@ - XmString str, tmp1, tmp2; - - shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv, -- NULL, 0); -+ NULL, NULL); - - frame1 = XmCreateFrame(shell, "outerframe", NULL, 0); - XtManageChild(frame1); ---- demos/programs/setdate/setDate.c -+++ demos/programs/setdate/setDate.c -@@ -95,7 +95,7 @@ - char *str; - - shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv, -- fallback_resources, 0); -+ fallback_resources, NULL); - - time(&timer); - thetime = localtime(&timer); ---- demos/programs/todo/todo.c -+++ demos/programs/todo/todo.c -@@ -150,7 +150,7 @@ - shell = XtVaAppInitialize(&context, APP_CLASS, - optionDesc, XtNumber(optionDesc), - &argc, argv, -- fallback_resources, 0); -+ fallback_resources, NULL); - - XtGetApplicationResources(shell, (XtPointer) &options, - resources, XtNumber(resources), (Arg *) NULL, 0); ---- lib/Xm/Label.c -+++ lib/Xm/Label.c -@@ -2595,7 +2595,7 @@ - { - XmString value; - -- XtVaGetValues(w, XmNlabelString, &value, 0); -+ XtVaGetValues(w, XmNlabelString, &value, NULL); - - if (type == XmFORMAT_XmSTRING) - { diff --git a/easybuild/easyconfigs/m/motif/warn.patch b/easybuild/easyconfigs/m/motif/warn.patch deleted file mode 100644 index a2dc641774..0000000000 --- a/easybuild/easyconfigs/m/motif/warn.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- demos/programs/ButtonBox/bboxdemo.c -+++ demos/programs/ButtonBox/bboxdemo.c -@@ -668,4 +668,5 @@ - XtRealizeWidget(top); - - XtAppMainLoop(app); -+ return 0; - } ---- demos/programs/ColorSel/bxutil-c.c -+++ demos/programs/ColorSel/bxutil-c.c -@@ -3471,6 +3471,7 @@ - default: - return -1; - } -+ abort(); - } - - -@@ -3494,6 +3495,7 @@ - default: - return -1; - } -+ abort(); - } - - /* ---- demos/programs/FontSel/fontsel.c -+++ demos/programs/FontSel/fontsel.c -@@ -68,6 +68,7 @@ - * Returns: nothing - * - */ -+void - InitializeDemoForm(Widget form) - { - Widget w; -@@ -119,5 +120,6 @@ - XtRealizeWidget(top); - - XtAppMainLoop(app); -+ return 0; - } - ---- demos/programs/MultiList/bxutil-c.c -+++ demos/programs/MultiList/bxutil-c.c -@@ -3469,6 +3469,7 @@ - } - return (c); - } -+ abort(); - } - - -@@ -3490,6 +3491,7 @@ - mdata->InsideString = !mdata->InsideString; - return (ungetc(c, mdata->stream.file)); - } -+ abort(); - } - - /* ---- demos/programs/Tree/bxutil-c.c -+++ demos/programs/Tree/bxutil-c.c -@@ -3471,6 +3471,7 @@ - default: - return -1; - } -+ abort(); - } - - -@@ -3494,6 +3495,7 @@ - default: - return -1; - } -+ abort(); - } - - /* ---- tools/wml/wmlresolve.c -+++ tools/wml/wmlresolve.c -@@ -69,6 +69,7 @@ - - #if defined(__STDC__) - #include -+#include - #endif - #include - -- GitLab From 5199e3e190fd9f21951546d34e8681794e449cde Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 2 Nov 2013 20:42:03 +0100 Subject: [PATCH 171/811] update release notes after merging in PR for ARB --- RELEASE_NOTES | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 236075fbe3..cf37f73b12 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,6 +4,17 @@ For more detailed information, please see the git log. The latest version of easybuild-easyconfig provides 1,710 easyconfig files, for 338 different software packages and 25 different (compiler) toolchains. +v1.9.0 (November 14th 2013) +--------------------------- + +feature + bugfix release +- added example easyconfig files for XXX new software packages: + ARB (#396, #493), imake (#396, #493), inputproto (#396, #493), kbproto (#396, #493), libICE (#396, #493), + libSM (#396, #493), libX11 (#396, #493), libXau (#396, #493), libXaw (#396, #493), libXext (#396, #493), + libXi (#396, #493), libXmu (#396, #493), libXp (#396, #493), libXpm (#396, #493), libXt (#396, #493), + lynx (#396, #493), motif (#396, #493), printproto (#396, #493), Sablotron (#396, #493), xbitmaps (#396, #493), + xextproto (#396, #493), xtrans (#396, #493), + v1.8.2.0 (October 18th 2013) ---------------------------- -- GitLab From 928a649040265e00e17c8b3531e41a144c3bab10 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 3 Nov 2013 14:59:58 +0100 Subject: [PATCH 172/811] arpack-ng: fixed typo --- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb | 2 +- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb index df235b41f8..aff13825b1 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb @@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ] patches = ['arpack-ng-3.1.3-pkgconfig.patch'] -configopts = '--with-pic --with-blas="$LIBLAS_MT" --with-lapack="$LIBLAPACK_MT"' +configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"' sanity_check_paths = { 'files': ["lib/libarpack.a", "lib/libarpack.so"], diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb index 2b79e8317c..0c7326c6b3 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb @@ -15,7 +15,7 @@ patches = [ 'arpack-ng-3.1.3-pkgconfig.patch', ] -configopts = '--enable-mpi --with-pic --with-blas="$LIBLAS" --with-lapack="$LIBLAPACK"' +configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' sanity_check_paths = { 'files': ["lib/libarpack.a", "lib/libarpack.so"], -- GitLab From 03ff0cbda17bb7ed20092e637cfb38f316b1800e Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 3 Nov 2013 15:13:54 +0100 Subject: [PATCH 173/811] arpack-ng: updated the configure script patch to upstream patch The autotools have been updated to the latest versions. This should fix a problem with intel MPI not being recognized by the configure scripts. --- .../arpack-ng-3.1.3-configure-mpi.patch | 4234 ++++++++++++++++- 1 file changed, 4224 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch index 1163049e8d..435371619a 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch @@ -1,11 +1,4225 @@ ---- configure.orig 2013-04-02 10:33:44.000000000 +0200 -+++ configure 2013-10-04 12:53:16.314182265 +0200 -@@ -12052,7 +12052,7 @@ +From 9e319b3c1a6d1cbe074cd52bfbce7b4965149bc4 Mon Sep 17 00:00:00 2001 +From: Ward Poelmans +Date: Mon, 14 Oct 2013 10:52:10 +0200 +Subject: [PATCH 1/2] Updated autoconf, automake and libtool scripts + +Using autoreconf -i -f and more recent version of the autotools. This +should fix a problem with libtool not recognizing Intel MPI. +--- + CHANGES | 3 + + Makefile.in | 12 +- + PARPACK/EXAMPLES/BLACS/Makefile.in | 2 +- + PARPACK/EXAMPLES/MPI/Makefile.in | 2 +- + PARPACK/Makefile.in | 2 +- + PARPACK/SRC/BLACS/Makefile.in | 2 +- + PARPACK/SRC/MPI/Makefile.in | 2 +- + PARPACK/SRC/Makefile.in | 2 +- + PARPACK/UTIL/BLACS/Makefile.in | 2 +- + PARPACK/UTIL/MPI/Makefile.in | 2 +- + PARPACK/UTIL/Makefile.in | 2 +- + SRC/Makefile.in | 2 +- + TESTS/Makefile.in | 2 +- + UTIL/Makefile.in | 2 +- + aclocal.m4 | 122 +++++++++- + compile | 1 + + config.guess | 207 ++++++++++------- + config.sub | 152 +++++++----- + configure | 405 +++++++++++++++++++++----------- + configure.ac | 4 +- + install-sh | 35 +-- + ltmain.sh | 32 ++- + m4/libtool.m4 | 297 +++++++++++++++++------- + m4/ltoptions.m4 | 19 +- + missing | 461 ++++++++++++------------------------- + 25 files changed, 1040 insertions(+), 734 deletions(-) + create mode 120000 compile + +diff --git a/CHANGES b/CHANGES +index 39bb865..c298714 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -18,6 +18,9 @@ arpack-ng - 3.1.4 + * Use configure supplied blas and lapack in the pkg-config. + Thanks to Ward Poelmans (Closes: #1320) + ++ * Switch to automake 1.14 + libtool 2.4.2. ++ Thanks to Ward Poelmans (Closes: #1321) ++ + -- Sylvestre Ledru Mon, 07 Oct 2013 14:24:42 +0200 + + arpack-ng - 3.1.3 +diff --git a/Makefile.in b/Makefile.in +index ad39e7d..0487f2b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +@@ -83,8 +83,8 @@ host_triplet = @host@ + subdir = . + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ +- $(srcdir)/arpack.pc.in COPYING README TODO config.guess \ +- config.sub depcomp install-sh missing ltmain.sh ++ $(srcdir)/arpack.pc.in COPYING README TODO compile \ ++ config.guess config.sub depcomp install-sh missing ltmain.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -713,10 +713,16 @@ dist-xz: distdir + $(am__post_remove_distdir) + + dist-tarZ: distdir ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + + dist-shar: distdir ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +diff --git a/PARPACK/EXAMPLES/BLACS/Makefile.in b/PARPACK/EXAMPLES/BLACS/Makefile.in +index 6b06ad6..85ea451 100644 +--- a/PARPACK/EXAMPLES/BLACS/Makefile.in ++++ b/PARPACK/EXAMPLES/BLACS/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/EXAMPLES/MPI/Makefile.in b/PARPACK/EXAMPLES/MPI/Makefile.in +index 512a500..709e248 100644 +--- a/PARPACK/EXAMPLES/MPI/Makefile.in ++++ b/PARPACK/EXAMPLES/MPI/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/Makefile.in b/PARPACK/Makefile.in +index 7559afb..792ed16 100644 +--- a/PARPACK/Makefile.in ++++ b/PARPACK/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/SRC/BLACS/Makefile.in b/PARPACK/SRC/BLACS/Makefile.in +index 1b6a0fe..b6d14d9 100644 +--- a/PARPACK/SRC/BLACS/Makefile.in ++++ b/PARPACK/SRC/BLACS/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/SRC/MPI/Makefile.in b/PARPACK/SRC/MPI/Makefile.in +index 273065e..df8bbc3 100644 +--- a/PARPACK/SRC/MPI/Makefile.in ++++ b/PARPACK/SRC/MPI/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/SRC/Makefile.in b/PARPACK/SRC/Makefile.in +index 6e8f437..0fb3ac8 100644 +--- a/PARPACK/SRC/Makefile.in ++++ b/PARPACK/SRC/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/UTIL/BLACS/Makefile.in b/PARPACK/UTIL/BLACS/Makefile.in +index 11a6b0a..18bdf88 100644 +--- a/PARPACK/UTIL/BLACS/Makefile.in ++++ b/PARPACK/UTIL/BLACS/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/UTIL/MPI/Makefile.in b/PARPACK/UTIL/MPI/Makefile.in +index 7551a3c..558e2f1 100644 +--- a/PARPACK/UTIL/MPI/Makefile.in ++++ b/PARPACK/UTIL/MPI/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/PARPACK/UTIL/Makefile.in b/PARPACK/UTIL/Makefile.in +index 0db143f..507574f 100644 +--- a/PARPACK/UTIL/Makefile.in ++++ b/PARPACK/UTIL/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/SRC/Makefile.in b/SRC/Makefile.in +index 9802729..e04799f 100644 +--- a/SRC/Makefile.in ++++ b/SRC/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/TESTS/Makefile.in b/TESTS/Makefile.in +index e5a353e..cd41616 100644 +--- a/TESTS/Makefile.in ++++ b/TESTS/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/UTIL/Makefile.in b/UTIL/Makefile.in +index 824730d..4b7990b 100644 +--- a/UTIL/Makefile.in ++++ b/UTIL/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.13.3 from Makefile.am. ++# Makefile.in generated by automake 1.14 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2013 Free Software Foundation, Inc. +diff --git a/aclocal.m4 b/aclocal.m4 +index 375d1a7..d9df277 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.13.3 -*- Autoconf -*- ++# generated automatically by aclocal 1.14 -*- Autoconf -*- + + # Copyright (C) 1996-2013 Free Software Foundation, Inc. + +@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.13' ++[am__api_version='1.14' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.13.3], [], ++m4_if([$1], [1.14], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.13.3])dnl ++[AM_AUTOMAKE_VERSION([1.14])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. + ++dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. ++m4_define([AC_PROG_CC], ++m4_defn([AC_PROG_CC]) ++[_AM_PROG_CC_C_O ++]) ++ + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) + # AM_INIT_AUTOMAKE([OPTIONS]) + # ----------------------------------------------- +@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. + AC_CONFIG_COMMANDS_PRE(dnl + [m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +-]) ++ ++# POSIX will say in a future version that running "rm -f" with no argument ++# is OK; and we want to be able to make that assumption in our Makefile ++# recipes. So use an aggressive probe to check that the usage we want is ++# actually supported "in the wild" to an acceptable degree. ++# See automake bug#10828. ++# To make any issue more visible, cause the running configure to be aborted ++# by default if the 'rm' program in use doesn't match our expectations; the ++# user can still override this though. ++if rm -f && rm -fr && rm -rf; then : OK; else ++ cat >&2 <<'END' ++Oops! ++ ++Your 'rm' program seems unable to run without file operands specified ++on the command line, even when the '-f' option is present. This is contrary ++to the behaviour of most rm programs out there, and not conforming with ++the upcoming POSIX standard: ++ ++Please tell bug-automake@gnu.org about your system, including the value ++of your $PATH and any error possibly output before this message. This ++can help us improve future automake versions. ++ ++END ++ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then ++ echo 'Configuration will proceed anyway, since you have set the' >&2 ++ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 ++ echo >&2 ++ else ++ cat >&2 <<'END' ++Aborting the configuration process, to ensure you take notice of the issue. ++ ++You can download and install GNU coreutils to get an 'rm' implementation ++that behaves properly: . ++ ++If you want to complete the configuration process using your problematic ++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM ++to "yes", and re-run configure. ++ ++END ++ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) ++ fi ++fi]) + + dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not + dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. + m4_define([_AC_COMPILER_EXEEXT], + m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +- + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header + # that is generated. The stamp files are numbered to have different names. +@@ -752,6 +798,70 @@ AC_DEFUN([_AM_SET_OPTIONS], + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# _AM_PROG_CC_C_O ++# --------------- ++# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC ++# to automatically call this. ++AC_DEFUN([_AM_PROG_CC_C_O], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl ++AC_LANG_PUSH([C])dnl ++AC_CACHE_CHECK( ++ [whether $CC understands -c and -o together], ++ [am_cv_prog_cc_c_o], ++ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) ++ # Make sure it works both with $CC and with simple cc. ++ # Following AC_PROG_CC_C_O, we do the test twice because some ++ # compilers refuse to overwrite an existing .o file with -o, ++ # though they will create one. ++ am_cv_prog_cc_c_o=yes ++ for am_i in 1 2; do ++ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ ++ && test -f conftest2.$ac_objext; then ++ : OK ++ else ++ am_cv_prog_cc_c_o=no ++ break ++ fi ++ done ++ rm -f core conftest* ++ unset am_i]) ++if test "$am_cv_prog_cc_c_o" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++AC_LANG_POP([C])]) ++ ++# For backward compatibility. ++AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) ++ ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) ++ + # Check to make sure that the build environment is sane. -*- Autoconf -*- + + # Copyright (C) 1996-2013 Free Software Foundation, Inc. +diff --git a/compile b/compile +new file mode 120000 +index 0000000..d3164c8 +--- /dev/null ++++ b/compile +@@ -0,0 +1 @@ ++/usr/share/automake-1.14/compile +\ No newline at end of file +diff --git a/config.guess b/config.guess +index 40eaed4..b79252d 100755 +--- a/config.guess ++++ b/config.guess +@@ -1,14 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-# 2011 Free Software Foundation, Inc. ++# Copyright 1992-2013 Free Software Foundation, Inc. + +-timestamp='2011-05-11' ++timestamp='2013-06-10' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -17,26 +15,22 @@ timestamp='2011-05-11' + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +- +-# Originally written by Per Bothner. Please send patches (context +-# diff format) to and include a ChangeLog +-# entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# Originally written by Per Bothner. + # + # You can get the latest version of this script from: + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,9 +50,7 @@ version="\ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +-Software Foundation, Inc. ++Copyright 1992-2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "${UNAME_SYSTEM}" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ eval $set_cc_for_build ++ cat <<-EOF > $dummy.c ++ #include ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -792,21 +809,26 @@ EOF + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 +@@ -852,15 +874,22 @@ EOF + exit ;; + *:GNU:*:*) + # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -872,56 +901,54 @@ EOF + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) +- LIBC=gnu +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build +@@ -940,54 +967,63 @@ EOF + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; ++ or1k:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) +- echo sparc-unknown-linux-gnu ++ echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; ++ *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo powerpc-unknown-linux-${LIBC} ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-${LIBC} ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux ++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) +- echo ${UNAME_MACHINE}-tilera-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-gnu ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -1191,6 +1227,9 @@ EOF + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1217,19 +1256,21 @@ EOF + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown +- case $UNAME_PROCESSOR in +- i386) +- eval $set_cc_for_build +- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then +- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ +- grep IS_64BIT_ARCH >/dev/null +- then +- UNAME_PROCESSOR="x86_64" +- fi +- fi ;; +- unknown) UNAME_PROCESSOR=powerpc ;; +- esac ++ eval $set_cc_for_build ++ if test "$UNAME_PROCESSOR" = unknown ; then ++ UNAME_PROCESSOR=powerpc ++ fi ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) +@@ -1246,7 +1287,7 @@ EOF + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1315,11 +1356,11 @@ EOF + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c <. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + + +-# Please send patches to . Submit a context +-# diff and a properly formatted GNU ChangeLog entry. ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. +@@ -75,9 +68,7 @@ Report bugs and patches to ." + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +-Software Foundation, Inc. ++Copyright 1992-2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -125,13 +116,17 @@ esac + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ +- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -154,7 +149,7 @@ case $os in + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +@@ -223,6 +218,12 @@ case $os in + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -247,20 +248,27 @@ case $basic_machine in + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | arc | arceb \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -278,20 +286,21 @@ case $basic_machine in + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ +- | nios | nios2 \ ++ | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 \ +- | or32 \ ++ | or1k | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +@@ -300,7 +309,7 @@ case $basic_machine in + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ +- | v850 | v850e \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) +@@ -315,8 +324,7 @@ case $basic_machine in + c6x) + basic_machine=tic6x-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -329,7 +337,10 @@ case $basic_machine in + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; +- ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; + xscaleeb) + basic_machine=armeb-unknown + ;; +@@ -352,11 +363,13 @@ case $basic_machine in + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ +- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ +@@ -365,12 +378,15 @@ case $basic_machine in + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -388,19 +404,20 @@ case $basic_machine in + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ +- | nios-* | nios2-* \ ++ | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ +@@ -408,10 +425,11 @@ case $basic_machine in + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ +- | tile-* | tilegx-* \ ++ | tile*-* \ + | tron-* \ + | ubicom32-* \ +- | v850-* | v850e-* | vax-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ +@@ -711,7 +729,6 @@ case $basic_machine in + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -769,9 +786,13 @@ case $basic_machine in + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -808,10 +829,18 @@ case $basic_machine in + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -977,7 +1006,7 @@ case $basic_machine in + ;; + ppc64) basic_machine=powerpc64-unknown + ;; +- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown +@@ -992,7 +1021,11 @@ case $basic_machine in + basic_machine=i586-unknown + os=-pw32 + ;; +- rdos) ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ os=-rdos ++ ;; ++ rdos32) + basic_machine=i386-pc + os=-rdos + ;; +@@ -1120,13 +1153,8 @@ case $basic_machine in + basic_machine=t90-cray + os=-unicos + ;; +- # This must be matched before tile*. +- tilegx*) +- basic_machine=tilegx-unknown +- os=-linux-gnu +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1324,21 +1352,21 @@ case $os in + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ +- | -sym* | -kopensolaris* \ ++ | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-android* \ +- | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1470,9 +1498,6 @@ case $os in + -aros*) + os=-aros + ;; +- -kaos*) +- os=-kaos +- ;; + -zvmoe) + os=-zvmoe + ;; +@@ -1521,6 +1546,9 @@ case $basic_machine in + c4x-* | tic4x-*) + os=-coff + ;; ++ hexagon-*) ++ os=-elf ++ ;; + tic54x-*) + os=-coff + ;; +@@ -1548,9 +1576,6 @@ case $basic_machine in + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout +@@ -1564,6 +1589,9 @@ case $basic_machine in + mips*-*) + os=-elf + ;; ++ or1k-*) ++ os=-elf ++ ;; + or32-*) + os=-coff + ;; +diff --git a/configure b/configure +index 6155677..82d0a5e 100755 +--- a/configure ++++ b/configure +@@ -1428,7 +1428,7 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --with-pic try to use only PIC/non-PIC objects [default=use ++ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR +@@ -2225,7 +2225,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-am__api_version='1.13' ++am__api_version='1.14' + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -2791,6 +2791,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + ++# POSIX will say in a future version that running "rm -f" with no argument ++# is OK; and we want to be able to make that assumption in our Makefile ++# recipes. So use an aggressive probe to check that the usage we want is ++# actually supported "in the wild" to an acceptable degree. ++# See automake bug#10828. ++# To make any issue more visible, cause the running configure to be aborted ++# by default if the 'rm' program in use doesn't match our expectations; the ++# user can still override this though. ++if rm -f && rm -fr && rm -rf; then : OK; else ++ cat >&2 <<'END' ++Oops! ++ ++Your 'rm' program seems unable to run without file operands specified ++on the command line, even when the '-f' option is present. This is contrary ++to the behaviour of most rm programs out there, and not conforming with ++the upcoming POSIX standard: ++ ++Please tell bug-automake@gnu.org about your system, including the value ++of your $PATH and any error possibly output before this message. This ++can help us improve future automake versions. ++ ++END ++ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then ++ echo 'Configuration will proceed anyway, since you have set the' >&2 ++ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 ++ echo >&2 ++ else ++ cat >&2 <<'END' ++Aborting the configuration process, to ensure you take notice of the issue. ++ ++You can download and install GNU coreutils to get an 'rm' implementation ++that behaves properly: . ++ ++If you want to complete the configuration process using your problematic ++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM ++to "yes", and re-run configure. ++ ++END ++ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 ++ fi ++fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +@@ -4031,6 +4072,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 ++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } ++if ${am_cv_prog_cc_c_o+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ # Make sure it works both with $CC and with simple cc. ++ # Following AC_PROG_CC_C_O, we do the test twice because some ++ # compilers refuse to overwrite an existing .o file with -o, ++ # though they will create one. ++ am_cv_prog_cc_c_o=yes ++ for am_i in 1 2; do ++ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 ++ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } \ ++ && test -f conftest2.$ac_objext; then ++ : OK ++ else ++ am_cv_prog_cc_c_o=no ++ break ++ fi ++ done ++ rm -f core conftest* ++ unset am_i ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 ++$as_echo "$am_cv_prog_cc_c_o" >&6; } ++if test "$am_cv_prog_cc_c_o" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ + depcc="$CC" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +@@ -4848,6 +4948,11 @@ else + lt_cv_sys_max_cmd_len=196608 + ;; + ++ os2*) ++ # The test takes a long time on OS/2. ++ lt_cv_sys_max_cmd_len=8192 ++ ;; ++ + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +@@ -4887,7 +4992,7 @@ else + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ ++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do +@@ -5313,12 +5418,12 @@ irix5* | irix6* | nonstopux*) + lt_cv_deplibs_check_method=pass_all + ;; + +-# This must be Linux ELF. ++# This must be glibc/ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -5951,13 +6056,13 @@ old_postuninstall_cmds= + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + fi + + case $host_os in +@@ -6104,6 +6209,7 @@ for ac_symprfx in "" "_"; do + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ + " {last_section=section; section=\$ 3};"\ ++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ + " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ + " \$ 0!~/External *\|/{next};"\ + " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +@@ -6492,7 +6598,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } + CFLAGS="$SAVE_CFLAGS" + fi + ;; +-sparc*-*solaris*) ++*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -6503,7 +6609,20 @@ sparc*-*solaris*) + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ yes*) ++ case $host in ++ i?86-*-solaris*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ sparc*-*-solaris*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available. ++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then ++ LD="${LD-ld}_sol2" ++ fi ++ ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" +@@ -7143,7 +7262,13 @@ else + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? +- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ # If there is a non-empty error log, and "single_module" ++ # appears in it, assume the flag caused a linker warning ++ if test -s conftest.err && $GREP single_module conftest.err; then ++ cat conftest.err >&5 ++ # Otherwise, if the output was created with a 0 exit code from ++ # the compiler, it worked. ++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 +@@ -7154,6 +7279,7 @@ else + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } + if ${lt_cv_ld_exported_symbols_list+:} false; then : +@@ -7186,6 +7312,7 @@ rm -f core conftest.err conftest.$ac_objext \ + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 + $as_echo_n "checking for -force_load linker flag... " >&6; } + if ${lt_cv_ld_force_load+:} false; then : +@@ -7207,7 +7334,9 @@ _LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? +- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then ++ if test -s conftest.err && $GREP force_load conftest.err; then ++ cat conftest.err >&5 ++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 +@@ -7911,7 +8040,22 @@ fi + + # Check whether --with-pic was given. + if test "${with_pic+set}" = set; then : +- withval=$with_pic; pic_mode="$withval" ++ withval=$with_pic; lt_p=${PACKAGE-default} ++ case $withval in ++ yes|no) pic_mode=$withval ;; ++ *) ++ pic_mode=default ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for lt_pkg in $withval; do ++ IFS="$lt_save_ifs" ++ if test "X$lt_pkg" = "X$lt_p"; then ++ pic_mode=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac + else + pic_mode=default + fi +@@ -7989,6 +8133,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + ++ ++ ++ ++ + test -z "$LN_S" && LN_S="ln -s" + + +@@ -8448,7 +8596,9 @@ lt_prog_compiler_static= + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' +- lt_prog_compiler_pic='-Xcompiler -fPIC' ++ if test -n "$lt_prog_compiler_pic"; then ++ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" ++ fi + ;; + esac + else +@@ -8539,18 +8689,33 @@ lt_prog_compiler_static= + ;; + *) + case `$CC -V 2>&1 | sed 5q` in +- *Sun\ F* | *Sun*Fortran*) ++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; ++ *Sun\ F* | *Sun*Fortran*) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Qoption ld ' ++ ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; ++ *Intel*\ [CF]*Compiler*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ *Portland\ Group*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; + esac + ;; + esac +@@ -8912,7 +9077,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= +- hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported +@@ -8956,9 +9120,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + openbsd*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu | gnu*) +- link_all_deplibs=no +- ;; + esac + + ld_shlibs=yes +@@ -9165,8 +9326,7 @@ _LT_EOF + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' +- hardcode_libdir_flag_spec= +- hardcode_libdir_flag_spec_ld='-rpath $libdir' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +@@ -9181,7 +9341,7 @@ _LT_EOF + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -9358,7 +9518,6 @@ _LT_EOF + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi +- link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -9546,6 +9705,7 @@ fi + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes ++ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' +@@ -9591,6 +9751,7 @@ fi + hardcode_shlibpath_var=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ + else + whole_archive_flag_spec='' + fi +@@ -9619,10 +9780,6 @@ fi + hardcode_shlibpath_var=no + ;; + +- freebsd1*) +- ld_shlibs=no +- ;; +- + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little +@@ -9635,7 +9792,7 @@ fi + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) ++ freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes +@@ -9674,7 +9831,6 @@ fi + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes +@@ -9815,7 +9971,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } + link_all_deplibs=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -10298,11 +10454,6 @@ esac + + + +- +- +- +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + +@@ -10392,7 +10543,7 @@ need_version=unknown + + case $host_os in + aix3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + +@@ -10401,7 +10552,7 @@ aix3*) + ;; + + aix[4-9]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes +@@ -10466,7 +10617,7 @@ beos*) + ;; + + bsdi[45]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -10605,7 +10756,7 @@ darwin* | rhapsody*) + ;; + + dgux*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +@@ -10613,10 +10764,6 @@ dgux*) + shlibpath_var=LD_LIBRARY_PATH + ;; + +-freebsd1*) +- dynamic_linker=no +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -10624,7 +10771,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[123]*) objformat=aout ;; ++ freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -10642,7 +10789,7 @@ freebsd* | dragonfly*) + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +- freebsd2*) ++ freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) +@@ -10662,7 +10809,7 @@ freebsd* | dragonfly*) + ;; + + gnu*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +@@ -10673,7 +10820,7 @@ gnu*) + ;; + + haiku*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" +@@ -10734,7 +10881,7 @@ hpux9* | hpux10* | hpux11*) + ;; + + interix[3-9]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +@@ -10750,7 +10897,7 @@ irix5* | irix6* | nonstopux*) + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; +@@ -10787,9 +10934,9 @@ linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +-# This must be Linux ELF. ++# This must be glibc/ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -10837,10 +10984,14 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -10852,18 +11003,6 @@ fi + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -10883,7 +11022,7 @@ netbsd*) + ;; + + newsos6) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +@@ -10952,7 +11091,7 @@ rdos*) + ;; + + solaris*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -10977,7 +11116,7 @@ sunos4*) + ;; + + sysv4 | sysv4.3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -11001,7 +11140,7 @@ sysv4 | sysv4.3*) + + sysv4*MP*) + if test -d /usr/nec ;then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -11032,7 +11171,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + + tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -11042,7 +11181,7 @@ tpf*) + ;; + + uts4*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -11831,7 +11970,6 @@ export_dynamic_flag_spec_F77= + hardcode_direct_F77=no + hardcode_direct_absolute_F77=no + hardcode_libdir_flag_spec_F77= +-hardcode_libdir_flag_spec_ld_F77= + hardcode_libdir_separator_F77= + hardcode_minus_L_F77=no + hardcode_automatic_F77=no +@@ -12067,7 +12205,9 @@ lt_prog_compiler_static_F77= + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl_F77='-Xlinker ' +- lt_prog_compiler_pic_F77='-Xcompiler -fPIC' ++ if test -n "$lt_prog_compiler_pic_F77"; then ++ lt_prog_compiler_pic_F77="-Xcompiler $lt_prog_compiler_pic_F77" ++ fi + ;; + esac + else +@@ -12158,18 +12298,33 @@ lt_prog_compiler_static_F77= + ;; + *) + case `$CC -V 2>&1 | sed 5q` in +- *Sun\ F* | *Sun*Fortran*) ++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='' + ;; ++ *Sun\ F* | *Sun*Fortran*) ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='-Qoption ld ' ++ ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='-Wl,' + ;; ++ *Intel*\ [CF]*Compiler*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-fPIC' ++ lt_prog_compiler_static_F77='-static' ++ ;; ++ *Portland\ Group*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-fpic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; + esac + ;; + esac +@@ -12516,7 +12671,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + hardcode_direct_F77=no + hardcode_direct_absolute_F77=no + hardcode_libdir_flag_spec_F77= +- hardcode_libdir_flag_spec_ld_F77= + hardcode_libdir_separator_F77= + hardcode_minus_L_F77=no + hardcode_shlibpath_var_F77=unsupported +@@ -12560,9 +12714,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + openbsd*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu | gnu*) +- link_all_deplibs_F77=no +- ;; + esac + + ld_shlibs_F77=yes +@@ -12769,8 +12920,7 @@ _LT_EOF + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive' +- hardcode_libdir_flag_spec_F77= +- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~ +@@ -12785,7 +12935,7 @@ _LT_EOF + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -12962,7 +13112,6 @@ _LT_EOF + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi +- link_all_deplibs_F77=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -13138,6 +13287,7 @@ fi + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, F77)='true' + enable_shared_with_static_runtimes_F77=yes ++ exclude_expsyms_F77='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds_F77='chmod 644 $oldlib' +@@ -13183,6 +13333,7 @@ fi + hardcode_shlibpath_var_F77=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_F77='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ compiler_needs_object_F77=yes + else + whole_archive_flag_spec_F77='' + fi +@@ -13211,10 +13362,6 @@ fi + hardcode_shlibpath_var_F77=no + ;; + +- freebsd1*) +- ld_shlibs_F77=no +- ;; +- + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little +@@ -13227,7 +13374,7 @@ fi + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) ++ freebsd2.*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_minus_L_F77=yes +@@ -13266,7 +13413,6 @@ fi + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld_F77='+b $libdir' + hardcode_libdir_separator_F77=: + hardcode_direct_F77=yes + hardcode_direct_absolute_F77=yes +@@ -13369,7 +13515,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } + link_all_deplibs_F77=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -13753,8 +13899,6 @@ esac + + + +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + +@@ -13780,7 +13924,7 @@ need_version=unknown + + case $host_os in + aix3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + +@@ -13789,7 +13933,7 @@ aix3*) + ;; + + aix[4-9]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes +@@ -13854,7 +13998,7 @@ beos*) + ;; + + bsdi[45]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -13991,7 +14135,7 @@ darwin* | rhapsody*) + ;; + + dgux*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +@@ -13999,10 +14143,6 @@ dgux*) + shlibpath_var=LD_LIBRARY_PATH + ;; + +-freebsd1*) +- dynamic_linker=no +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -14010,7 +14150,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[123]*) objformat=aout ;; ++ freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -14028,7 +14168,7 @@ freebsd* | dragonfly*) + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +- freebsd2*) ++ freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) +@@ -14048,7 +14188,7 @@ freebsd* | dragonfly*) + ;; + + gnu*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +@@ -14059,7 +14199,7 @@ gnu*) + ;; + + haiku*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" +@@ -14120,7 +14260,7 @@ hpux9* | hpux10* | hpux11*) + ;; + + interix[3-9]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +@@ -14136,7 +14276,7 @@ irix5* | irix6* | nonstopux*) + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; +@@ -14173,9 +14313,9 @@ linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +-# This must be Linux ELF. ++# This must be glibc/ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -14217,10 +14357,14 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -14232,18 +14376,6 @@ fi + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -14263,7 +14395,7 @@ netbsd*) + ;; + + newsos6) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +@@ -14332,7 +14464,7 @@ rdos*) + ;; + + solaris*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -14357,7 +14489,7 @@ sunos4*) + ;; + + sysv4 | sysv4.3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -14381,7 +14513,7 @@ sysv4 | sysv4.3*) + + sysv4*MP*) + if test -d /usr/nec ;then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -14412,7 +14544,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + + tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -14422,7 +14554,7 @@ tpf*) + ;; + + uts4*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -14552,6 +14684,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + ++ ++ + ac_config_commands="$ac_config_commands libtool" + + +@@ -17457,6 +17591,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' + enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' + SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' + ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' ++PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' + host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' + host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' + host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +@@ -17537,7 +17672,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' + allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' + no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' + hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' + hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' + hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' + hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +@@ -17603,7 +17737,6 @@ with_gnu_ld_F77='`$ECHO "$with_gnu_ld_F77" | $SED "$delay_single_quote_subst"`' + allow_undefined_flag_F77='`$ECHO "$allow_undefined_flag_F77" | $SED "$delay_single_quote_subst"`' + no_undefined_flag_F77='`$ECHO "$no_undefined_flag_F77" | $SED "$delay_single_quote_subst"`' + hardcode_libdir_flag_spec_F77='`$ECHO "$hardcode_libdir_flag_spec_F77" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld_F77='`$ECHO "$hardcode_libdir_flag_spec_ld_F77" | $SED "$delay_single_quote_subst"`' + hardcode_libdir_separator_F77='`$ECHO "$hardcode_libdir_separator_F77" | $SED "$delay_single_quote_subst"`' + hardcode_direct_F77='`$ECHO "$hardcode_direct_F77" | $SED "$delay_single_quote_subst"`' + hardcode_direct_absolute_F77='`$ECHO "$hardcode_direct_absolute_F77" | $SED "$delay_single_quote_subst"`' +@@ -17639,6 +17772,7 @@ DLLTOOL \ + OBJDUMP \ + SHELL \ + ECHO \ ++PATH_SEPARATOR \ + SED \ + GREP \ + EGREP \ +@@ -17687,7 +17821,6 @@ with_gnu_ld \ + allow_undefined_flag \ + no_undefined_flag \ + hardcode_libdir_flag_spec \ +-hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ + exclude_expsyms \ + include_expsyms \ +@@ -17715,7 +17848,6 @@ with_gnu_ld_F77 \ + allow_undefined_flag_F77 \ + no_undefined_flag_F77 \ + hardcode_libdir_flag_spec_F77 \ +-hardcode_libdir_flag_spec_ld_F77 \ + hardcode_libdir_separator_F77 \ + exclude_expsyms_F77 \ + include_expsyms_F77 \ +@@ -18360,8 +18492,8 @@ $as_echo X"$file" | + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +-# Inc. ++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software ++# Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -18424,6 +18556,9 @@ SHELL=$lt_SHELL + # An echo program that protects backslashes. + ECHO=$lt_ECHO + ++# The PATH separator for the build system. ++PATH_SEPARATOR=$lt_PATH_SEPARATOR ++ + # The host system. + host_alias=$host_alias + host=$host +@@ -18719,10 +18854,6 @@ no_undefined_flag=$lt_no_undefined_flag + # This must work even if \$libdir does not exist + hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +-# If ld is used when linking, flag to hardcode \$libdir into a binary +-# during linking. This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +- + # Whether we need a single "-rpath" flag with a separated argument. + hardcode_libdir_separator=$lt_hardcode_libdir_separator + +@@ -19051,10 +19182,6 @@ no_undefined_flag=$lt_no_undefined_flag_F77 + # This must work even if \$libdir does not exist + hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 + +-# If ld is used when linking, flag to hardcode \$libdir into a binary +-# during linking. This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 +- + # Whether we need a single "-rpath" flag with a separated argument. + hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 + +diff --git a/configure.ac b/configure.ac +index ba14d97..5ce69e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,11 +9,11 @@ dnl Checks for standard programs. + AC_PROG_F77 + + ifdef([LT_INIT], [], [ +- errprint([error: you must have libtool 2.2.2 or a more recent version ++ errprint([error: you must have libtool 2.4.2 or a more recent version + ]) + m4exit([1])]) + +-LT_PREREQ([2.2.2]) ++LT_PREREQ([2.4.2]) + LT_INIT([win32-dll]) + + dnl Check for BLAS libraries +diff --git a/install-sh b/install-sh +index 6781b98..377bb86 100755 +--- a/install-sh ++++ b/install-sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2011-11-20.07; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC + # FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent +-# `make' implicit rules from creating a file called install from it ++# 'make' implicit rules from creating a file called install from it + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +@@ -156,6 +156,10 @@ while test $# -ne 0; do + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac + shift;; + + -T) no_target_directory=true;; +@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + fi + shift # arg + dst_arg=$arg ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac + done + fi + +@@ -194,13 +202,17 @@ if test $# -eq 0; then + echo "$0: no input file specified." >&2 + exit 1 + fi +- # It's OK to call `install-sh -d' without argument. ++ # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 + fi + + if test -z "$dir_arg"; then +- trap '(exit $?); exit' 1 2 13 15 ++ do_exit='(exit $ret); exit $ret' ++ trap "ret=129; $do_exit" 1 ++ trap "ret=130; $do_exit" 2 ++ trap "ret=141; $do_exit" 13 ++ trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. +@@ -228,9 +240,9 @@ fi + + for src + do +- # Protect names starting with `-'. ++ # Protect names problematic for 'test' and other utilities. + case $src in +- -*) src=./$src;; ++ -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then +@@ -252,12 +264,7 @@ do + echo "$0: no destination specified." >&2 + exit 1 + fi +- + dst=$dst_arg +- # Protect names starting with `-'. +- case $dst in +- -*) dst=./$dst;; +- esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. +@@ -347,7 +354,7 @@ do + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or +- # other-writeable bit of parent directory when it shouldn't. ++ # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in +@@ -385,7 +392,7 @@ do + + case $dstdir in + /*) prefix='/';; +- -*) prefix='./';; ++ [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + +@@ -403,7 +410,7 @@ do + + for d + do +- test -z "$d" && continue ++ test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then +diff --git a/ltmain.sh b/ltmain.sh +index c7d06c3..63ae69d 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -70,7 +70,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 ++# $progname: (GNU libtool) 2.4.2 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -80,7 +80,7 @@ + + PROGRAM=libtool + PACKAGE=libtool +-VERSION="2.4.2 Debian-2.4.2-1" ++VERSION=2.4.2 + TIMESTAMP="" + package_revision=1.3337 + +@@ -6124,10 +6124,7 @@ func_mode_link () + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) +- libs="$deplibs %DEPLIBS%" +- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" +- ;; ++ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then +@@ -6447,19 +6444,19 @@ func_mode_link () + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_preserve_dup_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) func_append specialdeplibs " $deplib" ;; +- esac +- fi +- func_append tmp_libs " $deplib" +- done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_preserve_dup_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; ++ esac ++ fi ++ func_append tmp_libs " $deplib" ++ done + continue + fi # $pass = conv + +@@ -7352,9 +7349,6 @@ func_mode_link () + revision="$number_minor" + lt_irix_increment=no + ;; +- *) +- func_fatal_configuration "$modename: unknown library version type \`$version_type'" +- ;; + esac + ;; + no) +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +index 8ff3c76..56666f0 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1,8 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +-# Inc. ++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software ++# Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -11,8 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +-# Inc. ++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software ++# Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl + AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl + AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + ++_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl ++dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl + _LT_DECL([], [host], [0])dnl + _LT_DECL([], [host_os], [0])dnl +@@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2011 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG], + m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], ++ [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], +@@ -822,6 +825,31 @@ m4_defun([_LT_LANG], + ])# _LT_LANG + + ++m4_ifndef([AC_PROG_GO], [ ++############################################################ ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_GO. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++############################################################ ++m4_defun([AC_PROG_GO], ++[AC_LANG_PUSH(Go)dnl ++AC_ARG_VAR([GOC], [Go compiler command])dnl ++AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl ++_AC_ARG_VAR_LDFLAGS()dnl ++AC_CHECK_TOOL(GOC, gccgo) ++if test -z "$GOC"; then ++ if test -n "$ac_tool_prefix"; then ++ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) ++ fi ++fi ++if test -z "$GOC"; then ++ AC_CHECK_PROG(GOC, gccgo, gccgo, false) ++fi ++])#m4_defun ++])#m4_ifndef ++ ++ + # _LT_LANG_DEFAULT_CONFIG + # ----------------------- + m4_defun([_LT_LANG_DEFAULT_CONFIG], +@@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + ++AC_PROVIDE_IFELSE([AC_PROG_GO], ++ [LT_LANG(GO)], ++ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) ++ + AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +@@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? +- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ # If there is a non-empty error log, and "single_module" ++ # appears in it, assume the flag caused a linker warning ++ if test -s conftest.err && $GREP single_module conftest.err; then ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ # Otherwise, if the output was created with a 0 exit code from ++ # the compiler, it worked. ++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD +@@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) ++ + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no +@@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) ++ + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +@@ -990,7 +1030,9 @@ _LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? +- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then ++ if test -s conftest.err && $GREP force_load conftest.err; then ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD +@@ -1035,8 +1077,8 @@ _LT_EOF + ]) + + +-# _LT_DARWIN_LINKER_FEATURES +-# -------------------------- ++# _LT_DARWIN_LINKER_FEATURES([TAG]) ++# --------------------------------- + # Checks for linker and compiler features on darwin + m4_defun([_LT_DARWIN_LINKER_FEATURES], + [ +@@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], ++ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi +@@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + CFLAGS="$SAVE_CFLAGS" + fi + ;; +-sparc*-*solaris*) ++*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ yes*) ++ case $host in ++ i?86-*-solaris*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ sparc*-*-solaris*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available. ++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then ++ LD="${LD-ld}_sol2" ++ fi ++ ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" +@@ -1414,13 +1471,13 @@ old_postuninstall_cmds= + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + fi + + case $host_os in +@@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + lt_cv_sys_max_cmd_len=196608 + ;; + ++ os2*) ++ # The test takes a long time on OS/2. ++ lt_cv_sys_max_cmd_len=8192 ++ ;; ++ + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +@@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ ++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do +@@ -2185,7 +2247,7 @@ need_version=unknown + + case $host_os in + aix3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + +@@ -2194,7 +2256,7 @@ aix3*) + ;; + + aix[[4-9]]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes +@@ -2259,7 +2321,7 @@ beos*) + ;; + + bsdi[[45]]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -2398,7 +2460,7 @@ m4_if([$1], [],[ + ;; + + dgux*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +@@ -2406,10 +2468,6 @@ dgux*) + shlibpath_var=LD_LIBRARY_PATH + ;; + +-freebsd1*) +- dynamic_linker=no +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -2417,7 +2475,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[[123]]*) objformat=aout ;; ++ freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -2435,7 +2493,7 @@ freebsd* | dragonfly*) + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +- freebsd2*) ++ freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) +@@ -2455,7 +2513,7 @@ freebsd* | dragonfly*) + ;; + + gnu*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +@@ -2466,7 +2524,7 @@ gnu*) + ;; + + haiku*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" +@@ -2527,7 +2585,7 @@ hpux9* | hpux10* | hpux11*) + ;; + + interix[[3-9]]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +@@ -2543,7 +2601,7 @@ irix5* | irix6* | nonstopux*) + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; +@@ -2580,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +-# This must be Linux ELF. ++# This must be glibc/ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2611,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -2626,18 +2688,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -2657,7 +2707,7 @@ netbsd*) + ;; + + newsos6) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +@@ -2726,7 +2776,7 @@ rdos*) + ;; + + solaris*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2751,7 +2801,7 @@ sunos4*) + ;; + + sysv4 | sysv4.3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -2775,7 +2825,7 @@ sysv4 | sysv4.3*) + + sysv4*MP*) + if test -d /usr/nec ;then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -2806,7 +2856,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + + tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2816,7 +2866,7 @@ tpf*) + ;; + + uts4*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -3238,12 +3288,12 @@ irix5* | irix6* | nonstopux*) + lt_cv_deplibs_check_method=pass_all + ;; + +-# This must be Linux ELF. ++# This must be glibc/ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -3658,6 +3708,7 @@ for ac_symprfx in "" "_"; do + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ + " {last_section=section; section=\$ 3};"\ ++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ + " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ + " \$ 0!~/External *\|/{next};"\ + " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +@@ -4054,7 +4105,7 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -4242,7 +4293,9 @@ m4_if([$1], [CXX], [ + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' ++ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ++ fi + ;; + esac + else +@@ -4334,18 +4387,33 @@ m4_if([$1], [CXX], [ + ;; + *) + case `$CC -V 2>&1 | sed 5q` in +- *Sun\ F* | *Sun*Fortran*) ++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; ++ *Sun\ F* | *Sun*Fortran*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; ++ *Intel*\ [[CF]]*Compiler*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ *Portland\ Group*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + esac + ;; + esac +@@ -4505,16 +4573,15 @@ m4_if([$1], [CXX], [ + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in +- cl*) ;; ++ cl*) ++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; +- linux* | k*bsd*-gnu | gnu*) +- _LT_TAGVAR(link_all_deplibs, $1)=no +- ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -4533,7 +4600,6 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +@@ -4578,9 +4644,6 @@ dnl Note also adjust exclude_expsyms for C++ above. + openbsd*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu | gnu*) +- _LT_TAGVAR(link_all_deplibs, $1)=no +- ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -4787,8 +4850,7 @@ _LT_EOF + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +@@ -4803,7 +4865,7 @@ _LT_EOF + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -4980,7 +5042,6 @@ _LT_EOF + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi +- _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -5084,6 +5145,7 @@ _LT_EOF + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' +@@ -5130,10 +5192,6 @@ _LT_EOF + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- freebsd1*) +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little +@@ -5146,7 +5204,7 @@ _LT_EOF + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) ++ freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes +@@ -5185,7 +5243,6 @@ _LT_EOF + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +@@ -5289,7 +5346,7 @@ _LT_EOF + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -5627,9 +5684,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], + _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], +- [[If ld is used when linking, flag to hardcode $libdir into a binary +- during linking. This must work even if $libdir does not exist]]) + _LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) + _LT_TAGDECL([], [hardcode_direct], [0], +@@ -5787,7 +5841,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +@@ -6157,7 +6210,7 @@ if test "$_lt_caught_CXX_error" != yes; then + esac ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. -- icc* | ifort*) -+ icc* | ifort* | mpif77*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fPIC' - lt_prog_compiler_static_F77='-static' + +- freebsd[[12]]*) ++ freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -6918,12 +6971,18 @@ public class foo { + } + }; + _LT_EOF ++], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF ++package foo ++func foo() { ++} ++_LT_EOF + ]) + + _lt_libdeps_save_CFLAGS=$CFLAGS + case "$CC $CFLAGS " in #( + *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; + *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; + esac + + dnl Parse the compiler output and extract the necessary +@@ -7120,7 +7179,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=no +@@ -7253,7 +7311,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=no +@@ -7440,6 +7497,77 @@ CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + ++# _LT_LANG_GO_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for the GNU Go compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_GO_CONFIG], ++[AC_REQUIRE([LT_PROG_GO])dnl ++AC_LANG_SAVE ++ ++# Source file extension for Go test sources. ++ac_ext=go ++ ++# Object file extension for compiled Go test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="package main; func main() { }" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='package main; func main() { }' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS ++lt_save_GCC=$GCC ++GCC=yes ++CC=${GOC-"gccgo"} ++CFLAGS=$GOFLAGS ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_TAGVAR(LD, $1)="$LD" ++_LT_CC_BASENAME([$compiler]) ++ ++# Go did not exist at the time GCC didn't implicitly link libc in. ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(reload_flag, $1)=$reload_flag ++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ++ ++## CAVEAT EMPTOR: ++## There is no encapsulation within the following macros, do not change ++## the running order or otherwise move them around unless you know exactly ++## what you are doing... ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++fi ++ ++AC_LANG_RESTORE ++ ++GCC=$lt_save_GCC ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS ++])# _LT_LANG_GO_CONFIG ++ ++ + # _LT_LANG_RC_CONFIG([TAG]) + # ------------------------- + # Ensure that the configuration variables for the Windows resource compiler +@@ -7509,6 +7637,13 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + ++# LT_PROG_GO ++# ---------- ++AC_DEFUN([LT_PROG_GO], ++[AC_CHECK_TOOL(GOC, gccgo,) ++]) ++ ++ + # LT_PROG_RC + # ---------- + AC_DEFUN([LT_PROG_RC], +diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 +index 17cfd51..5d9acd8 100644 +--- a/m4/ltoptions.m4 ++++ b/m4/ltoptions.m4 +@@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + # MODE is either `yes' or `no'. If omitted, it defaults to `both'. + m4_define([_LT_WITH_PIC], + [AC_ARG_WITH([pic], +- [AS_HELP_STRING([--with-pic], ++ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], ++ [lt_p=${PACKAGE-default} ++ case $withval in ++ yes|no) pic_mode=$withval ;; ++ *) ++ pic_mode=default ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for lt_pkg in $withval; do ++ IFS="$lt_save_ifs" ++ if test "X$lt_pkg" = "X$lt_p"; then ++ pic_mode=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], + [pic_mode=default]) + + test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) +diff --git a/missing b/missing +index 28055d2..cdea514 100755 +--- a/missing ++++ b/missing +@@ -1,11 +1,10 @@ + #! /bin/sh +-# Common stub for a few missing GNU programs while installing. ++# Common wrapper for a few potentially missing GNU programs. + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2012-06-26.16; # UTC + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +-# 2008, 2009 Free Software Foundation, Inc. +-# Originally by Fran,cois Pinard , 1996. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Originally written by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC + # the same distribution terms that you use for the rest of that program. + + if test $# -eq 0; then +- echo 1>&2 "Try \`$0 --help' for more information" ++ echo 1>&2 "Try '$0 --help' for more information" + exit 1 + fi + +-run=: +-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +-sed_minuso='s/.* -o \([^ ]*\).*/\1/p' +- +-# In the cases where this matters, `missing' is being run in the +-# srcdir already. +-if test -f configure.ac; then +- configure_ac=configure.ac +-else +- configure_ac=configure.in +-fi ++case $1 in + +-msg="missing on your system" ++ --is-lightweight) ++ # Used by our autoconf macros to check whether the available missing ++ # script is modern enough. ++ exit 0 ++ ;; + +-case $1 in +---run) +- # Try to run requested program, and just exit if it succeeds. +- run= +- shift +- "$@" && exit 0 +- # Exit code 63 means version mismatch. This often happens +- # when the user try to use an ancient version of a tool on +- # a file that requires a minimum version. In this case we +- # we should proceed has if the program had been absent, or +- # if --run hadn't been passed. +- if test $? = 63; then +- run=: +- msg="probably too old" +- fi +- ;; ++ --run) ++ # Back-compat with the calling convention used by older automake. ++ shift ++ ;; + + -h|--h|--he|--hel|--help) + echo "\ + $0 [OPTION]... PROGRAM [ARGUMENT]... + +-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +-error status if there is no known handling for PROGRAM. ++Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due ++to PROGRAM being missing or too old. + + Options: + -h, --help display this help and exit + -v, --version output version information and exit +- --run try to run the given command, and emulate it if it fails + + Supported PROGRAM values: +- aclocal touch file \`aclocal.m4' +- autoconf touch file \`configure' +- autoheader touch file \`config.h.in' +- autom4te touch the output file, or create a stub one +- automake touch all \`Makefile.in' files +- bison create \`y.tab.[ch]', if possible, from existing .[ch] +- flex create \`lex.yy.c', if possible, from existing .c +- help2man touch the output file +- lex create \`lex.yy.c', if possible, from existing .c +- makeinfo touch the output file +- tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ aclocal autoconf autoheader autom4te automake makeinfo ++ bison yacc flex lex help2man + +-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +-\`g' are ignored when checking the name. ++Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and ++'g' are ignored when checking the name. + + Send bug reports to ." + exit $? +@@ -100,272 +70,141 @@ Send bug reports to ." + ;; + + -*) +- echo 1>&2 "$0: Unknown \`$1' option" +- echo 1>&2 "Try \`$0 --help' for more information" ++ echo 1>&2 "$0: unknown '$1' option" ++ echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + + esac + +-# normalize program name to check for. +-program=`echo "$1" | sed ' +- s/^gnu-//; t +- s/^gnu//; t +- s/^g//; t'` +- +-# Now exit if we have it, but it failed. Also exit now if we +-# don't have it and --version was passed (most likely to detect +-# the program). This is about non-GNU programs, so use $1 not +-# $program. +-case $1 in +- lex*|yacc*) +- # Not GNU programs, they don't have --version. +- ;; +- +- tar*) +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- exit 1 +- fi +- ;; +- +- *) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- # Could not run --version or --help. This is probably someone +- # running `$TOOL --version' or `$TOOL --help' to check whether +- # $TOOL exists and not knowing $TOOL uses missing. +- exit 1 +- fi +- ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case $program in +- aclocal*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`acinclude.m4' or \`${configure_ac}'. You might want +- to install the \`Automake' and \`Perl' packages. Grab them from +- any GNU archive site." +- touch aclocal.m4 +- ;; +- +- autoconf*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`${configure_ac}'. You might want to install the +- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +- archive site." +- touch configure +- ;; +- +- autoheader*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`acconfig.h' or \`${configure_ac}'. You might want +- to install the \`Autoconf' and \`GNU m4' packages. Grab them +- from any GNU archive site." +- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` +- test -z "$files" && files="config.h" +- touch_files= +- for f in $files; do +- case $f in +- *:*) touch_files="$touch_files "`echo "$f" | +- sed -e 's/^[^:]*://' -e 's/:.*//'`;; +- *) touch_files="$touch_files $f.in";; +- esac +- done +- touch $touch_files +- ;; +- +- automake*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. +- You might want to install the \`Automake' and \`Perl' packages. +- Grab them from any GNU archive site." +- find . -type f -name Makefile.am -print | +- sed 's/\.am$/.in/' | +- while read f; do touch "$f"; done +- ;; +- +- autom4te*) +- echo 1>&2 "\ +-WARNING: \`$1' is needed, but is $msg. +- You might have modified some files without having the +- proper tools for further handling them. +- You can get \`$1' as part of \`Autoconf' from any GNU +- archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo "#! /bin/sh" +- echo "# Created by GNU Automake missing as a replacement of" +- echo "# $ $@" +- echo "exit 0" +- chmod +x $file +- exit 1 +- fi +- ;; +- +- bison*|yacc*) +- echo 1>&2 "\ +-WARNING: \`$1' $msg. You should only need it if +- you modified a \`.y' file. You may need the \`Bison' package +- in order for those modifications to take effect. You can get +- \`Bison' from any GNU archive site." +- rm -f y.tab.c y.tab.h +- if test $# -ne 1; then +- eval LASTARG="\${$#}" +- case $LASTARG in +- *.y) +- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.c +- fi +- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.h +- fi +- ;; +- esac +- fi +- if test ! -f y.tab.h; then +- echo >y.tab.h +- fi +- if test ! -f y.tab.c; then +- echo 'main() { return 0; }' >y.tab.c +- fi +- ;; +- +- lex*|flex*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a \`.l' file. You may need the \`Flex' package +- in order for those modifications to take effect. You can get +- \`Flex' from any GNU archive site." +- rm -f lex.yy.c +- if test $# -ne 1; then +- eval LASTARG="\${$#}" +- case $LASTARG in +- *.l) +- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" lex.yy.c +- fi +- ;; +- esac +- fi +- if test ! -f lex.yy.c; then +- echo 'main() { return 0; }' >lex.yy.c +- fi +- ;; +- +- help2man*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a dependency of a manual page. You may need the +- \`Help2man' package in order for those modifications to take +- effect. You can get \`Help2man' from any GNU archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo ".ab help2man is required to generate this page" +- exit $? +- fi +- ;; +- +- makeinfo*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a \`.texi' or \`.texinfo' file, or any other file +- indirectly affecting the aspect of the manual. The spurious +- call might also be the consequence of using a buggy \`make' (AIX, +- DU, IRIX). You might want to install the \`Texinfo' package or +- the \`GNU make' package. Grab either from any GNU archive site." +- # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -z "$file"; then +- # ... or it is the one specified with @setfilename ... +- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n ' +- /^@setfilename/{ +- s/.* \([^ ]*\) *$/\1/ +- p +- q +- }' $infile` +- # ... or it is derived from the source name (dir/f.texi becomes f.info) +- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info +- fi +- # If the file does not exist, the user really needs makeinfo; +- # let's fail without touching anything. +- test -f $file || exit 1 +- touch $file +- ;; +- +- tar*) +- shift +- +- # We have already tried tar in the generic part. +- # Look for gnutar/gtar before invocation to avoid ugly error +- # messages. +- if (gnutar --version > /dev/null 2>&1); then +- gnutar "$@" && exit 0 +- fi +- if (gtar --version > /dev/null 2>&1); then +- gtar "$@" && exit 0 +- fi +- firstarg="$1" +- if shift; then +- case $firstarg in +- *o*) +- firstarg=`echo "$firstarg" | sed s/o//` +- tar "$firstarg" "$@" && exit 0 +- ;; +- esac +- case $firstarg in +- *h*) +- firstarg=`echo "$firstarg" | sed s/h//` +- tar "$firstarg" "$@" && exit 0 +- ;; +- esac +- fi +- +- echo 1>&2 "\ +-WARNING: I can't seem to be able to run \`tar' with the given arguments. +- You may want to install GNU tar or Free paxutils, or check the +- command line arguments." +- exit 1 +- ;; +- +- *) +- echo 1>&2 "\ +-WARNING: \`$1' is needed, and is $msg. +- You might have modified some files without having the +- proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequisites for installing +- this package. You may also peek at any GNU archive site, in case +- some other package would contain this missing \`$1' program." +- exit 1 +- ;; +-esac ++# Run the given program, remember its exit status. ++"$@"; st=$? ++ ++# If it succeeded, we are done. ++test $st -eq 0 && exit 0 ++ ++# Also exit now if we it failed (or wasn't found), and '--version' was ++# passed; such an option is passed most likely to detect whether the ++# program is present and works. ++case $2 in --version|--help) exit $st;; esac ++ ++# Exit code 63 means version mismatch. This often happens when the user ++# tries to use an ancient version of a tool on a file that requires a ++# minimum version. ++if test $st -eq 63; then ++ msg="probably too old" ++elif test $st -eq 127; then ++ # Program was missing. ++ msg="missing on your system" ++else ++ # Program was found and executed, but failed. Give up. ++ exit $st ++fi + +-exit 0 ++perl_URL=http://www.perl.org/ ++flex_URL=http://flex.sourceforge.net/ ++gnu_software_URL=http://www.gnu.org/software ++ ++program_details () ++{ ++ case $1 in ++ aclocal|automake) ++ echo "The '$1' program is part of the GNU Automake package:" ++ echo "<$gnu_software_URL/automake>" ++ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" ++ echo "<$gnu_software_URL/autoconf>" ++ echo "<$gnu_software_URL/m4/>" ++ echo "<$perl_URL>" ++ ;; ++ autoconf|autom4te|autoheader) ++ echo "The '$1' program is part of the GNU Autoconf package:" ++ echo "<$gnu_software_URL/autoconf/>" ++ echo "It also requires GNU m4 and Perl in order to run:" ++ echo "<$gnu_software_URL/m4/>" ++ echo "<$perl_URL>" ++ ;; ++ esac ++} ++ ++give_advice () ++{ ++ # Normalize program name to check for. ++ normalized_program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` ++ ++ printf '%s\n' "'$1' is $msg." ++ ++ configure_deps="'configure.ac' or m4 files included by 'configure.ac'" ++ case $normalized_program in ++ autoconf*) ++ echo "You should only need it if you modified 'configure.ac'," ++ echo "or m4 files included by it." ++ program_details 'autoconf' ++ ;; ++ autoheader*) ++ echo "You should only need it if you modified 'acconfig.h' or" ++ echo "$configure_deps." ++ program_details 'autoheader' ++ ;; ++ automake*) ++ echo "You should only need it if you modified 'Makefile.am' or" ++ echo "$configure_deps." ++ program_details 'automake' ++ ;; ++ aclocal*) ++ echo "You should only need it if you modified 'acinclude.m4' or" ++ echo "$configure_deps." ++ program_details 'aclocal' ++ ;; ++ autom4te*) ++ echo "You might have modified some maintainer files that require" ++ echo "the 'automa4te' program to be rebuilt." ++ program_details 'autom4te' ++ ;; ++ bison*|yacc*) ++ echo "You should only need it if you modified a '.y' file." ++ echo "You may want to install the GNU Bison package:" ++ echo "<$gnu_software_URL/bison/>" ++ ;; ++ lex*|flex*) ++ echo "You should only need it if you modified a '.l' file." ++ echo "You may want to install the Fast Lexical Analyzer package:" ++ echo "<$flex_URL>" ++ ;; ++ help2man*) ++ echo "You should only need it if you modified a dependency" \ ++ "of a man page." ++ echo "You may want to install the GNU Help2man package:" ++ echo "<$gnu_software_URL/help2man/>" ++ ;; ++ makeinfo*) ++ echo "You should only need it if you modified a '.texi' file, or" ++ echo "any other file indirectly affecting the aspect of the manual." ++ echo "You might want to install the Texinfo package:" ++ echo "<$gnu_software_URL/texinfo/>" ++ echo "The spurious makeinfo call might also be the consequence of" ++ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" ++ echo "want to install GNU make:" ++ echo "<$gnu_software_URL/make/>" ++ ;; ++ *) ++ echo "You might have modified some files without having the proper" ++ echo "tools for further handling them. Check the 'README' file, it" ++ echo "often tells you about the needed prerequisites for installing" ++ echo "this package. You may also peek at any GNU archive site, in" ++ echo "case some other package contains this missing '$1' program." ++ ;; ++ esac ++} ++ ++give_advice "$1" | sed -e '1s/^/WARNING: /' \ ++ -e '2,$s/^/ /' >&2 ++ ++# Propagate the correct exit status (expected to be 127 for a program ++# not found, 63 for a program that failed due to version mismatch). ++exit $st + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +-- +1.8.3.1 + +From aa5cc620ecc4eb512332b1399d2bbff52e5c5515 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Mon, 14 Oct 2013 11:13:33 +0200 +Subject: [PATCH 2/2] replace the symlink by a copy + +--- + compile | 348 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 347 insertions(+), 1 deletion(-) + mode change 120000 => 100755 compile + +diff --git a/compile b/compile +deleted file mode 120000 +index d3164c8..0000000 +--- a/compile ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/automake-1.14/compile +\ No newline at end of file +diff --git a/compile b/compile +new file mode 100755 +index 0000000..531136b +--- /dev/null ++++ b/compile +@@ -0,0 +1,347 @@ ++#! /bin/sh ++# Wrapper for compilers which do not understand '-c -o'. ++ ++scriptversion=2012-10-14.11; # UTC ++ ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. ++# Written by Tom Tromey . ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++nl=' ++' ++ ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent tools from complaining about whitespace usage. ++IFS=" "" $nl" ++ ++file_conv= ++ ++# func_file_conv build_file lazy ++# Convert a $build file to $host form and store it in $file ++# Currently only supports Windows hosts. If the determined conversion ++# type is listed in (the comma separated) LAZY, no conversion will ++# take place. ++func_file_conv () ++{ ++ file=$1 ++ case $file in ++ / | /[!/]*) # absolute file, and not a UNC file ++ if test -z "$file_conv"; then ++ # lazily determine how to convert abs files ++ case `uname -s` in ++ MINGW*) ++ file_conv=mingw ++ ;; ++ CYGWIN*) ++ file_conv=cygwin ++ ;; ++ *) ++ file_conv=wine ++ ;; ++ esac ++ fi ++ case $file_conv/,$2, in ++ *,$file_conv,*) ++ ;; ++ mingw/*) ++ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ++ ;; ++ cygwin/*) ++ file=`cygpath -m "$file" || echo "$file"` ++ ;; ++ wine/*) ++ file=`winepath -w "$file" || echo "$file"` ++ ;; ++ esac ++ ;; ++ esac ++} ++ ++# func_cl_dashL linkdir ++# Make cl look for libraries in LINKDIR ++func_cl_dashL () ++{ ++ func_file_conv "$1" ++ if test -z "$lib_path"; then ++ lib_path=$file ++ else ++ lib_path="$lib_path;$file" ++ fi ++ linker_opts="$linker_opts -LIBPATH:$file" ++} ++ ++# func_cl_dashl library ++# Do a library search-path lookup for cl ++func_cl_dashl () ++{ ++ lib=$1 ++ found=no ++ save_IFS=$IFS ++ IFS=';' ++ for dir in $lib_path $LIB ++ do ++ IFS=$save_IFS ++ if $shared && test -f "$dir/$lib.dll.lib"; then ++ found=yes ++ lib=$dir/$lib.dll.lib ++ break ++ fi ++ if test -f "$dir/$lib.lib"; then ++ found=yes ++ lib=$dir/$lib.lib ++ break ++ fi ++ if test -f "$dir/lib$lib.a"; then ++ found=yes ++ lib=$dir/lib$lib.a ++ break ++ fi ++ done ++ IFS=$save_IFS ++ ++ if test "$found" != yes; then ++ lib=$lib.lib ++ fi ++} ++ ++# func_cl_wrapper cl arg... ++# Adjust compile command to suit cl ++func_cl_wrapper () ++{ ++ # Assume a capable shell ++ lib_path= ++ shared=: ++ linker_opts= ++ for arg ++ do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as 'compile cc -o foo foo.c'. ++ eat=1 ++ case $2 in ++ *.o | *.[oO][bB][jJ]) ++ func_file_conv "$2" ++ set x "$@" -Fo"$file" ++ shift ++ ;; ++ *) ++ func_file_conv "$2" ++ set x "$@" -Fe"$file" ++ shift ++ ;; ++ esac ++ ;; ++ -I) ++ eat=1 ++ func_file_conv "$2" mingw ++ set x "$@" -I"$file" ++ shift ++ ;; ++ -I*) ++ func_file_conv "${1#-I}" mingw ++ set x "$@" -I"$file" ++ shift ++ ;; ++ -l) ++ eat=1 ++ func_cl_dashl "$2" ++ set x "$@" "$lib" ++ shift ++ ;; ++ -l*) ++ func_cl_dashl "${1#-l}" ++ set x "$@" "$lib" ++ shift ++ ;; ++ -L) ++ eat=1 ++ func_cl_dashL "$2" ++ ;; ++ -L*) ++ func_cl_dashL "${1#-L}" ++ ;; ++ -static) ++ shared=false ++ ;; ++ -Wl,*) ++ arg=${1#-Wl,} ++ save_ifs="$IFS"; IFS=',' ++ for flag in $arg; do ++ IFS="$save_ifs" ++ linker_opts="$linker_opts $flag" ++ done ++ IFS="$save_ifs" ++ ;; ++ -Xlinker) ++ eat=1 ++ linker_opts="$linker_opts $2" ++ ;; ++ -*) ++ set x "$@" "$1" ++ shift ++ ;; ++ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) ++ func_file_conv "$1" ++ set x "$@" -Tp"$file" ++ shift ++ ;; ++ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) ++ func_file_conv "$1" mingw ++ set x "$@" "$file" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift ++ done ++ if test -n "$linker_opts"; then ++ linker_opts="-link$linker_opts" ++ fi ++ exec "$@" $linker_opts ++ exit 1 ++} ++ ++eat= ++ ++case $1 in ++ '') ++ echo "$0: No command. Try '$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: compile [--help] [--version] PROGRAM [ARGS] ++ ++Wrapper for compilers which do not understand '-c -o'. ++Remove '-o dest.o' from ARGS, run PROGRAM with the remaining ++arguments, and rename the output as expected. ++ ++If you are trying to build a whole package this is not the ++right script to run: please start by reading the file 'INSTALL'. ++ ++Report bugs to . ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "compile $scriptversion" ++ exit $? ++ ;; ++ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) ++ func_cl_wrapper "$@" # Doesn't return... ++ ;; ++esac ++ ++ofile= ++cfile= ++ ++for arg ++do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as 'compile cc -o foo foo.c'. ++ # So we strip '-o arg' only if arg is an object. ++ eat=1 ++ case $2 in ++ *.o | *.obj) ++ ofile=$2 ++ ;; ++ *) ++ set x "$@" -o "$2" ++ shift ++ ;; ++ esac ++ ;; ++ *.c) ++ cfile=$1 ++ set x "$@" "$1" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift ++done ++ ++if test -z "$ofile" || test -z "$cfile"; then ++ # If no '-o' option was seen then we might have been invoked from a ++ # pattern rule where we don't need one. That is ok -- this is a ++ # normal compilation that the losing compiler can handle. If no ++ # '.c' file was seen then we are probably linking. That is also ++ # ok. ++ exec "$@" ++fi ++ ++# Name of file we expect compiler to create. ++cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` ++ ++# Create the lock directory. ++# Note: use '[/\\:.-]' here to ensure that we don't use the same name ++# that we are using for the .o file. Also, base the name on the expected ++# object file name, since that is what matters with a parallel build. ++lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d ++while true; do ++ if mkdir "$lockdir" >/dev/null 2>&1; then ++ break ++ fi ++ sleep 1 ++done ++# FIXME: race condition here if user kills between mkdir and trap. ++trap "rmdir '$lockdir'; exit 1" 1 2 15 ++ ++# Run the compile. ++"$@" ++ret=$? ++ ++if test -f "$cofile"; then ++ test "$cofile" = "$ofile" || mv "$cofile" "$ofile" ++elif test -f "${cofile}bj"; then ++ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" ++fi ++ ++rmdir "$lockdir" ++exit $ret ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" ++# End: +-- +1.8.3.1 + -- GitLab From 11a735fac251c6860529dc5acf55c0cc1891f801 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 3 Nov 2013 21:50:56 +0100 Subject: [PATCH 174/811] add easyconfigs for libXfixes, fix list of dependencies for libXi --- .../l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb | 17 +++++++++++++++++ .../l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb | 17 +++++++++++++++++ .../l/libXi/libXi-1.7.2-goolf-1.4.10.eb | 10 ++++++++-- .../l/libXi/libXi-1.7.2-ictce-4.1.13.eb | 10 ++++++++-- 4 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..ab72a1918c --- /dev/null +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'libXfixes' +version = '5.0.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X Fixes extension library""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..fca576fc0d --- /dev/null +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'libXfixes' +version = '5.0.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X Fixes extension library""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb index 03673e2f2b..4d4672394e 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb @@ -9,10 +9,16 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -dependencies = [('inputproto', '2.3')] +dependencies = [ + ('xproto', '7.0.23'), + ('xextproto', '7.2.1'), + ('libXext', '1.3.2'), + ('inputproto', '2.3'), + ('libXfixes', '5.0.1'), +] sanity_check_paths = { - 'files' : ['include/X11/extensions/XInput.h'], + 'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'], 'dirs' : [], } diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb index c3e8060e3b..cbb0ad6be6 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb @@ -9,10 +9,16 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -dependencies = [('inputproto', '2.3')] +dependencies = [ + ('xproto', '7.0.23'), + ('xextproto', '7.2.1'), + ('libXext', '1.3.2'), + ('inputproto', '2.3'), + ('libXfixes', '5.0.1'), +] sanity_check_paths = { - 'files' : ['include/X11/extensions/XInput.h'], + 'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'], 'dirs' : [], } -- GitLab From fbface3b90dafaf3cc1ff5ee80bae8e1a87aac1a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 3 Nov 2013 22:15:11 +0100 Subject: [PATCH 175/811] add fixesproto easyconfigs and use it as dependency for libXfixes --- .../f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb | 17 +++++++++++++++++ .../f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb | 17 +++++++++++++++++ .../l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb | 2 ++ .../l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb | 2 ++ 4 files changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..50fd8ada0f --- /dev/null +++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'fixesproto' +version = '5.0' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org FixesProto protocol headers.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..3b661266ea --- /dev/null +++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'fixesproto' +version = '5.0' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org FixesProto protocol headers.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb index ab72a1918c..5d6bae0b68 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb @@ -9,6 +9,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +dependencies = [('fixesproto', '5.0')] + sanity_check_paths = { 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], 'dirs' : [], diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb index fca576fc0d..e139378b69 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb @@ -9,6 +9,8 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +dependencies = [('fixesproto', '5.0')] + sanity_check_paths = { 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], 'dirs' : [], -- GitLab From a5ee2f80c03a15a6e1561d49b07248a515936c0c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 3 Nov 2013 22:20:39 +0100 Subject: [PATCH 176/811] add xextproto as dependency for libXfixes --- .../easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb | 5 ++++- .../easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb index 5d6bae0b68..6293ac9f70 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb @@ -9,7 +9,10 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -dependencies = [('fixesproto', '5.0')] +dependencies = [ + ('fixesproto', '5.0'), + ('xextproto', '7.2.1'), +] sanity_check_paths = { 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb index e139378b69..4c40b8e475 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb @@ -9,7 +9,10 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] -dependencies = [('fixesproto', '5.0')] +dependencies = [ + ('fixesproto', '5.0'), + ('xextproto', '7.2.1'), +] sanity_check_paths = { 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], -- GitLab From 357518ea84e29dfb5cc39cb5069acc663243a9e6 Mon Sep 17 00:00:00 2001 From: Thekla Date: Mon, 4 Nov 2013 09:52:30 +0200 Subject: [PATCH 177/811] Adding ncdf4 for R-3.0.2 bare and non bare --- .../l/libpng/libpng-1.6.6-ictce-5.3.0.eb | 18 +++ .../ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb | 26 ++++ .../ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb | 25 ++++ .../r/R/R-3.0.2-ictce-5.3.0-bare.eb | 37 +++++ .../easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb | 139 ++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb create mode 100644 easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb create mode 100644 easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb create mode 100644 easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb new file mode 100644 index 0000000000..acdc9a2af6 --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb @@ -0,0 +1,18 @@ +name = 'libpng' +version = '1.6.6' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb new file mode 100644 index 0000000000..43b83a3dbf --- /dev/null +++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb @@ -0,0 +1,26 @@ +easyblock = 'RPackage' + +name = 'ncdf4' +version = '1.6.1' + +homepage = 'http://cran.r-project.org/web/packages/ncdf4' +description = """This package provides a high-level R interface to data files written using Unidata's netCDF library (version 4 or earlier), which are binary data files that are portable across platforms and include metadata information in addition to the data sets.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://cran.r-project.org/src/contrib/Archive/ncdf4'] +sources = ['%s_%s.tar.gz' % (name, version)] + +r='R' +rver='3.0.2' +rversuf='-bare' + +versionsuffix = '-%s-%s%s' % (r, rver,rversuf) + + +dependencies = [ + ( r, rver, rversuf), + ('netCDF', '4.2.1.1'), + ] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb new file mode 100644 index 0000000000..75f2fa4a74 --- /dev/null +++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb @@ -0,0 +1,25 @@ +easyblock = 'RPackage' + +name = 'ncdf4' +version = '1.6.1' + +homepage = 'http://cran.r-project.org/web/packages/ncdf4' +description = """This package provides a high-level R interface to data files written using Unidata's netCDF library (version 4 or earlier), which are binary data files that are portable across platforms and include metadata information in addition to the data sets.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://cran.r-project.org/src/contrib/Archive/ncdf4'] +sources = ['%s_%s.tar.gz' % (name, version)] + +r='R' +rver='3.0.2' + +versionsuffix = '-%s-%s' % (r, rver) + + +dependencies = [ + ( r, rver), + ('netCDF', '4.2.1.1'), + ] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb new file mode 100644 index 0000000000..6ba1e02d1f --- /dev/null +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb @@ -0,0 +1,37 @@ +name = 'R' +version = '3.0.2' +versionsuffix = '-bare' # bare, as in no extensions included + +homepage = 'http://www.r-project.org/' +description = """R is a free software environment for statistical computing and graphics.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s'] + +preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"' +configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib" +# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below +configopts += " --with-recommended-packages=no" + +dependencies = [ + ('libreadline', '6.2'), + ('ncurses', '5.9'), + ('libpng', '1.6.6'), # for plotting in R + ('Java', '1.7.0_21', '', True), # Java bindings are built if Java is found, might as well provide it +] + +exts_list = [] # just to make it explicit this module doesn't include any extensions + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['R', 'Rscript']] + + ['lib64/R/include/%s' % x for x in ['Rconfig.h', 'Rdefines.h', 'Rembedded.h', + 'R.h', 'Rinterface.h', 'Rinternals.h', + 'Rmath.h', 'Rversion.h', 'S.h']] + + ['lib64/R/modules/%s' % x for x in ['internet.so', 'lapack.so', 'vfonts.so']] + + ['lib64/R/lib/libR.so'], + 'dirs': [] +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..114cfd812f --- /dev/null +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb @@ -0,0 +1,139 @@ +name = 'R' +version = '3.0.2' + +homepage = 'http://www.r-project.org/' +description = """R is a free software environment for statistical computing and graphics.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s'] + +preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"' +configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib" +# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below +configopts += " --with-recommended-packages=no" + +dependencies = [ + ('libreadline', '6.2'), + ('ncurses', '5.9'), + ('libpng', '1.6.2'), # for plotting in R + ('Java', '1.7.0_15', '', True), # Java bindings are built if Java is found, might as well provide it +] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['R', 'Rscript']] + + ['lib64/R/include/%s' % x for x in ['Rconfig.h', 'Rdefines.h', 'Rembedded.h', + 'R.h', 'Rinterface.h', 'Rinternals.h', + 'Rmath.h', 'Rversion.h', 'S.h']] + + ['lib64/R/modules/%s' % x for x in ['internet.so', 'lapack.so', 'vfonts.so']] + + ['lib64/R/lib/libR.so'], + 'dirs': [] +} + +name_tmpl = '%(name)s_%(version)s.tar.gz' +ext_options = { + 'source_urls': [ + 'http://cran.r-project.org/src/contrib/Archive/%(name)s', # package archive + 'http://cran.freestatistics.org/src/contrib', # alternative for packages + ], + 'source_tmpl': name_tmpl, +} +# Bioconductor packages have a different download url +bioconductor_options = { + 'source_urls': ['http://www.bioconductor.org/packages/2.12/bioc/src/contrib/'], + 'source_tmpl': name_tmpl, +} +# !! order of packages is important !! +exts_list = [ + # default libraries, only here to sanity check their presence + 'base', + 'datasets', + 'graphics', + 'grDevices', + 'grid', + 'methods', + 'splines', + 'stats', + 'stats4', + 'tools', + 'utils', + # non-standard libraries, should be specified with fixed versions! + ('irace', '1.03', ext_options), + ('rJava', '0.9-4', ext_options), + ('lattice', '0.20-15', ext_options), + ('RColorBrewer', '1.0-5', ext_options), + ('latticeExtra', '0.6-24', ext_options), + ('Matrix', '1.0-12', ext_options), + ('png', '0.1-4', ext_options), + ('Rcpp', '0.10.3', ext_options), + ('quadprog', '1.5-5', ext_options), + ('BB', '2013.4-1', ext_options), + ('rlecuyer', '0.3-3', ext_options), + ('snow', '0.3-12', ext_options), + ('MASS', '7.3-23', ext_options), + ('class', '7.3-5', ext_options), + ('e1071', '1.6-1', ext_options), + ('nnet', '7.3-6', ext_options), + ('car', '2.0-17', ext_options), + ('colorspace', '1.2-2', ext_options), + ('robustbase', '0.9-7', ext_options), + ('sp', '0.9-91', ext_options), + ('vcd', '1.2-13', ext_options), + ('snowfall', '1.84-4', ext_options), + ('logistf', '1.10', ext_options), + ('akima', '0.5-10', ext_options), + ('bitops', '1.0-5', ext_options), + ('boot', '1.3-7', ext_options), + ('cluster', '1.14.4', ext_options), + ('coda', '0.16-1', ext_options), + ('codetools', '0.2-8', ext_options), + ('DBI', '0.2-7', ext_options), + ('foreign', '0.8-54', ext_options), + ('survival', '2.37-4', ext_options), + ('gam', '1.08', ext_options), + ('gamlss.data', '4.2-0', ext_options), + ('gamlss.dist', '4.2-0', ext_options), + ('hwriter', '1.3', ext_options), + ('KernSmooth', '2.23-10', ext_options), + ('zoo', '1.7-9', ext_options), + ('lmtest', '0.9-31', ext_options), + ('mnormt', '1.4-5', ext_options), + ('mvtnorm', '0.9-9994', ext_options), + ('numDeriv', '2012.9-1', ext_options), + ('pscl', '1.04.4', ext_options), + ('rpart', '4.1-1', ext_options), + ('RSQLite', '0.11.3', ext_options), + ('sandwich', '2.2-10', ext_options), + ('sfsmisc', '1.0-23', ext_options), + ('spatial', '7.3-5', ext_options), + ('VGAM', '0.9-1', ext_options), + ('waveslim', '1.7.1', ext_options), + ('xtable', '1.7-1', ext_options), + ('profileModel', '0.5-8', ext_options), + ('brglm', '0.5-7', ext_options), + ('deSolve', '1.10-6', ext_options), + ('odesolve', '0.9-9', ext_options), + ('tseriesChaos', '0.1-11', ext_options), + ('tseries', '0.10-32', ext_options), + ('neuRosim', '0.2-10', ext_options), + ('fastICA', '1.1-16', ext_options), + ('R.methodsS3', '1.4.2', ext_options), + ('R.oo', '1.13.0', ext_options), + ('R.matlab', '1.7.0', ext_options), + ('Rniftilib', '0.0-32', ext_options), + ('BiocGenerics', '0.6.0', bioconductor_options), + ('Biobase', '2.20.0', bioconductor_options), + ('IRanges', '1.18.3', bioconductor_options), + ('AnnotationDbi', '1.22.6', bioconductor_options), + ('Biostrings', '2.28.0', bioconductor_options), + ('GenomicRanges', '1.12.5', bioconductor_options), + ('BSgenome', '1.28.0', bioconductor_options), + ('zlibbioc', '1.6.0', bioconductor_options), + ('Rsamtools', '1.12.4', bioconductor_options), + ('ShortRead', '1.18.0', bioconductor_options), + ('graph', '1.40.0', bioconductor_options), + ('igraph0', '0.5.7', ext_options), +] + +moduleclass = 'lang' -- GitLab From b1fd0b6326f6ca09d997a74b26c1dd9656a96b2f Mon Sep 17 00:00:00 2001 From: Thekla Date: Mon, 4 Nov 2013 09:57:36 +0200 Subject: [PATCH 178/811] A minor change to R-3.0.2-ictce-5.3.0-bare.eb --- easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb index 6ba1e02d1f..0729ff492e 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb @@ -12,7 +12,6 @@ source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s'] preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"' configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib" -# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below configopts += " --with-recommended-packages=no" dependencies = [ -- GitLab From ff9b4590c6a9b8c92b01adfac52df536e9156c52 Mon Sep 17 00:00:00 2001 From: Thekla Date: Mon, 4 Nov 2013 10:11:23 +0200 Subject: [PATCH 179/811] Contributng flex build with gmvapich2 --- .../f/flex/flex-2.5.35-gmvapich2-1.6.7.eb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb new file mode 100644 index 0000000000..5953113b27 --- /dev/null +++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb @@ -0,0 +1,14 @@ +name = 'flex' +version = '2.5.35' + +homepage = 'http://flex.sourceforge.net/' +description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, +sometimes called a tokenizer, is a program which recognizes lexical patterns in text.""" + +toolchain = {'name': 'gmvapich2', 'version': '1.6.7'} +toolchainopts = {'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +moduleclass = 'lang' -- GitLab From db7464e7923f89ad0af165c0276f52bacec5c439 Mon Sep 17 00:00:00 2001 From: Thekla Date: Mon, 4 Nov 2013 10:13:27 +0200 Subject: [PATCH 180/811] Contributng flex build with gmvapich2 --- easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb index 5953113b27..71dcbfbb0f 100644 --- a/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb +++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb @@ -3,7 +3,7 @@ version = '2.5.35' homepage = 'http://flex.sourceforge.net/' description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, -sometimes called a tokenizer, is a program which recognizes lexical patterns in text.""" +sometimes called a tokenizer, is a program which recognizes lexical patterns in text. """ toolchain = {'name': 'gmvapich2', 'version': '1.6.7'} toolchainopts = {'pic': True} -- GitLab From 9bc79b0828c49bc8fde8275c8a3d370fe006c571 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 4 Nov 2013 10:47:54 +0100 Subject: [PATCH 181/811] arpack-ng: reorded patches There are now 3 patches: one to bring arpack-ng to the current git HEAD (this is needed for the autotools update patch), one to update autotools (and fix all MPI issues) and one to update pkg-config.in file --- .../arpack-ng-3.1.3-configure-mpi.patch | 1 + .../arpack-ng-3.1.3-ictce-5.5.0-mt.eb | 6 +- .../arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb | 4 +- .../arpack-ng/arpack-ng-3.1.3-pkgconfig.patch | 69 +- .../arpack-ng-3.1.3-update-to-head.patch | 11422 ++++++++++++++++ 5 files changed, 11497 insertions(+), 5 deletions(-) create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-update-to-head.patch diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch index 435371619a..ba4143f262 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch @@ -3849,6 +3849,7 @@ index 28055d2..cdea514 100755 -- 1.8.3.1 + From aa5cc620ecc4eb512332b1399d2bbff52e5c5515 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Oct 2013 11:13:33 +0200 diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb index aff13825b1..575c77a9c3 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb @@ -11,7 +11,11 @@ toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': False} source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['arpack-ng-3.1.3-pkgconfig.patch'] +# do not change the order of the patches or things will break +patches = [ + 'arpack-ng-3.1.3-update-to-head.patch', + 'arpack-ng-3.1.3-pkgconfig.patch', +] configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"' diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb index 0c7326c6b3..f81c910467 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb @@ -10,9 +10,11 @@ toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True} source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] sources = [SOURCELOWER_TAR_GZ] +# do not change the order of the patches or things will break patches = [ - 'arpack-ng-3.1.3-configure-mpi.patch', + 'arpack-ng-3.1.3-update-to-head.patch', 'arpack-ng-3.1.3-pkgconfig.patch', + 'arpack-ng-3.1.3-configure-mpi.patch', ] configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch index eca7e51f1e..bd3aaa6c8e 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-pkgconfig.patch @@ -1,9 +1,72 @@ ---- arpack.pc.in.orig 2013-10-07 13:25:45.614476724 +0200 -+++ arpack.pc.in 2013-10-07 13:25:36.213517908 +0200 -@@ -5,5 +5,5 @@ +From c124f0c2fc47c882391160baa895161fc6356180 Mon Sep 17 00:00:00 2001 +From: Ward Poelmans +Date: Mon, 7 Oct 2013 13:32:08 +0200 +Subject: [PATCH 1/2] Use configure supplied blas and lapack in the pkg-config + +Use the blas and lapack library found by the configure script in the +pkg-config file instead of hardcoded libraries. +--- + arpack.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arpack.pc.in b/arpack.pc.in +index 83739bd..55d2e01 100644 +--- a/arpack.pc.in ++++ b/arpack.pc.in +@@ -5,5 +5,5 @@ libdir=@libdir@ Name: arpack Description: ARPACK-NG Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -larpack -lblas -latlas +Libs: -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@ Cflags: +-- +1.8.3.1 + + +From 29d8cbe63ffea965d46caad7773fe6dd61960dc7 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Mon, 7 Oct 2013 14:25:51 +0200 +Subject: [PATCH 2/2] Update of the release notes + +--- + CHANGES | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 996a54b..39bb865 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,4 +1,9 @@ +-arpack-ng - 3.1.5 ++arpack-ng - 3.1.4 ++ ++ * libparpack2: missing dependency on MPI: ++ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718790 ++ ++ * Replace LAPACK second function with ARPACK's own arscnd in PARPACK + + * Fix issue #1259 in DSEUPD and SSEUPD + The Ritz vector purification step assumes workl(iq) still contains the +@@ -10,15 +15,10 @@ arpack-ng - 3.1.5 + space WORKL(IW+NCV:IW+2*NCV) is not used later in the routine, and can + be used for this. + +- -- Sylvestre Ledru Thu, 29 Aug 2013 10:53:03 +0200 +- +-arpack-ng - 3.1.4 +- +- * libparpack2: missing dependency on MPI: +- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718790 +- * Replace LAPACK second function with ARPACK's own arscnd in PARPACK ++ * Use configure supplied blas and lapack in the pkg-config. ++ Thanks to Ward Poelmans (Closes: #1320) + +- -- Sylvestre Ledru Tue, 06 Aug 2013 15:15:55 +0200 ++ -- Sylvestre Ledru Mon, 07 Oct 2013 14:24:42 +0200 + + arpack-ng - 3.1.3 + +-- +1.8.3.1 + diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-update-to-head.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-update-to-head.patch new file mode 100644 index 0000000000..97e3f7b48c --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-update-to-head.patch @@ -0,0 +1,11422 @@ +# this patch updates arpack-ng to the git HEAD of 01/11/2013 +# needed for the other patches +From 8b60cd295ca5ba89096fb01c34dfb6229cf36b55 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jordi=20Guti=C3=A9rrez=20Hermoso?= +Date: Mon, 17 Jun 2013 12:59:19 -0400 +Subject: [PATCH 1/6] Replace LAPACK second function with ARPACK's own arscnd + in PARPACK + +--- + PARPACK/SRC/BLACS/pcgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/BLACS/pcnaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/BLACS/pcnapps.f | 8 ++++---- + PARPACK/SRC/BLACS/pcnaup2.f | 12 ++++++------ + PARPACK/SRC/BLACS/pcnaupd.f | 8 ++++---- + PARPACK/SRC/BLACS/pcneigh.f | 8 ++++---- + PARPACK/SRC/BLACS/pcngets.f | 8 ++++---- + PARPACK/SRC/BLACS/pdgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/BLACS/pdnaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/BLACS/pdnapps.f | 6 +++--- + PARPACK/SRC/BLACS/pdnaup2.f | 12 ++++++------ + PARPACK/SRC/BLACS/pdnaupd.f | 8 ++++---- + PARPACK/SRC/BLACS/pdneigh.f | 8 ++++---- + PARPACK/SRC/BLACS/pdngets.f | 6 +++--- + PARPACK/SRC/BLACS/pdsaitr.f | 28 ++++++++++++++-------------- + PARPACK/SRC/BLACS/pdsapps.f | 8 ++++---- + PARPACK/SRC/BLACS/pdsaup2.f | 12 ++++++------ + PARPACK/SRC/BLACS/pdsaupd.f | 8 ++++---- + PARPACK/SRC/BLACS/pdseigt.f | 8 ++++---- + PARPACK/SRC/BLACS/pdsgets.f | 8 ++++---- + PARPACK/SRC/BLACS/psgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/BLACS/psnaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/BLACS/psnapps.f | 6 +++--- + PARPACK/SRC/BLACS/psnaup2.f | 12 ++++++------ + PARPACK/SRC/BLACS/psnaupd.f | 8 ++++---- + PARPACK/SRC/BLACS/psneigh.f | 8 ++++---- + PARPACK/SRC/BLACS/psngets.f | 6 +++--- + PARPACK/SRC/BLACS/pssaitr.f | 28 ++++++++++++++-------------- + PARPACK/SRC/BLACS/pssapps.f | 8 ++++---- + PARPACK/SRC/BLACS/pssaup2.f | 12 ++++++------ + PARPACK/SRC/BLACS/pssaupd.f | 8 ++++---- + PARPACK/SRC/BLACS/psseigt.f | 8 ++++---- + PARPACK/SRC/BLACS/pssgets.f | 8 ++++---- + PARPACK/SRC/BLACS/pzgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/BLACS/pznaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/BLACS/pznapps.f | 8 ++++---- + PARPACK/SRC/BLACS/pznaup2.f | 12 ++++++------ + PARPACK/SRC/BLACS/pznaupd.f | 8 ++++---- + PARPACK/SRC/BLACS/pzneigh.f | 8 ++++---- + PARPACK/SRC/BLACS/pzngets.f | 8 ++++---- + PARPACK/SRC/MPI/pcgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/MPI/pcnaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/MPI/pcnapps.f | 8 ++++---- + PARPACK/SRC/MPI/pcnaup2.f | 12 ++++++------ + PARPACK/SRC/MPI/pcnaupd.f | 8 ++++---- + PARPACK/SRC/MPI/pcneigh.f | 8 ++++---- + PARPACK/SRC/MPI/pcngets.f | 8 ++++---- + PARPACK/SRC/MPI/pdgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/MPI/pdnaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/MPI/pdnapps.f | 6 +++--- + PARPACK/SRC/MPI/pdnaup2.f | 12 ++++++------ + PARPACK/SRC/MPI/pdnaupd.f | 8 ++++---- + PARPACK/SRC/MPI/pdneigh.f | 8 ++++---- + PARPACK/SRC/MPI/pdngets.f | 6 +++--- + PARPACK/SRC/MPI/pdsaitr.f | 28 ++++++++++++++-------------- + PARPACK/SRC/MPI/pdsapps.f | 8 ++++---- + PARPACK/SRC/MPI/pdsaup2.f | 12 ++++++------ + PARPACK/SRC/MPI/pdsaupd.f | 8 ++++---- + PARPACK/SRC/MPI/pdseigt.f | 8 ++++---- + PARPACK/SRC/MPI/pdsgets.f | 8 ++++---- + PARPACK/SRC/MPI/psgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/MPI/psnaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/MPI/psnapps.f | 6 +++--- + PARPACK/SRC/MPI/psnaup2.f | 12 ++++++------ + PARPACK/SRC/MPI/psnaupd.f | 8 ++++---- + PARPACK/SRC/MPI/psneigh.f | 8 ++++---- + PARPACK/SRC/MPI/psngets.f | 6 +++--- + PARPACK/SRC/MPI/pssaitr.f | 28 ++++++++++++++-------------- + PARPACK/SRC/MPI/pssapps.f | 8 ++++---- + PARPACK/SRC/MPI/pssaup2.f | 12 ++++++------ + PARPACK/SRC/MPI/pssaupd.f | 8 ++++---- + PARPACK/SRC/MPI/psseigt.f | 8 ++++---- + PARPACK/SRC/MPI/pssgets.f | 8 ++++---- + PARPACK/SRC/MPI/pzgetv0.f | 20 ++++++++++---------- + PARPACK/SRC/MPI/pznaitr.f | 30 +++++++++++++++--------------- + PARPACK/SRC/MPI/pznapps.f | 8 ++++---- + PARPACK/SRC/MPI/pznaup2.f | 12 ++++++------ + PARPACK/SRC/MPI/pznaupd.f | 8 ++++---- + PARPACK/SRC/MPI/pzneigh.f | 8 ++++---- + PARPACK/SRC/MPI/pzngets.f | 8 ++++---- + 80 files changed, 512 insertions(+), 512 deletions(-) + +diff --git a/PARPACK/SRC/BLACS/pcgetv0.f b/PARPACK/SRC/BLACS/pcgetv0.f +index 2c6fbda..4f3f133 100644 +--- a/PARPACK/SRC/BLACS/pcgetv0.f ++++ b/PARPACK/SRC/BLACS/pcgetv0.f +@@ -95,7 +95,7 @@ c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), + c pp 357-385. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcvout Parallel ARPACK utility routine that prints vectors. + c pclarnv Parallel wrapper for LAPACK routine clarnv (generates a random vector). + c cgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -188,7 +188,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external ccopy, cgemv, pclarnv, pcvout, second ++ external ccopy, cgemv, pclarnv, pcvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -255,7 +255,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -282,7 +282,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -305,7 +305,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -313,7 +313,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -329,7 +329,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -374,7 +374,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(n+1), 1) +@@ -389,7 +389,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -449,7 +449,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pcnaitr.f b/PARPACK/SRC/BLACS/pcnaitr.f +index c43a4be..cb3fffb 100644 +--- a/PARPACK/SRC/BLACS/pcnaitr.f ++++ b/PARPACK/SRC/BLACS/pcnaitr.f +@@ -137,7 +137,7 @@ c + c\Routines called: + c pcgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c clanhs LAPACK routine that computes various norms of a matrix. +@@ -296,7 +296,7 @@ c | External Subroutines | + c %----------------------% + c + external caxpy, ccopy, cscal, cgemv, pcgetv0, slabad, +- & csscal, pcvout, pcmout, pivout, second ++ & csscal, pcvout, pcmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -349,7 +349,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcaitr + c + c %------------------------------% +@@ -460,7 +460,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -500,7 +500,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call ccopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -520,7 +520,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -536,7 +536,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -561,7 +561,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -608,11 +608,11 @@ c + c + if (j .gt. 1) h(j,j-1) = cmplx(betaj, rzero) + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(irj), 1) +@@ -636,7 +636,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -716,7 +716,7 @@ c + call caxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(irj), 1) +@@ -740,7 +740,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -819,7 +819,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -828,7 +828,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/BLACS/pcnapps.f b/PARPACK/SRC/BLACS/pcnapps.f +index f471d51..59357a5 100644 +--- a/PARPACK/SRC/BLACS/pcnapps.f ++++ b/PARPACK/SRC/BLACS/pcnapps.f +@@ -96,7 +96,7 @@ c pp 357-385. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c clacpy LAPACK matrix copy routine. +@@ -200,7 +200,7 @@ c | External Subroutines | + c %----------------------% + c + external caxpy, ccopy, cgemv, cscal, clacpy, clartg, +- & pcvout, claset, slabad, pcmout, second, pivout ++ & pcvout, claset, slabad, pcmout, arscnd, pivout + c + c %--------------------% + c | External Functions | +@@ -256,7 +256,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcapps + c + kplusp = kev + np +@@ -511,7 +511,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tcapps = tcapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/BLACS/pcnaup2.f b/PARPACK/SRC/BLACS/pcnaup2.f +index b954ab9..5d8a329 100644 +--- a/PARPACK/SRC/BLACS/pcnaup2.f ++++ b/PARPACK/SRC/BLACS/pcnaup2.f +@@ -137,7 +137,7 @@ c pcneigh Parallel ARPACK compute Ritz values and error bounds routine. + c pcngets Parallel ARPACK reorder Ritz values and error bounds routine. + c csortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c psvout ARPACK utility routine that prints vectors. +@@ -247,7 +247,7 @@ c | External Subroutines | + c %----------------------% + c + external ccopy, pcgetv0, pcnaitr, pcneigh, pcngets, pcnapps, +- & csortc, cswap, pcmout, pcvout, pivout, second ++ & csortc, cswap, pcmout, pcvout, pivout, arscnd + c + c %--------------------% + c | External functions | +@@ -271,7 +271,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mcaup2 + c +@@ -737,7 +737,7 @@ c | the first step of the next call to pcnaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(n+1), 1) +@@ -762,7 +762,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -802,7 +802,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tcaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pcnaupd.f b/PARPACK/SRC/BLACS/pcnaupd.f +index c380638..bde6cfe 100644 +--- a/PARPACK/SRC/BLACS/pcnaupd.f ++++ b/PARPACK/SRC/BLACS/pcnaupd.f +@@ -359,7 +359,7 @@ c Arnoldi Iteration. + c cstatn ARPACK routine that initializes the timing variables. + c pivout Parallel ARPACK utility routine that prints integers. + c pcvout Parallel ARPACK utility routine that prints vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pslamch ScaLAPACK routine that determines machine constants. + c + c\Author +@@ -446,7 +446,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pcnaup2, pcvout, pivout, second, cstatn ++ external pcnaup2, pcvout, pivout, arscnd, cstatn + c + c %--------------------% + c | External Functions | +@@ -468,7 +468,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call cstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mcaupd + c + c %----------------% +@@ -628,7 +628,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tcaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pcneigh.f b/PARPACK/SRC/BLACS/pcneigh.f +index 97c07bf..9b663fc 100644 +--- a/PARPACK/SRC/BLACS/pcneigh.f ++++ b/PARPACK/SRC/BLACS/pcneigh.f +@@ -68,7 +68,7 @@ c xxxxxx Complex + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c psvout Parallel ARPACK utility routine that prints vectors. +@@ -168,7 +168,7 @@ c | External Subroutines | + c %----------------------% + c + external clacpy, clahqr, csscal, ctrevc, ccopy, +- & pcmout, pcvout, second ++ & pcmout, pcvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -188,7 +188,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mceigh + c + if (msglvl .gt. 2) then +@@ -261,7 +261,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second(t1) ++ call arscnd(t1) + tceigh = tceigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pcngets.f b/PARPACK/SRC/BLACS/pcngets.f +index 2dc5b92..57401d8 100644 +--- a/PARPACK/SRC/BLACS/pcngets.f ++++ b/PARPACK/SRC/BLACS/pcngets.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c csortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcvout Parallel ARPACK utility routine that prints vectors. + c + c\Author +@@ -142,7 +142,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pcvout, csortc, second ++ external pcvout, csortc, arscnd + c + c %-----------------------% + c | Executable Statements | +@@ -153,7 +153,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcgets + c + call csortc (which, .true., kev+np, ritz, bounds) +@@ -173,7 +173,7 @@ c + c + end if + c +- call second (t1) ++ call arscnd (t1) + tcgets = tcgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pdgetv0.f b/PARPACK/SRC/BLACS/pdgetv0.f +index 52e3a18..38f1f43 100644 +--- a/PARPACK/SRC/BLACS/pdgetv0.f ++++ b/PARPACK/SRC/BLACS/pdgetv0.f +@@ -99,7 +99,7 @@ c Restarted Arnoldi Iteration", Rice University Technical Report + c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine for vector output. + c pdlarnv Parallel wrapper for LAPACK routine dlarnv (generates a random vector). + c dgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -187,7 +187,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pdlarnv, pdvout, dcopy, dgemv, second ++ external pdlarnv, pdvout, dcopy, dgemv, arscnd + c + c %--------------------% + c | External Functions | +@@ -234,7 +234,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -261,7 +261,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -284,7 +284,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -292,7 +292,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -308,7 +308,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -353,7 +353,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(n+1), 1) +@@ -368,7 +368,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -427,7 +427,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pdnaitr.f b/PARPACK/SRC/BLACS/pdnaitr.f +index 201e795..1e64acc 100644 +--- a/PARPACK/SRC/BLACS/pdnaitr.f ++++ b/PARPACK/SRC/BLACS/pdnaitr.f +@@ -138,7 +138,7 @@ c + c\Routines called: + c pdgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdmout Parallel ARPACK utility routine that prints matrices + c pdvout Parallel ARPACK utility routine that prints vectors. + c dlabad LAPACK routine that computes machine constants. +@@ -287,7 +287,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dgemv, pdgetv0, dlabad, +- & pdvout, pdmout, pivout, second ++ & pdvout, pdmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -338,7 +338,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnaitr + c + c %------------------------------% +@@ -449,7 +449,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -489,7 +489,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call dcopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -509,7 +509,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -525,7 +525,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -550,7 +550,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -597,11 +597,11 @@ c + c + if (j .gt. 1) h(j,j-1) = betaj + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -625,7 +625,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -704,7 +704,7 @@ c + call daxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -728,7 +728,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -807,7 +807,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -816,7 +816,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/BLACS/pdnapps.f b/PARPACK/SRC/BLACS/pdnapps.f +index b9c5d98..027b880 100644 +--- a/PARPACK/SRC/BLACS/pdnapps.f ++++ b/PARPACK/SRC/BLACS/pdnapps.f +@@ -198,7 +198,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dlacpy, dlarf, dlarfg, dlartg, +- & dlaset, dlabad, second, pivout, pdvout, pdmout ++ & dlaset, dlabad, arscnd, pivout, pdvout, pdmout + c + c %--------------------% + c | External Functions | +@@ -246,7 +246,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnapps + c + kplusp = kev + np +@@ -645,7 +645,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tnapps = tnapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/BLACS/pdnaup2.f b/PARPACK/SRC/BLACS/pdnaup2.f +index bd32780..79fed34 100644 +--- a/PARPACK/SRC/BLACS/pdnaup2.f ++++ b/PARPACK/SRC/BLACS/pdnaup2.f +@@ -145,7 +145,7 @@ c pdneigh Parallel ARPACK compute Ritz values and error bounds routine. + c pdngets Parallel ARPACK reorder Ritz values and error bounds routine. + c dsortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdmout Parallel ARPACK utility routine that prints matrices + c pdvout ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. +@@ -252,7 +252,7 @@ c %----------------------% + c + external dcopy , pdgetv0 , pdnaitr , dnconv , + & pdneigh , pdngets , pdnapps , +- & pdvout , pivout, second ++ & pdvout , pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -274,7 +274,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mnaup2 + c +@@ -776,7 +776,7 @@ c | the first step of the next call to pdnaitr . | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(n+1), 1) +@@ -801,7 +801,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -841,7 +841,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tnaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pdnaupd.f b/PARPACK/SRC/BLACS/pdnaupd.f +index a0b3a77..3ec46b5 100644 +--- a/PARPACK/SRC/BLACS/pdnaupd.f ++++ b/PARPACK/SRC/BLACS/pdnaupd.f +@@ -382,7 +382,7 @@ c\Routines called: + c pdnaup2 Parallel ARPACK routine that implements the Implicitly Restarted + c Arnoldi Iteration. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c +@@ -468,7 +468,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pdnaup2 , pdvout , pivout, second, dstatn ++ external pdnaup2 , pdvout , pivout, arscnd, dstatn + c + c %--------------------% + c | External Functions | +@@ -490,7 +490,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call dstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mnaupd + c + c %----------------% +@@ -654,7 +654,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tnaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pdneigh.f b/PARPACK/SRC/BLACS/pdneigh.f +index c318081..6f7dabc 100644 +--- a/PARPACK/SRC/BLACS/pdneigh.f ++++ b/PARPACK/SRC/BLACS/pdneigh.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c dlaqrb ARPACK routine to compute the real Schur form of an + c upper Hessenberg matrix and last row of the Schur vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c dmout ARPACK utility routine that prints matrices + c dvout ARPACK utility routine that prints vectors. + c dlacpy LAPACK matrix copy routine. +@@ -157,7 +157,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dcopy, dlacpy, dlaqrb, dtrevc, pdvout, second ++ external dcopy, dlacpy, dlaqrb, dtrevc, pdvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -183,7 +183,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mneigh + c + if (msglvl .gt. 2) then +@@ -314,7 +314,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second (t1) ++ call arscnd (t1) + tneigh = tneigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pdngets.f b/PARPACK/SRC/BLACS/pdngets.f +index 6b34653..99b1b26 100644 +--- a/PARPACK/SRC/BLACS/pdngets.f ++++ b/PARPACK/SRC/BLACS/pdngets.f +@@ -149,7 +149,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dcopy, dsortc, second ++ external dcopy, dsortc, arscnd + c + c %----------------------% + c | Intrinsics Functions | +@@ -166,7 +166,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mngets + c + c %----------------------------------------------------% +@@ -222,7 +222,7 @@ c + call dsortc ( 'SR', .true., np, bounds, ritzr, ritzi ) + end if + c +- call second (t1) ++ call arscnd (t1) + tngets = tngets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pdsaitr.f b/PARPACK/SRC/BLACS/pdsaitr.f +index 4df9462..8e1b8a3 100644 +--- a/PARPACK/SRC/BLACS/pdsaitr.f ++++ b/PARPACK/SRC/BLACS/pdsaitr.f +@@ -280,7 +280,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dgemv, pdgetv0, pdvout, pdmout, +- & dlascl, pivout, second ++ & dlascl, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -325,7 +325,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaitr + c + c %------------------------------% +@@ -445,7 +445,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -485,7 +485,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call dcopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -504,7 +504,7 @@ c | Back from reverse communication; | + c | WORKD(IRJ:IRJ+N-1) := OP*v_{j}. | + c %-----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + step3 = .false. +@@ -525,7 +525,7 @@ c | assumed to have A*v_{j}. | + c %-------------------------------------------% + c + if (mode .eq. 2) go to 65 +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -549,7 +549,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j}. | + c %-----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -621,12 +621,12 @@ c + else + h(j,1) = rnorm + end if +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + iter = 0 + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -650,7 +650,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -726,7 +726,7 @@ c + h(j,2) = h(j,2) + workl(j) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -750,7 +750,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -823,7 +823,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %----------------------------------------------------------% +@@ -847,7 +847,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + c +diff --git a/PARPACK/SRC/BLACS/pdsapps.f b/PARPACK/SRC/BLACS/pdsapps.f +index eecd09b..72252c2 100644 +--- a/PARPACK/SRC/BLACS/pdsapps.f ++++ b/PARPACK/SRC/BLACS/pdsapps.f +@@ -93,7 +93,7 @@ c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c dlartg LAPACK Givens rotation construction routine. +@@ -187,7 +187,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dlacpy, dlartg, dlaset, pdvout, +- & pivout, second, dgemv ++ & pivout, arscnd, dgemv + c + c %--------------------% + c | External Functions | +@@ -224,7 +224,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msapps + c + kplusp = kev + np +@@ -514,7 +514,7 @@ c + end if + end if + c +- call second (t1) ++ call arscnd (t1) + tsapps = tsapps + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pdsaup2.f b/PARPACK/SRC/BLACS/pdsaup2.f +index e71372b..d629c1d 100644 +--- a/PARPACK/SRC/BLACS/pdsaup2.f ++++ b/PARPACK/SRC/BLACS/pdsaup2.f +@@ -153,7 +153,7 @@ c sstrqb ARPACK routine that computes all eigenvalues and the + c last component of the eigenvectors of a symmetric + c tridiagonal matrix using the implicit QL or QR method. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c dcopy Level 1 BLAS that copies one vector to another. +@@ -253,7 +253,7 @@ c %----------------------% + c + external dcopy, pdgetv0, pdsaitr, dscal, dsconv, + & pdseigt, pdsgets, pdsapps, +- & dsortr, pdvout, pivout, second ++ & dsortr, pdvout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -280,7 +280,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaup2 + c + c %---------------------------------% +@@ -791,7 +791,7 @@ c | the first step of the next call to pdsaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(n+1), 1) +@@ -816,7 +816,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -859,7 +859,7 @@ c %------------% + c | Error exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tsaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pdsaupd.f b/PARPACK/SRC/BLACS/pdsaupd.f +index d1df427..fa42ae1 100644 +--- a/PARPACK/SRC/BLACS/pdsaupd.f ++++ b/PARPACK/SRC/BLACS/pdsaupd.f +@@ -384,7 +384,7 @@ c Arnoldi Iteration. + c dstats ARPACK routine that initializes timing and other statistics + c variables. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c +@@ -472,7 +472,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pdsaup2 , pdvout , pivout, second, dstats ++ external pdsaup2 , pdvout , pivout, arscnd, dstats + c + c %--------------------% + c | External Functions | +@@ -494,7 +494,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call dstats +- call second (t0) ++ call arscnd (t0) + msglvl = msaupd + c + ierr = 0 +@@ -654,7 +654,7 @@ c + & '_saupd: corresponding error bounds') + end if + c +- call second (t1) ++ call arscnd (t1) + tsaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pdseigt.f b/PARPACK/SRC/BLACS/pdseigt.f +index b5a5874..4535f9c 100644 +--- a/PARPACK/SRC/BLACS/pdseigt.f ++++ b/PARPACK/SRC/BLACS/pdseigt.f +@@ -63,7 +63,7 @@ c\Routines called: + c dstqrb ARPACK routine that computes the eigenvalues and the + c last components of the eigenvectors of a symmetric + c and tridiagonal matrix. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c dcopy Level 1 BLAS that copies one vector to another. + c dscal Level 1 BLAS that scales a vector. +@@ -141,7 +141,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dcopy, dstqrb, pdvout, second ++ external dcopy, dstqrb, pdvout, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -158,7 +158,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mseigt + c + if (msglvl .gt. 0) then +@@ -190,7 +190,7 @@ c + bounds(k) = rnorm*abs(bounds(k)) + 30 continue + c +- call second (t1) ++ call arscnd (t1) + tseigt = tseigt + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pdsgets.f b/PARPACK/SRC/BLACS/pdsgets.f +index 875bc8f..99af7bd 100644 +--- a/PARPACK/SRC/BLACS/pdsgets.f ++++ b/PARPACK/SRC/BLACS/pdsgets.f +@@ -69,7 +69,7 @@ c + c\Routines called: + c dsortr ARPACK utility sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c dcopy Level 1 BLAS that copies one vector to another. + c dswap Level 1 BLAS that swaps the contents of two vectors. +@@ -145,7 +145,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dswap, dcopy, dsortr, second ++ external dswap, dcopy, dsortr, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -162,7 +162,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msgets + c + if (which .eq. 'BE') then +@@ -212,7 +212,7 @@ c + call dcopy (np, ritz, 1, shifts, 1) + end if + c +- call second (t1) ++ call arscnd (t1) + tsgets = tsgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/psgetv0.f b/PARPACK/SRC/BLACS/psgetv0.f +index c35c52a..17eb747 100644 +--- a/PARPACK/SRC/BLACS/psgetv0.f ++++ b/PARPACK/SRC/BLACS/psgetv0.f +@@ -99,7 +99,7 @@ c Restarted Arnoldi Iteration", Rice University Technical Report + c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine for vector output. + c pslarnv Parallel wrapper for LAPACK routine slarnv (generates a random vector). + c sgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -187,7 +187,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pslarnv, psvout, scopy, sgemv, second ++ external pslarnv, psvout, scopy, sgemv, arscnd + c + c %--------------------% + c | External Functions | +@@ -234,7 +234,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -261,7 +261,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -284,7 +284,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -292,7 +292,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -308,7 +308,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -353,7 +353,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(n+1), 1) +@@ -368,7 +368,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -427,7 +427,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/psnaitr.f b/PARPACK/SRC/BLACS/psnaitr.f +index 5f26264..fff1ecb 100644 +--- a/PARPACK/SRC/BLACS/psnaitr.f ++++ b/PARPACK/SRC/BLACS/psnaitr.f +@@ -138,7 +138,7 @@ c + c\Routines called: + c psgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psmout Parallel ARPACK utility routine that prints matrices + c psvout Parallel ARPACK utility routine that prints vectors. + c slabad LAPACK routine that computes machine constants. +@@ -287,7 +287,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, sgemv, psgetv0, slabad, +- & psvout, psmout, pivout, second ++ & psvout, psmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -338,7 +338,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnaitr + c + c %------------------------------% +@@ -449,7 +449,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -489,7 +489,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call scopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -509,7 +509,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -525,7 +525,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -550,7 +550,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -597,11 +597,11 @@ c + c + if (j .gt. 1) h(j,j-1) = betaj + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -625,7 +625,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -704,7 +704,7 @@ c + call saxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -728,7 +728,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -807,7 +807,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -816,7 +816,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/BLACS/psnapps.f b/PARPACK/SRC/BLACS/psnapps.f +index 9b6f73d..7336ea3 100644 +--- a/PARPACK/SRC/BLACS/psnapps.f ++++ b/PARPACK/SRC/BLACS/psnapps.f +@@ -198,7 +198,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, slacpy, slarf, slarfg, slartg, +- & slaset, slabad, second, pivout, psvout, psmout ++ & slaset, slabad, arscnd, pivout, psvout, psmout + c + c %--------------------% + c | External Functions | +@@ -246,7 +246,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnapps + c + kplusp = kev + np +@@ -645,7 +645,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tnapps = tnapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/BLACS/psnaup2.f b/PARPACK/SRC/BLACS/psnaup2.f +index e5df557..6797b28 100644 +--- a/PARPACK/SRC/BLACS/psnaup2.f ++++ b/PARPACK/SRC/BLACS/psnaup2.f +@@ -145,7 +145,7 @@ c psneigh Parallel ARPACK compute Ritz values and error bounds routine. + c psngets Parallel ARPACK reorder Ritz values and error bounds routine. + c ssortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psmout Parallel ARPACK utility routine that prints matrices + c psvout ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. +@@ -252,7 +252,7 @@ c %----------------------% + c + external scopy, psgetv0, psnaitr, snconv, + & psneigh, psngets, psnapps, +- & psvout, pivout, second ++ & psvout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -274,7 +274,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mnaup2 + c +@@ -776,7 +776,7 @@ c | the first step of the next call to psnaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(n+1), 1) +@@ -801,7 +801,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -841,7 +841,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tnaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/psnaupd.f b/PARPACK/SRC/BLACS/psnaupd.f +index 8cb7ec6..f6f0cfc 100644 +--- a/PARPACK/SRC/BLACS/psnaupd.f ++++ b/PARPACK/SRC/BLACS/psnaupd.f +@@ -382,7 +382,7 @@ c\Routines called: + c psnaup2 Parallel ARPACK routine that implements the Implicitly Restarted + c Arnoldi Iteration. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c +@@ -468,7 +468,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external psnaup2, psvout, pivout, second, sstatn ++ external psnaup2, psvout, pivout, arscnd, sstatn + c + c %--------------------% + c | External Functions | +@@ -490,7 +490,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call sstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mnaupd + c + c %----------------% +@@ -654,7 +654,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tnaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/psneigh.f b/PARPACK/SRC/BLACS/psneigh.f +index be64de3..bc69218 100644 +--- a/PARPACK/SRC/BLACS/psneigh.f ++++ b/PARPACK/SRC/BLACS/psneigh.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c slaqrb ARPACK routine to compute the real Schur form of an + c upper Hessenberg matrix and last row of the Schur vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c smout ARPACK utility routine that prints matrices + c svout ARPACK utility routine that prints vectors. + c slacpy LAPACK matrix copy routine. +@@ -157,7 +157,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external scopy, slacpy, slaqrb, strevc, psvout, second ++ external scopy, slacpy, slaqrb, strevc, psvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -183,7 +183,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mneigh + c + if (msglvl .gt. 2) then +@@ -314,7 +314,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second (t1) ++ call arscnd (t1) + tneigh = tneigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/psngets.f b/PARPACK/SRC/BLACS/psngets.f +index 2ec2dd6..686be3a 100644 +--- a/PARPACK/SRC/BLACS/psngets.f ++++ b/PARPACK/SRC/BLACS/psngets.f +@@ -149,7 +149,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external scopy, ssortc, second ++ external scopy, ssortc, arscnd + c + c %----------------------% + c | Intrinsics Functions | +@@ -166,7 +166,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mngets + c + c %----------------------------------------------------% +@@ -222,7 +222,7 @@ c + call ssortc ( 'SR', .true., np, bounds, ritzr, ritzi ) + end if + c +- call second (t1) ++ call arscnd (t1) + tngets = tngets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pssaitr.f b/PARPACK/SRC/BLACS/pssaitr.f +index 9c2ca5c..62521a5 100644 +--- a/PARPACK/SRC/BLACS/pssaitr.f ++++ b/PARPACK/SRC/BLACS/pssaitr.f +@@ -280,7 +280,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, sgemv, psgetv0, psvout, psmout, +- & slascl, pivout, second ++ & slascl, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -325,7 +325,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaitr + c + c %------------------------------% +@@ -445,7 +445,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -485,7 +485,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call scopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -504,7 +504,7 @@ c | Back from reverse communication; | + c | WORKD(IRJ:IRJ+N-1) := OP*v_{j}. | + c %-----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + step3 = .false. +@@ -525,7 +525,7 @@ c | assumed to have A*v_{j}. | + c %-------------------------------------------% + c + if (mode .eq. 2) go to 65 +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -549,7 +549,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j}. | + c %-----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -621,12 +621,12 @@ c + else + h(j,1) = rnorm + end if +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + iter = 0 + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -650,7 +650,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -726,7 +726,7 @@ c + h(j,2) = h(j,2) + workl(j) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -750,7 +750,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -823,7 +823,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %----------------------------------------------------------% +@@ -847,7 +847,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + c +diff --git a/PARPACK/SRC/BLACS/pssapps.f b/PARPACK/SRC/BLACS/pssapps.f +index 778231e..481f7c2 100644 +--- a/PARPACK/SRC/BLACS/pssapps.f ++++ b/PARPACK/SRC/BLACS/pssapps.f +@@ -93,7 +93,7 @@ c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c slartg LAPACK Givens rotation construction routine. +@@ -187,7 +187,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, slacpy, slartg, slaset, psvout, +- & pivout, second, sgemv ++ & pivout, arscnd, sgemv + c + c %--------------------% + c | External Functions | +@@ -224,7 +224,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msapps + c + kplusp = kev + np +@@ -514,7 +514,7 @@ c + end if + end if + c +- call second (t1) ++ call arscnd (t1) + tsapps = tsapps + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pssaup2.f b/PARPACK/SRC/BLACS/pssaup2.f +index 50ef5a6..b35aa75 100644 +--- a/PARPACK/SRC/BLACS/pssaup2.f ++++ b/PARPACK/SRC/BLACS/pssaup2.f +@@ -153,7 +153,7 @@ c sstrqb ARPACK routine that computes all eigenvalues and the + c last component of the eigenvectors of a symmetric + c tridiagonal matrix using the implicit QL or QR method. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c scopy Level 1 BLAS that copies one vector to another. +@@ -253,7 +253,7 @@ c %----------------------% + c + external scopy, psgetv0, pssaitr, sscal, ssconv, + & psseigt, pssgets, pssapps, +- & ssortr, psvout, pivout, second ++ & ssortr, psvout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -280,7 +280,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaup2 + c + c %---------------------------------% +@@ -791,7 +791,7 @@ c | the first step of the next call to pssaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(n+1), 1) +@@ -816,7 +816,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -859,7 +859,7 @@ c %------------% + c | Error exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tsaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pssaupd.f b/PARPACK/SRC/BLACS/pssaupd.f +index 4c1694c..9586757 100644 +--- a/PARPACK/SRC/BLACS/pssaupd.f ++++ b/PARPACK/SRC/BLACS/pssaupd.f +@@ -384,7 +384,7 @@ c Arnoldi Iteration. + c sstats ARPACK routine that initializes timing and other statistics + c variables. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c +@@ -472,7 +472,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pssaup2, psvout, pivout, second, sstats ++ external pssaup2, psvout, pivout, arscnd, sstats + c + c %--------------------% + c | External Functions | +@@ -494,7 +494,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call sstats +- call second (t0) ++ call arscnd (t0) + msglvl = msaupd + c + ierr = 0 +@@ -654,7 +654,7 @@ c + & '_saupd: corresponding error bounds') + end if + c +- call second (t1) ++ call arscnd (t1) + tsaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/psseigt.f b/PARPACK/SRC/BLACS/psseigt.f +index 7b864da..d971f26 100644 +--- a/PARPACK/SRC/BLACS/psseigt.f ++++ b/PARPACK/SRC/BLACS/psseigt.f +@@ -63,7 +63,7 @@ c\Routines called: + c sstqrb ARPACK routine that computes the eigenvalues and the + c last components of the eigenvectors of a symmetric + c and tridiagonal matrix. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c scopy Level 1 BLAS that copies one vector to another. + c sscal Level 1 BLAS that scales a vector. +@@ -141,7 +141,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external scopy, sstqrb, psvout, second ++ external scopy, sstqrb, psvout, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -158,7 +158,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mseigt + c + if (msglvl .gt. 0) then +@@ -190,7 +190,7 @@ c + bounds(k) = rnorm*abs(bounds(k)) + 30 continue + c +- call second (t1) ++ call arscnd (t1) + tseigt = tseigt + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pssgets.f b/PARPACK/SRC/BLACS/pssgets.f +index bf28476..42c9542 100644 +--- a/PARPACK/SRC/BLACS/pssgets.f ++++ b/PARPACK/SRC/BLACS/pssgets.f +@@ -69,7 +69,7 @@ c + c\Routines called: + c ssortr ARPACK utility sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c scopy Level 1 BLAS that copies one vector to another. + c sswap Level 1 BLAS that swaps the contents of two vectors. +@@ -145,7 +145,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external sswap, scopy, ssortr, second ++ external sswap, scopy, ssortr, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -162,7 +162,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msgets + c + if (which .eq. 'BE') then +@@ -212,7 +212,7 @@ c + call scopy (np, ritz, 1, shifts, 1) + end if + c +- call second (t1) ++ call arscnd (t1) + tsgets = tsgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pzgetv0.f b/PARPACK/SRC/BLACS/pzgetv0.f +index 0459753..133003e 100644 +--- a/PARPACK/SRC/BLACS/pzgetv0.f ++++ b/PARPACK/SRC/BLACS/pzgetv0.f +@@ -95,7 +95,7 @@ c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), + c pp 357-385. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzvout Parallel ARPACK utility routine that prints vectors. + c pzlarnv Parallel wrapper for LAPACK routine zlarnv (generates a random vector). + c zgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -188,7 +188,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external zcopy , zgemv , pzlarnv , pzvout , second ++ external zcopy , zgemv , pzlarnv , pzvout , arscnd + c + c %--------------------% + c | External Functions | +@@ -255,7 +255,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -282,7 +282,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -305,7 +305,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -313,7 +313,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -329,7 +329,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -374,7 +374,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(n+1), 1) +@@ -389,7 +389,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -449,7 +449,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pznaitr.f b/PARPACK/SRC/BLACS/pznaitr.f +index a2c7736..f00efdf 100644 +--- a/PARPACK/SRC/BLACS/pznaitr.f ++++ b/PARPACK/SRC/BLACS/pznaitr.f +@@ -137,7 +137,7 @@ c + c\Routines called: + c pzgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c zlanhs LAPACK routine that computes various norms of a matrix. +@@ -296,7 +296,7 @@ c | External Subroutines | + c %----------------------% + c + external zaxpy, zcopy, zscal, zgemv, pzgetv0, dlabad, +- & zdscal, pzvout, pzmout, pivout, second ++ & zdscal, pzvout, pzmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -349,7 +349,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcaitr + c + c %------------------------------% +@@ -460,7 +460,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -500,7 +500,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call zcopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -520,7 +520,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -536,7 +536,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -561,7 +561,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -608,11 +608,11 @@ c + c + if (j .gt. 1) h(j,j-1) = dcmplx(betaj, rzero) + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(irj), 1) +@@ -636,7 +636,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -716,7 +716,7 @@ c + call zaxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(irj), 1) +@@ -740,7 +740,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -819,7 +819,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -828,7 +828,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/BLACS/pznapps.f b/PARPACK/SRC/BLACS/pznapps.f +index 66446f5..12a7630 100644 +--- a/PARPACK/SRC/BLACS/pznapps.f ++++ b/PARPACK/SRC/BLACS/pznapps.f +@@ -96,7 +96,7 @@ c pp 357-385. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c zlacpy LAPACK matrix copy routine. +@@ -200,7 +200,7 @@ c | External Subroutines | + c %----------------------% + c + external zaxpy, zcopy, zgemv, zscal, zlacpy, zlartg, +- & pzvout, zlaset, dlabad, pzmout, second, pivout ++ & pzvout, zlaset, dlabad, pzmout, arscnd, pivout + c + c %--------------------% + c | External Functions | +@@ -256,7 +256,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcapps + c + kplusp = kev + np +@@ -511,7 +511,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tcapps = tcapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/BLACS/pznaup2.f b/PARPACK/SRC/BLACS/pznaup2.f +index 812202b..cfe7576 100644 +--- a/PARPACK/SRC/BLACS/pznaup2.f ++++ b/PARPACK/SRC/BLACS/pznaup2.f +@@ -137,7 +137,7 @@ c pzneigh Parallel ARPACK compute Ritz values and error bounds routine. + c pzngets Parallel ARPACK reorder Ritz values and error bounds routine. + c zsortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c pdvout ARPACK utility routine that prints vectors. +@@ -247,7 +247,7 @@ c | External Subroutines | + c %----------------------% + c + external zcopy, pzgetv0, pznaitr, pzneigh, pzngets, pznapps, +- & zsortc, zswap, pzmout, pzvout, pivout, second ++ & zsortc, zswap, pzmout, pzvout, pivout, arscnd + c + c %--------------------% + c | External functions | +@@ -271,7 +271,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mcaup2 + c +@@ -737,7 +737,7 @@ c | the first step of the next call to pznaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(n+1), 1) +@@ -762,7 +762,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -802,7 +802,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tcaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pznaupd.f b/PARPACK/SRC/BLACS/pznaupd.f +index 5f981bb..97f042a 100644 +--- a/PARPACK/SRC/BLACS/pznaupd.f ++++ b/PARPACK/SRC/BLACS/pznaupd.f +@@ -359,7 +359,7 @@ c Arnoldi Iteration. + c zstatn ARPACK routine that initializes the timing variables. + c pivout Parallel ARPACK utility routine that prints integers. + c pzvout Parallel ARPACK utility routine that prints vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdlamch ScaLAPACK routine that determines machine constants. + c + c\Author +@@ -446,7 +446,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pznaup2 , pzvout , pivout, second, zstatn ++ external pznaup2 , pzvout , pivout, arscnd, zstatn + c + c %--------------------% + c | External Functions | +@@ -468,7 +468,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call zstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mcaupd + c + c %----------------% +@@ -628,7 +628,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tcaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/BLACS/pzneigh.f b/PARPACK/SRC/BLACS/pzneigh.f +index aa6aab7..715c4e1 100644 +--- a/PARPACK/SRC/BLACS/pzneigh.f ++++ b/PARPACK/SRC/BLACS/pzneigh.f +@@ -68,7 +68,7 @@ c xxxxxx Complex*16 + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c pdvout Parallel ARPACK utility routine that prints vectors. +@@ -168,7 +168,7 @@ c | External Subroutines | + c %----------------------% + c + external zlacpy, zlahqr, zdscal, ztrevc, zcopy, +- & pzmout, pzvout, second ++ & pzmout, pzvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -188,7 +188,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mceigh + c + if (msglvl .gt. 2) then +@@ -261,7 +261,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second(t1) ++ call arscnd(t1) + tceigh = tceigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/BLACS/pzngets.f b/PARPACK/SRC/BLACS/pzngets.f +index 4d07819..0d6e4fe 100644 +--- a/PARPACK/SRC/BLACS/pzngets.f ++++ b/PARPACK/SRC/BLACS/pzngets.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c zsortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzvout Parallel ARPACK utility routine that prints vectors. + c + c\Author +@@ -142,7 +142,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pzvout, zsortc, second ++ external pzvout, zsortc, arscnd + c + c %-----------------------% + c | Executable Statements | +@@ -153,7 +153,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcgets + c + call zsortc (which, .true., kev+np, ritz, bounds) +@@ -173,7 +173,7 @@ c + c + end if + c +- call second (t1) ++ call arscnd (t1) + tcgets = tcgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f +index 129e0d4..1c2ed08 100644 +--- a/PARPACK/SRC/MPI/pcgetv0.f ++++ b/PARPACK/SRC/MPI/pcgetv0.f +@@ -95,7 +95,7 @@ c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), + c pp 357-385. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcvout Parallel ARPACK utility routine that prints vectors. + c pclarnv Parallel wrapper for LAPACK routine clarnv (generates a random vector). + c cgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -191,7 +191,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external ccopy, cgemv, pclarnv, pcvout, second ++ external ccopy, cgemv, pclarnv, pcvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -251,7 +251,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -278,7 +278,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -301,7 +301,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -309,7 +309,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -325,7 +325,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -372,7 +372,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(n+1), 1) +@@ -387,7 +387,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -448,7 +448,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pcnaitr.f b/PARPACK/SRC/MPI/pcnaitr.f +index 4240d6a..b86abb6 100644 +--- a/PARPACK/SRC/MPI/pcnaitr.f ++++ b/PARPACK/SRC/MPI/pcnaitr.f +@@ -137,7 +137,7 @@ c + c\Routines called: + c pcgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c clanhs LAPACK routine that computes various norms of a matrix. +@@ -299,7 +299,7 @@ c | External Subroutines | + c %----------------------% + c + external caxpy, ccopy, cscal, cgemv, pcgetv0, slabad, +- & csscal, pcvout, pcmout, pivout, second ++ & csscal, pcvout, pcmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -352,7 +352,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcaitr + c + c %------------------------------% +@@ -463,7 +463,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -503,7 +503,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call ccopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -523,7 +523,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -539,7 +539,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -564,7 +564,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -613,11 +613,11 @@ c + c + if (j .gt. 1) h(j,j-1) = cmplx(betaj, rzero) + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(irj), 1) +@@ -641,7 +641,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -723,7 +723,7 @@ c + call caxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(irj), 1) +@@ -747,7 +747,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -827,7 +827,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -836,7 +836,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/MPI/pcnapps.f b/PARPACK/SRC/MPI/pcnapps.f +index 825c43c..19f6c2a 100644 +--- a/PARPACK/SRC/MPI/pcnapps.f ++++ b/PARPACK/SRC/MPI/pcnapps.f +@@ -96,7 +96,7 @@ c pp 357-385. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c clacpy LAPACK matrix copy routine. +@@ -200,7 +200,7 @@ c | External Subroutines | + c %----------------------% + c + external caxpy, ccopy, cgemv, cscal, clacpy, clartg, +- & pcvout, claset, slabad, pcmout, second, pivout ++ & pcvout, claset, slabad, pcmout, arscnd, pivout + c + c %--------------------% + c | External Functions | +@@ -256,7 +256,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcapps + c + kplusp = kev + np +@@ -511,7 +511,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tcapps = tcapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/MPI/pcnaup2.f b/PARPACK/SRC/MPI/pcnaup2.f +index 2622853..aab503e 100644 +--- a/PARPACK/SRC/MPI/pcnaup2.f ++++ b/PARPACK/SRC/MPI/pcnaup2.f +@@ -137,7 +137,7 @@ c pcneigh Parallel ARPACK compute Ritz values and error bounds routine. + c pcngets Parallel ARPACK reorder Ritz values and error bounds routine. + c csortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c psvout ARPACK utility routine that prints vectors. +@@ -250,7 +250,7 @@ c | External Subroutines | + c %----------------------% + c + external ccopy, pcgetv0, pcnaitr, pcneigh, pcngets, pcnapps, +- & csortc, cswap, pcmout, pcvout, pivout, second ++ & csortc, cswap, pcmout, pcvout, pivout, arscnd + c + c %--------------------% + c | External functions | +@@ -274,7 +274,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mcaup2 + c +@@ -740,7 +740,7 @@ c | the first step of the next call to pcnaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call ccopy (n, resid, 1, workd(n+1), 1) +@@ -765,7 +765,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -806,7 +806,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tcaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pcnaupd.f b/PARPACK/SRC/MPI/pcnaupd.f +index 4fd3dee..a24af96 100644 +--- a/PARPACK/SRC/MPI/pcnaupd.f ++++ b/PARPACK/SRC/MPI/pcnaupd.f +@@ -359,7 +359,7 @@ c Arnoldi Iteration. + c cstatn ARPACK routine that initializes the timing variables. + c pivout Parallel ARPACK utility routine that prints integers. + c pcvout Parallel ARPACK utility routine that prints vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pslamch ScaLAPACK routine that determines machine constants. + c + c\Author +@@ -446,7 +446,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pcnaup2, pcvout, pivout, second, cstatn ++ external pcnaup2, pcvout, pivout, arscnd, cstatn + c + c %--------------------% + c | External Functions | +@@ -468,7 +468,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call cstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mcaupd + c + c %----------------% +@@ -628,7 +628,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tcaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pcneigh.f b/PARPACK/SRC/MPI/pcneigh.f +index 7e39cd5..4f8dfde 100644 +--- a/PARPACK/SRC/MPI/pcneigh.f ++++ b/PARPACK/SRC/MPI/pcneigh.f +@@ -68,7 +68,7 @@ c xxxxxx Complex + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcmout Parallel ARPACK utility routine that prints matrices + c pcvout Parallel ARPACK utility routine that prints vectors. + c psvout Parallel ARPACK utility routine that prints vectors. +@@ -168,7 +168,7 @@ c | External Subroutines | + c %----------------------% + c + external clacpy, clahqr, csscal, ctrevc, ccopy, +- & pcmout, pcvout, second ++ & pcmout, pcvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -188,7 +188,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mceigh + c + if (msglvl .gt. 2) then +@@ -261,7 +261,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second(t1) ++ call arscnd(t1) + tceigh = tceigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pcngets.f b/PARPACK/SRC/MPI/pcngets.f +index 99b3204..e6290eb 100644 +--- a/PARPACK/SRC/MPI/pcngets.f ++++ b/PARPACK/SRC/MPI/pcngets.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c csortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pcvout Parallel ARPACK utility routine that prints vectors. + c + c\Author +@@ -142,7 +142,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pcvout, csortc, second ++ external pcvout, csortc, arscnd + c + c %-----------------------% + c | Executable Statements | +@@ -153,7 +153,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcgets + c + call csortc (which, .true., kev+np, ritz, bounds) +@@ -173,7 +173,7 @@ c + c + end if + c +- call second (t1) ++ call arscnd (t1) + tcgets = tcgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f +index 83c42d2..1b33190 100644 +--- a/PARPACK/SRC/MPI/pdgetv0.f ++++ b/PARPACK/SRC/MPI/pdgetv0.f +@@ -99,7 +99,7 @@ c Restarted Arnoldi Iteration", Rice University Technical Report + c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine for vector output. + c pdlarnv Parallel wrapper for LAPACK routine dlarnv (generates a random vector). + c dgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -190,7 +190,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pdlarnv, pdvout, dcopy, dgemv, second ++ external pdlarnv, pdvout, dcopy, dgemv, arscnd + c + c %--------------------% + c | External Functions | +@@ -237,7 +237,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -264,7 +264,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -287,7 +287,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -295,7 +295,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -311,7 +311,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -358,7 +358,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(n+1), 1) +@@ -373,7 +373,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -433,7 +433,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pdnaitr.f b/PARPACK/SRC/MPI/pdnaitr.f +index c9f7c38..ab1e790 100644 +--- a/PARPACK/SRC/MPI/pdnaitr.f ++++ b/PARPACK/SRC/MPI/pdnaitr.f +@@ -138,7 +138,7 @@ c + c\Routines called: + c pdgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdmout Parallel ARPACK utility routine that prints matrices + c pdvout Parallel ARPACK utility routine that prints vectors. + c dlabad LAPACK routine that computes machine constants. +@@ -290,7 +290,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dgemv, pdgetv0, dlabad, +- & pdvout, pdmout, pivout, second ++ & pdvout, pdmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -341,7 +341,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnaitr + c + c %------------------------------% +@@ -452,7 +452,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -492,7 +492,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call dcopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -512,7 +512,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -528,7 +528,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -553,7 +553,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -602,11 +602,11 @@ c + c + if (j .gt. 1) h(j,j-1) = betaj + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -630,7 +630,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -711,7 +711,7 @@ c + call daxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -735,7 +735,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -815,7 +815,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -824,7 +824,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/MPI/pdnapps.f b/PARPACK/SRC/MPI/pdnapps.f +index e6dc285..c85fcd3 100644 +--- a/PARPACK/SRC/MPI/pdnapps.f ++++ b/PARPACK/SRC/MPI/pdnapps.f +@@ -198,7 +198,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dlacpy, dlarf, dlarfg, dlartg, +- & dlaset, dlabad, second, pivout, pdvout, pdmout ++ & dlaset, dlabad, arscnd, pivout, pdvout, pdmout + c + c %--------------------% + c | External Functions | +@@ -246,7 +246,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnapps + c + kplusp = kev + np +@@ -645,7 +645,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tnapps = tnapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/MPI/pdnaup2.f b/PARPACK/SRC/MPI/pdnaup2.f +index b4aa41a..131ec2d 100644 +--- a/PARPACK/SRC/MPI/pdnaup2.f ++++ b/PARPACK/SRC/MPI/pdnaup2.f +@@ -145,7 +145,7 @@ c pdneigh Parallel ARPACK compute Ritz values and error bounds routine. + c pdngets Parallel ARPACK reorder Ritz values and error bounds routine. + c dsortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdmout Parallel ARPACK utility routine that prints matrices + c pdvout ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. +@@ -255,7 +255,7 @@ c %----------------------% + c + external dcopy , pdgetv0 , pdnaitr , dnconv , + & pdneigh , pdngets , pdnapps , +- & pdvout , pivout, second ++ & pdvout , pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -277,7 +277,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mnaup2 + c +@@ -779,7 +779,7 @@ c | the first step of the next call to pdnaitr . | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(n+1), 1) +@@ -804,7 +804,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -845,7 +845,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tnaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pdnaupd.f b/PARPACK/SRC/MPI/pdnaupd.f +index 32285d2..4c0f9a1 100644 +--- a/PARPACK/SRC/MPI/pdnaupd.f ++++ b/PARPACK/SRC/MPI/pdnaupd.f +@@ -382,7 +382,7 @@ c\Routines called: + c pdnaup2 Parallel ARPACK routine that implements the Implicitly Restarted + c Arnoldi Iteration. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c +@@ -468,7 +468,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pdnaup2 , pdvout , pivout, second, dstatn ++ external pdnaup2 , pdvout , pivout, arscnd, dstatn + c + c %--------------------% + c | External Functions | +@@ -490,7 +490,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call dstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mnaupd + c + c %----------------% +@@ -654,7 +654,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tnaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pdneigh.f b/PARPACK/SRC/MPI/pdneigh.f +index 779a0fa..f465f09 100644 +--- a/PARPACK/SRC/MPI/pdneigh.f ++++ b/PARPACK/SRC/MPI/pdneigh.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c dlaqrb ARPACK routine to compute the real Schur form of an + c upper Hessenberg matrix and last row of the Schur vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c dmout ARPACK utility routine that prints matrices + c dvout ARPACK utility routine that prints vectors. + c dlacpy LAPACK matrix copy routine. +@@ -157,7 +157,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dcopy, dlacpy, dlaqrb, dtrevc, pdvout, second ++ external dcopy, dlacpy, dlaqrb, dtrevc, pdvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -183,7 +183,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mneigh + c + if (msglvl .gt. 2) then +@@ -314,7 +314,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second (t1) ++ call arscnd (t1) + tneigh = tneigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pdngets.f b/PARPACK/SRC/MPI/pdngets.f +index 31d1d21..b23912a 100644 +--- a/PARPACK/SRC/MPI/pdngets.f ++++ b/PARPACK/SRC/MPI/pdngets.f +@@ -149,7 +149,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dcopy, dsortc, second ++ external dcopy, dsortc, arscnd + c + c %----------------------% + c | Intrinsics Functions | +@@ -166,7 +166,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mngets + c + c %----------------------------------------------------% +@@ -222,7 +222,7 @@ c + call dsortc ( 'SR', .true., np, bounds, ritzr, ritzi ) + end if + c +- call second (t1) ++ call arscnd (t1) + tngets = tngets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pdsaitr.f b/PARPACK/SRC/MPI/pdsaitr.f +index 9b5f8ad..6ea4366 100644 +--- a/PARPACK/SRC/MPI/pdsaitr.f ++++ b/PARPACK/SRC/MPI/pdsaitr.f +@@ -283,7 +283,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dgemv, pdgetv0, pdvout, pdmout, +- & dlascl, pivout, second ++ & dlascl, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -328,7 +328,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaitr + c + c %------------------------------% +@@ -448,7 +448,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -488,7 +488,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call dcopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -507,7 +507,7 @@ c | Back from reverse communication; | + c | WORKD(IRJ:IRJ+N-1) := OP*v_{j}. | + c %-----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + step3 = .false. +@@ -528,7 +528,7 @@ c | assumed to have A*v_{j}. | + c %-------------------------------------------% + c + if (mode .eq. 2) go to 65 +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -552,7 +552,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j}. | + c %-----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -628,12 +628,12 @@ c + else + h(j,1) = rnorm + end if +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + iter = 0 + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -657,7 +657,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -735,7 +735,7 @@ c + h(j,2) = h(j,2) + workl(j) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(irj), 1) +@@ -759,7 +759,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -833,7 +833,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %----------------------------------------------------------% +@@ -857,7 +857,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + c +diff --git a/PARPACK/SRC/MPI/pdsapps.f b/PARPACK/SRC/MPI/pdsapps.f +index f5b1df3..adfbcae 100644 +--- a/PARPACK/SRC/MPI/pdsapps.f ++++ b/PARPACK/SRC/MPI/pdsapps.f +@@ -93,7 +93,7 @@ c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c dlartg LAPACK Givens rotation construction routine. +@@ -187,7 +187,7 @@ c | External Subroutines | + c %----------------------% + c + external daxpy, dcopy, dscal, dlacpy, dlartg, dlaset, pdvout, +- & pivout, second, dgemv ++ & pivout, arscnd, dgemv + c + c %--------------------% + c | External Functions | +@@ -224,7 +224,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msapps + c + kplusp = kev + np +@@ -514,7 +514,7 @@ c + end if + end if + c +- call second (t1) ++ call arscnd (t1) + tsapps = tsapps + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pdsaup2.f b/PARPACK/SRC/MPI/pdsaup2.f +index 793c630..25daa85 100644 +--- a/PARPACK/SRC/MPI/pdsaup2.f ++++ b/PARPACK/SRC/MPI/pdsaup2.f +@@ -153,7 +153,7 @@ c sstrqb ARPACK routine that computes all eigenvalues and the + c last component of the eigenvectors of a symmetric + c tridiagonal matrix using the implicit QL or QR method. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c dcopy Level 1 BLAS that copies one vector to another. +@@ -256,7 +256,7 @@ c %----------------------% + c + external dcopy, pdgetv0, pdsaitr, dscal, dsconv, + & pdseigt, pdsgets, pdsapps, +- & dsortr, pdvout, pivout, second ++ & dsortr, pdvout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -283,7 +283,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaup2 + c + c %---------------------------------% +@@ -794,7 +794,7 @@ c | the first step of the next call to pdsaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call dcopy (n, resid, 1, workd(n+1), 1) +@@ -819,7 +819,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -863,7 +863,7 @@ c %------------% + c | Error exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tsaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pdsaupd.f b/PARPACK/SRC/MPI/pdsaupd.f +index 0fb4ef5..d37ac95 100644 +--- a/PARPACK/SRC/MPI/pdsaupd.f ++++ b/PARPACK/SRC/MPI/pdsaupd.f +@@ -384,7 +384,7 @@ c Arnoldi Iteration. + c dstats ARPACK routine that initializes timing and other statistics + c variables. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c pdlamch ScaLAPACK routine that determines machine constants. + c +@@ -472,7 +472,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pdsaup2 , pdvout , pivout, second, dstats ++ external pdsaup2 , pdvout , pivout, arscnd, dstats + c + c %--------------------% + c | External Functions | +@@ -494,7 +494,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call dstats +- call second (t0) ++ call arscnd (t0) + msglvl = msaupd + c + ierr = 0 +@@ -654,7 +654,7 @@ c + & '_saupd: corresponding error bounds') + end if + c +- call second (t1) ++ call arscnd (t1) + tsaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pdseigt.f b/PARPACK/SRC/MPI/pdseigt.f +index 5775b50..7ba917a 100644 +--- a/PARPACK/SRC/MPI/pdseigt.f ++++ b/PARPACK/SRC/MPI/pdseigt.f +@@ -63,7 +63,7 @@ c\Routines called: + c dstqrb ARPACK routine that computes the eigenvalues and the + c last components of the eigenvectors of a symmetric + c and tridiagonal matrix. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c dcopy Level 1 BLAS that copies one vector to another. + c dscal Level 1 BLAS that scales a vector. +@@ -141,7 +141,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dcopy, dstqrb, pdvout, second ++ external dcopy, dstqrb, pdvout, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -158,7 +158,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mseigt + c + if (msglvl .gt. 0) then +@@ -190,7 +190,7 @@ c + bounds(k) = rnorm*abs(bounds(k)) + 30 continue + c +- call second (t1) ++ call arscnd (t1) + tseigt = tseigt + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pdsgets.f b/PARPACK/SRC/MPI/pdsgets.f +index 8eea4c2..77bdc03 100644 +--- a/PARPACK/SRC/MPI/pdsgets.f ++++ b/PARPACK/SRC/MPI/pdsgets.f +@@ -69,7 +69,7 @@ c + c\Routines called: + c dsortr ARPACK utility sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdvout Parallel ARPACK utility routine that prints vectors. + c dcopy Level 1 BLAS that copies one vector to another. + c dswap Level 1 BLAS that swaps the contents of two vectors. +@@ -145,7 +145,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external dswap, dcopy, dsortr, second ++ external dswap, dcopy, dsortr, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -162,7 +162,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msgets + c + if (which .eq. 'BE') then +@@ -212,7 +212,7 @@ c + call dcopy (np, ritz, 1, shifts, 1) + end if + c +- call second (t1) ++ call arscnd (t1) + tsgets = tsgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f +index 9085812..c9c6a80 100644 +--- a/PARPACK/SRC/MPI/psgetv0.f ++++ b/PARPACK/SRC/MPI/psgetv0.f +@@ -99,7 +99,7 @@ c Restarted Arnoldi Iteration", Rice University Technical Report + c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine for vector output. + c pslarnv Parallel wrapper for LAPACK routine slarnv (generates a random vector). + c sgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -190,7 +190,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pslarnv, psvout, scopy, sgemv, second ++ external pslarnv, psvout, scopy, sgemv, arscnd + c + c %--------------------% + c | External Functions | +@@ -237,7 +237,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -264,7 +264,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -287,7 +287,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -295,7 +295,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -311,7 +311,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -358,7 +358,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(n+1), 1) +@@ -373,7 +373,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -433,7 +433,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/psnaitr.f b/PARPACK/SRC/MPI/psnaitr.f +index e75154f..fbc8679 100644 +--- a/PARPACK/SRC/MPI/psnaitr.f ++++ b/PARPACK/SRC/MPI/psnaitr.f +@@ -138,7 +138,7 @@ c + c\Routines called: + c psgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psmout Parallel ARPACK utility routine that prints matrices + c psvout Parallel ARPACK utility routine that prints vectors. + c slabad LAPACK routine that computes machine constants. +@@ -290,7 +290,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, sgemv, psgetv0, slabad, +- & psvout, psmout, pivout, second ++ & psvout, psmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -341,7 +341,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnaitr + c + c %------------------------------% +@@ -452,7 +452,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -492,7 +492,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call scopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -512,7 +512,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -528,7 +528,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -553,7 +553,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -602,11 +602,11 @@ c + c + if (j .gt. 1) h(j,j-1) = betaj + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -630,7 +630,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -711,7 +711,7 @@ c + call saxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -735,7 +735,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -815,7 +815,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -824,7 +824,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tnaitr = tnaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/MPI/psnapps.f b/PARPACK/SRC/MPI/psnapps.f +index 45a78d0..7ed38b5 100644 +--- a/PARPACK/SRC/MPI/psnapps.f ++++ b/PARPACK/SRC/MPI/psnapps.f +@@ -198,7 +198,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, slacpy, slarf, slarfg, slartg, +- & slaset, slabad, second, pivout, psvout, psmout ++ & slaset, slabad, arscnd, pivout, psvout, psmout + c + c %--------------------% + c | External Functions | +@@ -246,7 +246,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mnapps + c + kplusp = kev + np +@@ -645,7 +645,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tnapps = tnapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/MPI/psnaup2.f b/PARPACK/SRC/MPI/psnaup2.f +index cd3e6f4..1892c04 100644 +--- a/PARPACK/SRC/MPI/psnaup2.f ++++ b/PARPACK/SRC/MPI/psnaup2.f +@@ -145,7 +145,7 @@ c psneigh Parallel ARPACK compute Ritz values and error bounds routine. + c psngets Parallel ARPACK reorder Ritz values and error bounds routine. + c ssortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psmout Parallel ARPACK utility routine that prints matrices + c psvout ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. +@@ -255,7 +255,7 @@ c %----------------------% + c + external scopy, psgetv0, psnaitr, snconv, + & psneigh, psngets, psnapps, +- & psvout, pivout, second ++ & psvout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -277,7 +277,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mnaup2 + c +@@ -779,7 +779,7 @@ c | the first step of the next call to psnaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(n+1), 1) +@@ -804,7 +804,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + endif + c +@@ -845,7 +845,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tnaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/psnaupd.f b/PARPACK/SRC/MPI/psnaupd.f +index 59888f1..71e6c11 100644 +--- a/PARPACK/SRC/MPI/psnaupd.f ++++ b/PARPACK/SRC/MPI/psnaupd.f +@@ -382,7 +382,7 @@ c\Routines called: + c psnaup2 Parallel ARPACK routine that implements the Implicitly Restarted + c Arnoldi Iteration. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c +@@ -468,7 +468,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external psnaup2, psvout, pivout, second, sstatn ++ external psnaup2, psvout, pivout, arscnd, sstatn + c + c %--------------------% + c | External Functions | +@@ -490,7 +490,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call sstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mnaupd + c + c %----------------% +@@ -654,7 +654,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tnaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/psneigh.f b/PARPACK/SRC/MPI/psneigh.f +index a00a9f0..25c3fa3 100644 +--- a/PARPACK/SRC/MPI/psneigh.f ++++ b/PARPACK/SRC/MPI/psneigh.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c slaqrb ARPACK routine to compute the real Schur form of an + c upper Hessenberg matrix and last row of the Schur vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c smout ARPACK utility routine that prints matrices + c svout ARPACK utility routine that prints vectors. + c slacpy LAPACK matrix copy routine. +@@ -157,7 +157,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external scopy, slacpy, slaqrb, strevc, psvout, second ++ external scopy, slacpy, slaqrb, strevc, psvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -183,7 +183,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mneigh + c + if (msglvl .gt. 2) then +@@ -314,7 +314,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second (t1) ++ call arscnd (t1) + tneigh = tneigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/psngets.f b/PARPACK/SRC/MPI/psngets.f +index f88b859..b9541f8 100644 +--- a/PARPACK/SRC/MPI/psngets.f ++++ b/PARPACK/SRC/MPI/psngets.f +@@ -149,7 +149,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external scopy, ssortc, second ++ external scopy, ssortc, arscnd + c + c %----------------------% + c | Intrinsics Functions | +@@ -166,7 +166,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mngets + c + c %----------------------------------------------------% +@@ -222,7 +222,7 @@ c + call ssortc ( 'SR', .true., np, bounds, ritzr, ritzi ) + end if + c +- call second (t1) ++ call arscnd (t1) + tngets = tngets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pssaitr.f b/PARPACK/SRC/MPI/pssaitr.f +index 2ab8e27..8c8d8ae 100644 +--- a/PARPACK/SRC/MPI/pssaitr.f ++++ b/PARPACK/SRC/MPI/pssaitr.f +@@ -283,7 +283,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, sgemv, psgetv0, psvout, psmout, +- & slascl, pivout, second ++ & slascl, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -328,7 +328,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaitr + c + c %------------------------------% +@@ -448,7 +448,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -488,7 +488,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call scopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -507,7 +507,7 @@ c | Back from reverse communication; | + c | WORKD(IRJ:IRJ+N-1) := OP*v_{j}. | + c %-----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + step3 = .false. +@@ -528,7 +528,7 @@ c | assumed to have A*v_{j}. | + c %-------------------------------------------% + c + if (mode .eq. 2) go to 65 +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -552,7 +552,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j}. | + c %-----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -628,12 +628,12 @@ c + else + h(j,1) = rnorm + end if +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + iter = 0 + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -657,7 +657,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -735,7 +735,7 @@ c + h(j,2) = h(j,2) + workl(j) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(irj), 1) +@@ -759,7 +759,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -833,7 +833,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %----------------------------------------------------------% +@@ -857,7 +857,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tsaitr = tsaitr + (t1 - t0) + ido = 99 + c +diff --git a/PARPACK/SRC/MPI/pssapps.f b/PARPACK/SRC/MPI/pssapps.f +index 7816334..6258010 100644 +--- a/PARPACK/SRC/MPI/pssapps.f ++++ b/PARPACK/SRC/MPI/pssapps.f +@@ -93,7 +93,7 @@ c TR95-13, Department of Computational and Applied Mathematics. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c slartg LAPACK Givens rotation construction routine. +@@ -187,7 +187,7 @@ c | External Subroutines | + c %----------------------% + c + external saxpy, scopy, sscal, slacpy, slartg, slaset, psvout, +- & pivout, second, sgemv ++ & pivout, arscnd, sgemv + c + c %--------------------% + c | External Functions | +@@ -224,7 +224,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msapps + c + kplusp = kev + np +@@ -514,7 +514,7 @@ c + end if + end if + c +- call second (t1) ++ call arscnd (t1) + tsapps = tsapps + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pssaup2.f b/PARPACK/SRC/MPI/pssaup2.f +index 619c2e6..cd18d8f 100644 +--- a/PARPACK/SRC/MPI/pssaup2.f ++++ b/PARPACK/SRC/MPI/pssaup2.f +@@ -153,7 +153,7 @@ c sstrqb ARPACK routine that computes all eigenvalues and the + c last component of the eigenvectors of a symmetric + c tridiagonal matrix using the implicit QL or QR method. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c scopy Level 1 BLAS that copies one vector to another. +@@ -256,7 +256,7 @@ c %----------------------% + c + external scopy, psgetv0, pssaitr, sscal, ssconv, + & psseigt, pssgets, pssapps, +- & ssortr, psvout, pivout, second ++ & ssortr, psvout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -283,7 +283,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msaup2 + c + c %---------------------------------% +@@ -794,7 +794,7 @@ c | the first step of the next call to pssaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call scopy (n, resid, 1, workd(n+1), 1) +@@ -819,7 +819,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -863,7 +863,7 @@ c %------------% + c | Error exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tsaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pssaupd.f b/PARPACK/SRC/MPI/pssaupd.f +index 87d3167..802a0b3 100644 +--- a/PARPACK/SRC/MPI/pssaupd.f ++++ b/PARPACK/SRC/MPI/pssaupd.f +@@ -384,7 +384,7 @@ c Arnoldi Iteration. + c sstats ARPACK routine that initializes timing and other statistics + c variables. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c pslamch ScaLAPACK routine that determines machine constants. + c +@@ -472,7 +472,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pssaup2, psvout, pivout, second, sstats ++ external pssaup2, psvout, pivout, arscnd, sstats + c + c %--------------------% + c | External Functions | +@@ -494,7 +494,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call sstats +- call second (t0) ++ call arscnd (t0) + msglvl = msaupd + c + ierr = 0 +@@ -654,7 +654,7 @@ c + & '_saupd: corresponding error bounds') + end if + c +- call second (t1) ++ call arscnd (t1) + tsaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/psseigt.f b/PARPACK/SRC/MPI/psseigt.f +index c7bd06e..1e387e9 100644 +--- a/PARPACK/SRC/MPI/psseigt.f ++++ b/PARPACK/SRC/MPI/psseigt.f +@@ -63,7 +63,7 @@ c\Routines called: + c sstqrb ARPACK routine that computes the eigenvalues and the + c last components of the eigenvectors of a symmetric + c and tridiagonal matrix. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c scopy Level 1 BLAS that copies one vector to another. + c sscal Level 1 BLAS that scales a vector. +@@ -141,7 +141,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external scopy, sstqrb, psvout, second ++ external scopy, sstqrb, psvout, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -158,7 +158,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mseigt + c + if (msglvl .gt. 0) then +@@ -190,7 +190,7 @@ c + bounds(k) = rnorm*abs(bounds(k)) + 30 continue + c +- call second (t1) ++ call arscnd (t1) + tseigt = tseigt + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pssgets.f b/PARPACK/SRC/MPI/pssgets.f +index f2ed0c3..c141524 100644 +--- a/PARPACK/SRC/MPI/pssgets.f ++++ b/PARPACK/SRC/MPI/pssgets.f +@@ -69,7 +69,7 @@ c + c\Routines called: + c ssortr ARPACK utility sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c psvout Parallel ARPACK utility routine that prints vectors. + c scopy Level 1 BLAS that copies one vector to another. + c sswap Level 1 BLAS that swaps the contents of two vectors. +@@ -145,7 +145,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external sswap, scopy, ssortr, second ++ external sswap, scopy, ssortr, arscnd + c + c %---------------------% + c | Intrinsic Functions | +@@ -162,7 +162,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = msgets + c + if (which .eq. 'BE') then +@@ -212,7 +212,7 @@ c + call scopy (np, ritz, 1, shifts, 1) + end if + c +- call second (t1) ++ call arscnd (t1) + tsgets = tsgets + (t1 - t0) + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f +index 40f02c7..ad02573 100644 +--- a/PARPACK/SRC/MPI/pzgetv0.f ++++ b/PARPACK/SRC/MPI/pzgetv0.f +@@ -95,7 +95,7 @@ c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), + c pp 357-385. + c + c\Routines called: +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzvout Parallel ARPACK utility routine that prints vectors. + c pzlarnv Parallel wrapper for LAPACK routine zlarnv (generates a random vector). + c zgemv Level 2 BLAS routine for matrix vector multiplication. +@@ -191,7 +191,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external zcopy , zgemv , pzlarnv , pzvout , second ++ external zcopy , zgemv , pzlarnv , pzvout , arscnd + c + c %--------------------% + c | External Functions | +@@ -251,7 +251,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mgetv0 + c + ierr = 0 +@@ -278,7 +278,7 @@ c | Force the starting vector into the range of OP to handle | + c | the generalized problem when B is possibly (singular). | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nopx = nopx + 1 + ipntr(1) = 1 +@@ -301,7 +301,7 @@ c %-----------------------------------------------% + c + if (orth) go to 40 + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + c + c %------------------------------------------------------% +@@ -309,7 +309,7 @@ c | Starting vector is now in the range of OP; r = OP*r; | + c | Compute B-norm of starting vector. | + c %------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + first = .TRUE. + if (bmat .eq. 'G') then + nbx = nbx + 1 +@@ -325,7 +325,7 @@ c + 20 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -372,7 +372,7 @@ c %----------------------------------------------------------% + c | Compute the B-norm of the orthogonalized starting vector | + c %----------------------------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(n+1), 1) +@@ -387,7 +387,7 @@ c + 40 continue + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -448,7 +448,7 @@ c + end if + ido = 99 + c +- call second (t1) ++ call arscnd (t1) + tgetv0 = tgetv0 + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pznaitr.f b/PARPACK/SRC/MPI/pznaitr.f +index 033cdff..5e66ca7 100644 +--- a/PARPACK/SRC/MPI/pznaitr.f ++++ b/PARPACK/SRC/MPI/pznaitr.f +@@ -137,7 +137,7 @@ c + c\Routines called: + c pzgetv0 Parallel ARPACK routine to generate the initial vector. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c zlanhs LAPACK routine that computes various norms of a matrix. +@@ -299,7 +299,7 @@ c | External Subroutines | + c %----------------------% + c + external zaxpy, zcopy, zscal, zgemv, pzgetv0, dlabad, +- & zdscal, pzvout, pzmout, pivout, second ++ & zdscal, pzvout, pzmout, pivout, arscnd + c + c %--------------------% + c | External Functions | +@@ -352,7 +352,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcaitr + c + c %------------------------------% +@@ -463,7 +463,7 @@ c | which spans OP and exit. | + c %------------------------------------------------% + c + info = j - 1 +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + go to 9000 +@@ -503,7 +503,7 @@ c %------------------------------------------------------% + c + step3 = .true. + nopx = nopx + 1 +- call second (t2) ++ call arscnd (t2) + call zcopy (n, v(1,j), 1, workd(ivj), 1) + ipntr(1) = ivj + ipntr(2) = irj +@@ -523,7 +523,7 @@ c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | + c | if step3 = .true. | + c %----------------------------------% + c +- call second (t3) ++ call arscnd (t3) + tmvopx = tmvopx + (t3 - t2) + + step3 = .false. +@@ -539,7 +539,7 @@ c | STEP 4: Finish extending the Arnoldi | + c | factorization to length j. | + c %---------------------------------------% + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + step4 = .true. +@@ -564,7 +564,7 @@ c | if step4 = .true. | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -613,11 +613,11 @@ c + c + if (j .gt. 1) h(j,j-1) = dcmplx(betaj, rzero) + c +- call second (t4) ++ call arscnd (t4) + c + orth1 = .true. + c +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(irj), 1) +@@ -641,7 +641,7 @@ c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -723,7 +723,7 @@ c + call zaxpy (j, one, workl(1), 1, h(1,j), 1) + c + orth2 = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(irj), 1) +@@ -747,7 +747,7 @@ c | Back from reverse communication if ORTH2 = .true. | + c %---------------------------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -827,7 +827,7 @@ c + rstart = .false. + orth2 = .false. + c +- call second (t5) ++ call arscnd (t5) + titref = titref + (t5 - t4) + c + c %------------------------------------% +@@ -836,7 +836,7 @@ c %------------------------------------% + c + j = j + 1 + if (j .gt. k+np) then +- call second (t1) ++ call arscnd (t1) + tcaitr = tcaitr + (t1 - t0) + ido = 99 + do 110 i = max(1,k), k+np-1 +diff --git a/PARPACK/SRC/MPI/pznapps.f b/PARPACK/SRC/MPI/pznapps.f +index 3373420..ed262df 100644 +--- a/PARPACK/SRC/MPI/pznapps.f ++++ b/PARPACK/SRC/MPI/pznapps.f +@@ -96,7 +96,7 @@ c pp 357-385. + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c zlacpy LAPACK matrix copy routine. +@@ -200,7 +200,7 @@ c | External Subroutines | + c %----------------------% + c + external zaxpy, zcopy, zgemv, zscal, zlacpy, zlartg, +- & pzvout, zlaset, dlabad, pzmout, second, pivout ++ & pzvout, zlaset, dlabad, pzmout, arscnd, pivout + c + c %--------------------% + c | External Functions | +@@ -256,7 +256,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcapps + c + kplusp = kev + np +@@ -511,7 +511,7 @@ c + end if + c + 9000 continue +- call second (t1) ++ call arscnd (t1) + tcapps = tcapps + (t1 - t0) + c + return +diff --git a/PARPACK/SRC/MPI/pznaup2.f b/PARPACK/SRC/MPI/pznaup2.f +index 126f253..8b206ef 100644 +--- a/PARPACK/SRC/MPI/pznaup2.f ++++ b/PARPACK/SRC/MPI/pznaup2.f +@@ -137,7 +137,7 @@ c pzneigh Parallel ARPACK compute Ritz values and error bounds routine. + c pzngets Parallel ARPACK reorder Ritz values and error bounds routine. + c zsortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c pdvout ARPACK utility routine that prints vectors. +@@ -250,7 +250,7 @@ c | External Subroutines | + c %----------------------% + c + external zcopy, pzgetv0, pznaitr, pzneigh, pzngets, pznapps, +- & zsortc, zswap, pzmout, pzvout, pivout, second ++ & zsortc, zswap, pzmout, pzvout, pivout, arscnd + c + c %--------------------% + c | External functions | +@@ -274,7 +274,7 @@ c %-----------------------% + c + if (ido .eq. 0) then + c +- call second (t0) ++ call arscnd (t0) + c + msglvl = mcaup2 + c +@@ -740,7 +740,7 @@ c | the first step of the next call to pznaitr. | + c %---------------------------------------------% + c + cnorm = .true. +- call second (t2) ++ call arscnd (t2) + if (bmat .eq. 'G') then + nbx = nbx + 1 + call zcopy (n, resid, 1, workd(n+1), 1) +@@ -765,7 +765,7 @@ c | WORKD(1:N) := B*RESID | + c %----------------------------------% + c + if (bmat .eq. 'G') then +- call second (t3) ++ call arscnd (t3) + tmvbx = tmvbx + (t3 - t2) + end if + c +@@ -806,7 +806,7 @@ c %------------% + c | Error Exit | + c %------------% + c +- call second (t1) ++ call arscnd (t1) + tcaup2 = t1 - t0 + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pznaupd.f b/PARPACK/SRC/MPI/pznaupd.f +index 06dc29c..01edfb0 100644 +--- a/PARPACK/SRC/MPI/pznaupd.f ++++ b/PARPACK/SRC/MPI/pznaupd.f +@@ -359,7 +359,7 @@ c Arnoldi Iteration. + c zstatn ARPACK routine that initializes the timing variables. + c pivout Parallel ARPACK utility routine that prints integers. + c pzvout Parallel ARPACK utility routine that prints vectors. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pdlamch ScaLAPACK routine that determines machine constants. + c + c\Author +@@ -446,7 +446,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pznaup2 , pzvout , pivout, second, zstatn ++ external pznaup2 , pzvout , pivout, arscnd, zstatn + c + c %--------------------% + c | External Functions | +@@ -468,7 +468,7 @@ c | & message level for debugging | + c %-------------------------------% + c + call zstatn +- call second (t0) ++ call arscnd (t0) + msglvl = mcaupd + c + c %----------------% +@@ -628,7 +628,7 @@ c + & '_naupd: Associated Ritz estimates') + end if + c +- call second (t1) ++ call arscnd (t1) + tcaupd = t1 - t0 + c + if (msglvl .gt. 0) then +diff --git a/PARPACK/SRC/MPI/pzneigh.f b/PARPACK/SRC/MPI/pzneigh.f +index 926ef45..31ce59a 100644 +--- a/PARPACK/SRC/MPI/pzneigh.f ++++ b/PARPACK/SRC/MPI/pzneigh.f +@@ -68,7 +68,7 @@ c xxxxxx Complex*16 + c + c\Routines called: + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzmout Parallel ARPACK utility routine that prints matrices + c pzvout Parallel ARPACK utility routine that prints vectors. + c pdvout Parallel ARPACK utility routine that prints vectors. +@@ -168,7 +168,7 @@ c | External Subroutines | + c %----------------------% + c + external zlacpy, zlahqr, zdscal, ztrevc, zcopy, +- & pzmout, pzvout, second ++ & pzmout, pzvout, arscnd + c + c %--------------------% + c | External Functions | +@@ -188,7 +188,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mceigh + c + if (msglvl .gt. 2) then +@@ -261,7 +261,7 @@ c + & '_neigh: Ritz estimates for the eigenvalues of H') + end if + c +- call second(t1) ++ call arscnd(t1) + tceigh = tceigh + (t1 - t0) + c + 9000 continue +diff --git a/PARPACK/SRC/MPI/pzngets.f b/PARPACK/SRC/MPI/pzngets.f +index ef8d25a..d97c8c6 100644 +--- a/PARPACK/SRC/MPI/pzngets.f ++++ b/PARPACK/SRC/MPI/pzngets.f +@@ -67,7 +67,7 @@ c + c\Routines called: + c zsortc ARPACK sorting routine. + c pivout Parallel ARPACK utility routine that prints integers. +-c second ARPACK utility routine for timing. ++c arscnd ARPACK utility routine for timing. + c pzvout Parallel ARPACK utility routine that prints vectors. + c + c\Author +@@ -142,7 +142,7 @@ c %----------------------% + c | External Subroutines | + c %----------------------% + c +- external pzvout, zsortc, second ++ external pzvout, zsortc, arscnd + c + c %-----------------------% + c | Executable Statements | +@@ -153,7 +153,7 @@ c | Initialize timing statistics | + c | & message level for debugging | + c %-------------------------------% + c +- call second (t0) ++ call arscnd (t0) + msglvl = mcgets + c + call zsortc (which, .true., kev+np, ritz, bounds) +@@ -173,7 +173,7 @@ c + c + end if + c +- call second (t1) ++ call arscnd (t1) + tcgets = tcgets + (t1 - t0) + c + if (msglvl .gt. 0) then +-- +1.8.3.1 + + +From 072f08e31357267c91fe345e3e166c626929676c Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Tue, 6 Aug 2013 15:14:46 +0200 +Subject: [PATCH 2/6] Missing the dependency on mpi from libparpack. See + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718790 + +--- + PARPACK/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/PARPACK/Makefile.am b/PARPACK/Makefile.am +index e090141..f9c13ae 100644 +--- a/PARPACK/Makefile.am ++++ b/PARPACK/Makefile.am +@@ -16,4 +16,4 @@ libparpack_la_LIBADD = \ + $(top_builddir)/UTIL/libarpackutil.la \ + $(top_builddir)/PARPACK/SRC/MPI/libparpacksrcmpi.la \ + $(top_builddir)/PARPACK/UTIL/MPI/libparpackutilmpi.la \ +- $(BLAS_LIBS) $(LAPACK_LIBS) ++ $(BLAS_LIBS) $(LAPACK_LIBS) $(MPILIBS) +-- +1.8.3.1 + + +From 343b151f12ee027af8b4a18828d7645d0a93ee60 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Tue, 6 Aug 2013 15:16:18 +0200 +Subject: [PATCH 3/6] Update of the changelog + +--- + CHANGES | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CHANGES b/CHANGES +index fe07dd3..a11e209 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,11 @@ ++arpack-ng - 3.1.4 ++ ++ * libparpack2: missing dependency on MPI: ++ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718790 ++ * Replace LAPACK second function with ARPACK's own arscnd in PARPACK ++ ++ -- Sylvestre Ledru Tue, 06 Aug 2013 15:15:55 +0200 ++ + arpack-ng - 3.1.3 + + [ Jordi Gutiérrez Hermoso ] +-- +1.8.3.1 + + +From 94200e60c03c3ee322a37d05fd5f3c8fe78ba278 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Tue, 6 Aug 2013 15:16:53 +0200 +Subject: [PATCH 4/6] automake 1.13.3 + new upstream autoconf + +--- + Makefile.in | 356 ++++++++++++---------- + PARPACK/EXAMPLES/BLACS/Makefile.in | 106 +++++-- + PARPACK/EXAMPLES/MPI/Makefile.in | 235 ++++++++++----- + PARPACK/Makefile.in | 331 ++++++++++++--------- + PARPACK/SRC/BLACS/Makefile.in | 219 +++++++++----- + PARPACK/SRC/MPI/Makefile.in | 342 ++++++++++++--------- + PARPACK/SRC/Makefile.in | 269 +++++++++-------- + PARPACK/UTIL/BLACS/Makefile.in | 219 +++++++++----- + PARPACK/UTIL/MPI/Makefile.in | 219 +++++++++----- + PARPACK/UTIL/Makefile.in | 269 +++++++++-------- + SRC/Makefile.in | 219 +++++++++----- + TESTS/Makefile.in | 238 ++++++++++----- + UTIL/Makefile.in | 219 +++++++++----- + aclocal.m4 | 588 ++++++++++++++++++++----------------- + configure | 193 ++++++++---- + 15 files changed, 2467 insertions(+), 1555 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e049dfd..ad39e7d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,23 +16,51 @@ + + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -54,10 +81,10 @@ build_triplet = @build@ + host_triplet = @host@ + @MPI_TRUE@am__append_1 = PARPACK + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/arpack.pc.in \ +- $(top_srcdir)/configure COPYING TODO config.guess config.sub \ +- depcomp install-sh ltmain.sh missing ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/arpack.pc.in COPYING README TODO config.guess \ ++ config.sub depcomp install-sh missing ltmain.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -106,26 +133,51 @@ libarpack_la_DEPENDENCIES = $(top_builddir)/SRC/libarpacksrc.la \ + $(am__DEPENDENCIES_1) + am_libarpack_la_OBJECTS = + libarpack_la_OBJECTS = $(am_libarpack_la_OBJECTS) +-libarpack_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++libarpack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ + $(libarpack_la_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libarpack_la_SOURCES) $(nodist_EXTRA_libarpack_la_SOURCES) + DIST_SOURCES = $(libarpack_la_SOURCES) +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive ++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ++ ctags-recursive dvi-recursive html-recursive info-recursive \ ++ install-data-recursive install-dvi-recursive \ ++ install-exec-recursive install-html-recursive \ ++ install-info-recursive install-pdf-recursive \ ++ install-ps-recursive install-recursive installcheck-recursive \ ++ installdirs-recursive pdf-recursive ps-recursive \ ++ tags-recursive uninstall-recursive + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -134,11 +186,32 @@ am__can_run_installinfo = \ + DATA = $(pkgconfig_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++am__recursive_targets = \ ++ $(RECURSIVE_TARGETS) \ ++ $(RECURSIVE_CLEAN_TARGETS) \ ++ $(am__extra_recursive_targets) ++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ ++ cscope distdir dist dist-all distcheck ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags ++CSCOPE = cscope + DIST_SUBDIRS = UTIL SRC . TESTS PARPACK + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) +@@ -149,6 +222,7 @@ am__remove_distdir = \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi ++am__post_remove_distdir = $(am__remove_distdir) + am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +@@ -176,12 +250,14 @@ am__relativize = \ + reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best ++DIST_TARGETS = dist-gzip + distuninstallcheck_listfiles = find . -type f -print + am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -366,6 +442,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + $(am__aclocal_m4_deps): + arpack.pc: $(top_builddir)/config.status $(srcdir)/arpack.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ ++ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ +@@ -392,14 +469,17 @@ uninstall-libLTLIBRARIES: + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(lib_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libarpack.la: $(libarpack_la_OBJECTS) $(libarpack_la_DEPENDENCIES) $(EXTRA_libarpack_la_DEPENDENCIES) +- $(libarpack_la_LINK) -rpath $(libdir) $(libarpack_la_OBJECTS) $(libarpack_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(libarpack_la_LINK) -rpath $(libdir) $(libarpack_la_OBJECTS) $(libarpack_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -408,13 +488,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -447,22 +527,25 @@ uninstall-pkgconfigDATA: + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) + + # This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++# into them and run 'make' without going through this Makefile. ++# To change the values of 'make' variables: instead of editing Makefiles, ++# (1) if the variable is set in 'config.status', edit 'config.status' ++# (which will cause the Makefiles to be regenerated when you run 'make'); ++# (2) otherwise, pass the desired values on the 'make' command line. ++$(am__recursive_targets): ++ @fail=; \ ++ if $(am__make_keepgoing); then \ ++ failcom='fail=yes'; \ ++ else \ ++ failcom='exit 1'; \ ++ fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ +@@ -477,57 +560,12 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-recursive ++TAGS: tags + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +@@ -543,12 +581,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -560,15 +593,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-recursive ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -577,9 +606,31 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscope: cscope.files ++ test ! -s cscope.files \ ++ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) ++clean-cscope: ++ -rm -f cscope.files ++cscope.files: clean-cscope cscopelist ++cscopelist: cscopelist-recursive ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + + distdir: $(DISTFILES) + $(am__remove_distdir) +@@ -647,40 +698,36 @@ distdir: $(DISTFILES) + || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz +- $(am__remove_distdir) +- +-dist-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + +-dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) ++dist dist-all: ++ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' ++ $(am__post_remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another +@@ -691,8 +738,6 @@ distcheck: dist + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ +@@ -704,9 +749,9 @@ distcheck: dist + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +- chmod -R a-w $(distdir); chmod u+w $(distdir) +- mkdir $(distdir)/_build +- mkdir $(distdir)/_inst ++ chmod -R a-w $(distdir) ++ chmod u+w $(distdir) ++ mkdir $(distdir)/_build $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +@@ -738,7 +783,7 @@ distcheck: dist + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +@@ -878,14 +923,13 @@ ps-am: + + uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive ++.MAKE: $(am__recursive_targets) install-am install-strip + +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am am--refresh check check-am clean clean-generic \ +- clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \ +- dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ +- dist-tarZ dist-xz dist-zip distcheck distclean \ ++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ ++ am--refresh check check-am clean clean-cscope clean-generic \ ++ clean-libLTLIBRARIES clean-libtool cscope cscopelist-am ctags \ ++ ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \ ++ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ +@@ -897,8 +941,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am \ +- uninstall-libLTLIBRARIES uninstall-pkgconfigDATA ++ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ ++ uninstall-pkgconfigDATA + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/EXAMPLES/BLACS/Makefile.in b/PARPACK/EXAMPLES/BLACS/Makefile.in +index 5fbf1f9..6b06ad6 100644 +--- a/PARPACK/EXAMPLES/BLACS/Makefile.in ++++ b/PARPACK/EXAMPLES/BLACS/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -47,23 +46,51 @@ + + # pcndrv1_LDADD=../../../PARPACK/SRC/BLACS/libparpacksrc.la $(BLAS_LIBS) $(LAPACK_LIBS) + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -83,7 +110,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/EXAMPLES/BLACS +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -95,6 +122,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = + am__can_run_installinfo = \ +@@ -102,9 +141,11 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -268,11 +309,11 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +-tags: TAGS +-TAGS: ++tags TAGS: ++ ++ctags CTAGS: + +-ctags: CTAGS +-CTAGS: ++cscope cscopelist: + + + distdir: $(DISTFILES) +@@ -408,15 +449,16 @@ uninstall-am: + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am ++ cscopelist-am ctags-am distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/EXAMPLES/MPI/Makefile.in b/PARPACK/EXAMPLES/MPI/Makefile.in +index 5f5166a..512a500 100644 +--- a/PARPACK/EXAMPLES/MPI/Makefile.in ++++ b/PARPACK/EXAMPLES/MPI/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -55,7 +82,7 @@ bin_PROGRAMS = pzndrv1$(EXEEXT) psndrv3$(EXEEXT) pdndrv1$(EXEEXT) \ + pdndrv3$(EXEEXT) pssdrv1$(EXEEXT) pdsdrv1$(EXEEXT) \ + pcndrv1$(EXEEXT) + subdir = PARPACK/EXAMPLES/MPI +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -74,6 +101,10 @@ pcndrv1_OBJECTS = $(am_pcndrv1_OBJECTS) + am__DEPENDENCIES_1 = + pcndrv1_DEPENDENCIES = ../../libparpack.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = + am_pdndrv1_OBJECTS = pdndrv1.$(OBJEXT) + pdndrv1_OBJECTS = $(am_pdndrv1_OBJECTS) + pdndrv1_DEPENDENCIES = ../../libparpack.la $(am__DEPENDENCIES_1) \ +@@ -98,14 +129,34 @@ am_pzndrv1_OBJECTS = pzndrv1.$(OBJEXT) + pzndrv1_OBJECTS = $(am_pzndrv1_OBJECTS) + pzndrv1_DEPENDENCIES = ../../libparpack.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(pcndrv1_SOURCES) $(pdndrv1_SOURCES) $(pdndrv3_SOURCES) \ + $(pdsdrv1_SOURCES) $(psndrv3_SOURCES) $(pssdrv1_SOURCES) \ + $(pzndrv1_SOURCES) +@@ -117,11 +168,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -304,10 +373,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ +- while read p p1; do if test -f $$p || test -f $$p1; \ +- then echo "$$p"; echo "$$p"; else :; fi; \ ++ while read p p1; do if test -f $$p \ ++ || test -f $$p1 \ ++ ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ +- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ sed -e 'p;s,.*/,,;n;h' \ ++ -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ +@@ -328,7 +399,8 @@ uninstall-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ +- -e 's/$$/$(EXEEXT)/' `; \ ++ -e 's/$$/$(EXEEXT)/' \ ++ `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files +@@ -341,27 +413,34 @@ clean-binPROGRAMS: + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list ++ + pcndrv1$(EXEEXT): $(pcndrv1_OBJECTS) $(pcndrv1_DEPENDENCIES) $(EXTRA_pcndrv1_DEPENDENCIES) + @rm -f pcndrv1$(EXEEXT) +- $(F77LINK) $(pcndrv1_OBJECTS) $(pcndrv1_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(pcndrv1_OBJECTS) $(pcndrv1_LDADD) $(LIBS) ++ + pdndrv1$(EXEEXT): $(pdndrv1_OBJECTS) $(pdndrv1_DEPENDENCIES) $(EXTRA_pdndrv1_DEPENDENCIES) + @rm -f pdndrv1$(EXEEXT) +- $(F77LINK) $(pdndrv1_OBJECTS) $(pdndrv1_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(pdndrv1_OBJECTS) $(pdndrv1_LDADD) $(LIBS) ++ + pdndrv3$(EXEEXT): $(pdndrv3_OBJECTS) $(pdndrv3_DEPENDENCIES) $(EXTRA_pdndrv3_DEPENDENCIES) + @rm -f pdndrv3$(EXEEXT) +- $(F77LINK) $(pdndrv3_OBJECTS) $(pdndrv3_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(pdndrv3_OBJECTS) $(pdndrv3_LDADD) $(LIBS) ++ + pdsdrv1$(EXEEXT): $(pdsdrv1_OBJECTS) $(pdsdrv1_DEPENDENCIES) $(EXTRA_pdsdrv1_DEPENDENCIES) + @rm -f pdsdrv1$(EXEEXT) +- $(F77LINK) $(pdsdrv1_OBJECTS) $(pdsdrv1_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(pdsdrv1_OBJECTS) $(pdsdrv1_LDADD) $(LIBS) ++ + psndrv3$(EXEEXT): $(psndrv3_OBJECTS) $(psndrv3_DEPENDENCIES) $(EXTRA_psndrv3_DEPENDENCIES) + @rm -f psndrv3$(EXEEXT) +- $(F77LINK) $(psndrv3_OBJECTS) $(psndrv3_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(psndrv3_OBJECTS) $(psndrv3_LDADD) $(LIBS) ++ + pssdrv1$(EXEEXT): $(pssdrv1_OBJECTS) $(pssdrv1_DEPENDENCIES) $(EXTRA_pssdrv1_DEPENDENCIES) + @rm -f pssdrv1$(EXEEXT) +- $(F77LINK) $(pssdrv1_OBJECTS) $(pssdrv1_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(pssdrv1_OBJECTS) $(pssdrv1_LDADD) $(LIBS) ++ + pzndrv1$(EXEEXT): $(pzndrv1_OBJECTS) $(pzndrv1_DEPENDENCIES) $(EXTRA_pzndrv1_DEPENDENCIES) + @rm -f pzndrv1$(EXEEXT) +- $(F77LINK) $(pzndrv1_OBJECTS) $(pzndrv1_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(pzndrv1_OBJECTS) $(pzndrv1_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -370,13 +449,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -384,26 +463,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -415,15 +483,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -432,6 +496,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -573,19 +652,19 @@ uninstall-am: uninstall-binPROGRAMS + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ +- clean-generic clean-libtool ctags distclean distclean-compile \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-binPROGRAMS ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ ++ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ++ ctags ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-binPROGRAMS \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/Makefile.in b/PARPACK/Makefile.in +index a3ffada..7559afb 100644 +--- a/PARPACK/Makefile.in ++++ b/PARPACK/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -98,30 +125,57 @@ libparpack_la_DEPENDENCIES = $(top_builddir)/SRC/libarpacksrc.la \ + $(top_builddir)/UTIL/libarpackutil.la \ + $(top_builddir)/PARPACK/SRC/MPI/libparpacksrcmpi.la \ + $(top_builddir)/PARPACK/UTIL/MPI/libparpackutilmpi.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + am_libparpack_la_OBJECTS = + libparpack_la_OBJECTS = $(am_libparpack_la_OBJECTS) +-libparpack_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ +- $(libparpack_la_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++libparpack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \ ++ $(AM_FFLAGS) $(FFLAGS) $(libparpack_la_LDFLAGS) $(LDFLAGS) -o \ ++ $@ ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libparpack_la_SOURCES) \ + $(nodist_EXTRA_libparpack_la_SOURCES) + DIST_SOURCES = $(libparpack_la_SOURCES) +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive ++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ++ ctags-recursive dvi-recursive html-recursive info-recursive \ ++ install-data-recursive install-dvi-recursive \ ++ install-exec-recursive install-html-recursive \ ++ install-info-recursive install-pdf-recursive \ ++ install-ps-recursive install-recursive installcheck-recursive \ ++ installdirs-recursive pdf-recursive ps-recursive \ ++ tags-recursive uninstall-recursive + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -129,9 +183,29 @@ am__can_run_installinfo = \ + esac + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++am__recursive_targets = \ ++ $(RECURSIVE_TARGETS) \ ++ $(RECURSIVE_CLEAN_TARGETS) \ ++ $(am__extra_recursive_targets) ++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -163,6 +237,7 @@ am__relativize = \ + reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -297,7 +372,7 @@ libparpack_la_LIBADD = \ + $(top_builddir)/UTIL/libarpackutil.la \ + $(top_builddir)/PARPACK/SRC/MPI/libparpacksrcmpi.la \ + $(top_builddir)/PARPACK/UTIL/MPI/libparpackutilmpi.la \ +- $(BLAS_LIBS) $(LAPACK_LIBS) ++ $(BLAS_LIBS) $(LAPACK_LIBS) $(MPILIBS) + + all: all-recursive + +@@ -333,6 +408,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(am__aclocal_m4_deps): ++ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ +@@ -359,14 +435,17 @@ uninstall-libLTLIBRARIES: + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(lib_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libparpack.la: $(libparpack_la_OBJECTS) $(libparpack_la_DEPENDENCIES) $(EXTRA_libparpack_la_DEPENDENCIES) +- $(libparpack_la_LINK) -rpath $(libdir) $(libparpack_la_OBJECTS) $(libparpack_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(libparpack_la_LINK) -rpath $(libdir) $(libparpack_la_OBJECTS) $(libparpack_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -375,13 +454,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -390,22 +469,25 @@ clean-libtool: + -rm -rf .libs _libs + + # This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++# into them and run 'make' without going through this Makefile. ++# To change the values of 'make' variables: instead of editing Makefiles, ++# (1) if the variable is set in 'config.status', edit 'config.status' ++# (which will cause the Makefiles to be regenerated when you run 'make'); ++# (2) otherwise, pass the desired values on the 'make' command line. ++$(am__recursive_targets): ++ @fail=; \ ++ if $(am__make_keepgoing); then \ ++ failcom='fail=yes'; \ ++ else \ ++ failcom='exit 1'; \ ++ fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ +@@ -420,57 +502,12 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-recursive ++TAGS: tags + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +@@ -486,12 +523,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -503,15 +535,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-recursive ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -520,6 +548,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-recursive ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -686,24 +729,22 @@ ps-am: + + uninstall-am: uninstall-libLTLIBRARIES + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am check check-am clean clean-generic \ +- clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-libLTLIBRARIES install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-libLTLIBRARIES ++.MAKE: $(am__recursive_targets) install-am install-strip ++ ++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ ++ check-am clean clean-generic clean-libLTLIBRARIES \ ++ clean-libtool cscopelist-am ctags ctags-am distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/SRC/BLACS/Makefile.in b/PARPACK/SRC/BLACS/Makefile.in +index 39472ed..1b6a0fe 100644 +--- a/PARPACK/SRC/BLACS/Makefile.in ++++ b/PARPACK/SRC/BLACS/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/SRC/BLACS +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -79,14 +106,38 @@ am_libparpacksrc_la_OBJECTS = pcgetv0.lo pdlamch.lo pdsaitr.lo \ + pscnorm2.lo psngets.lo pzlarnv.lo pdgetv0.lo pdnorm2.lo \ + psgetv0.lo psnorm2.lo pznaitr.lo + libparpacksrc_la_OBJECTS = $(am_libparpacksrc_la_OBJECTS) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libparpacksrc_la_SOURCES) + DIST_SOURCES = $(libparpacksrc_la_SOURCES) + am__can_run_installinfo = \ +@@ -94,11 +145,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -271,14 +340,17 @@ $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(noinst_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libparpacksrc.la: $(libparpacksrc_la_OBJECTS) $(libparpacksrc_la_DEPENDENCIES) $(EXTRA_libparpacksrc_la_DEPENDENCIES) +- $(F77LINK) $(libparpacksrc_la_OBJECTS) $(libparpacksrc_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(libparpacksrc_la_OBJECTS) $(libparpacksrc_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -287,13 +359,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -301,26 +373,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -332,15 +393,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -349,6 +406,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -488,18 +560,19 @@ uninstall-am: + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ ++ ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/SRC/MPI/Makefile.in b/PARPACK/SRC/MPI/Makefile.in +index 06f442f..273065e 100644 +--- a/PARPACK/SRC/MPI/Makefile.in ++++ b/PARPACK/SRC/MPI/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/SRC/MPI +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -69,8 +96,12 @@ libparpack_noopt_la_LIBADD = + am_libparpack_noopt_la_OBJECTS = libparpack_noopt_la-pslamch.lo \ + libparpack_noopt_la-pdlamch.lo + libparpack_noopt_la_OBJECTS = $(am_libparpack_noopt_la_OBJECTS) +-libparpack_noopt_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(F77LD) \ ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++libparpack_noopt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \ + $(libparpack_noopt_la_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + libparpacksrcmpi_la_DEPENDENCIES = libparpack_noopt.la +@@ -103,18 +134,38 @@ am_libparpacksrcmpi_la_OBJECTS = libparpacksrcmpi_la-psgetv0.lo \ + libparpacksrcmpi_la-pzgetv0.lo libparpacksrcmpi_la-pdznorm2.lo \ + libparpacksrcmpi_la-pzlarnv.lo + libparpacksrcmpi_la_OBJECTS = $(am_libparpacksrcmpi_la_OBJECTS) +-libparpacksrcmpi_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(F77LD) \ ++libparpacksrcmpi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \ + $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libparpack_noopt_la_SOURCES) \ + $(libparpacksrcmpi_la_SOURCES) + DIST_SOURCES = $(libparpack_noopt_la_SOURCES) \ +@@ -124,11 +175,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -307,16 +376,20 @@ $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(noinst_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libparpack_noopt.la: $(libparpack_noopt_la_OBJECTS) $(libparpack_noopt_la_DEPENDENCIES) $(EXTRA_libparpack_noopt_la_DEPENDENCIES) +- $(libparpack_noopt_la_LINK) $(libparpack_noopt_la_OBJECTS) $(libparpack_noopt_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(libparpack_noopt_la_LINK) $(libparpack_noopt_la_OBJECTS) $(libparpack_noopt_la_LIBADD) $(LIBS) ++ + libparpacksrcmpi.la: $(libparpacksrcmpi_la_OBJECTS) $(libparpacksrcmpi_la_DEPENDENCIES) $(EXTRA_libparpacksrcmpi_la_DEPENDENCIES) +- $(libparpacksrcmpi_la_LINK) $(libparpacksrcmpi_la_OBJECTS) $(libparpacksrcmpi_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(libparpacksrcmpi_la_LINK) $(libparpacksrcmpi_la_OBJECTS) $(libparpacksrcmpi_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -325,181 +398,181 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + libparpack_noopt_la-pslamch.lo: pslamch.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpack_noopt_la_FFLAGS) $(FFLAGS) -c -o libparpack_noopt_la-pslamch.lo `test -f 'pslamch.f' || echo '$(srcdir)/'`pslamch.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpack_noopt_la_FFLAGS) $(FFLAGS) -c -o libparpack_noopt_la-pslamch.lo `test -f 'pslamch.f' || echo '$(srcdir)/'`pslamch.f + + libparpack_noopt_la-pdlamch.lo: pdlamch.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpack_noopt_la_FFLAGS) $(FFLAGS) -c -o libparpack_noopt_la-pdlamch.lo `test -f 'pdlamch.f' || echo '$(srcdir)/'`pdlamch.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpack_noopt_la_FFLAGS) $(FFLAGS) -c -o libparpack_noopt_la-pdlamch.lo `test -f 'pdlamch.f' || echo '$(srcdir)/'`pdlamch.f + + libparpacksrcmpi_la-psgetv0.lo: psgetv0.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psgetv0.lo `test -f 'psgetv0.f' || echo '$(srcdir)/'`psgetv0.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psgetv0.lo `test -f 'psgetv0.f' || echo '$(srcdir)/'`psgetv0.f + + libparpacksrcmpi_la-psnaitr.lo: psnaitr.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnaitr.lo `test -f 'psnaitr.f' || echo '$(srcdir)/'`psnaitr.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnaitr.lo `test -f 'psnaitr.f' || echo '$(srcdir)/'`psnaitr.f + + libparpacksrcmpi_la-psnapps.lo: psnapps.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnapps.lo `test -f 'psnapps.f' || echo '$(srcdir)/'`psnapps.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnapps.lo `test -f 'psnapps.f' || echo '$(srcdir)/'`psnapps.f + + libparpacksrcmpi_la-psnaup2.lo: psnaup2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnaup2.lo `test -f 'psnaup2.f' || echo '$(srcdir)/'`psnaup2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnaup2.lo `test -f 'psnaup2.f' || echo '$(srcdir)/'`psnaup2.f + + libparpacksrcmpi_la-psnaupd.lo: psnaupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnaupd.lo `test -f 'psnaupd.f' || echo '$(srcdir)/'`psnaupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnaupd.lo `test -f 'psnaupd.f' || echo '$(srcdir)/'`psnaupd.f + + libparpacksrcmpi_la-psneigh.lo: psneigh.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psneigh.lo `test -f 'psneigh.f' || echo '$(srcdir)/'`psneigh.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psneigh.lo `test -f 'psneigh.f' || echo '$(srcdir)/'`psneigh.f + + libparpacksrcmpi_la-psngets.lo: psngets.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psngets.lo `test -f 'psngets.f' || echo '$(srcdir)/'`psngets.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psngets.lo `test -f 'psngets.f' || echo '$(srcdir)/'`psngets.f + + libparpacksrcmpi_la-pssaitr.lo: pssaitr.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssaitr.lo `test -f 'pssaitr.f' || echo '$(srcdir)/'`pssaitr.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssaitr.lo `test -f 'pssaitr.f' || echo '$(srcdir)/'`pssaitr.f + + libparpacksrcmpi_la-pssapps.lo: pssapps.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssapps.lo `test -f 'pssapps.f' || echo '$(srcdir)/'`pssapps.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssapps.lo `test -f 'pssapps.f' || echo '$(srcdir)/'`pssapps.f + + libparpacksrcmpi_la-pssaup2.lo: pssaup2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssaup2.lo `test -f 'pssaup2.f' || echo '$(srcdir)/'`pssaup2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssaup2.lo `test -f 'pssaup2.f' || echo '$(srcdir)/'`pssaup2.f + + libparpacksrcmpi_la-pssaupd.lo: pssaupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssaupd.lo `test -f 'pssaupd.f' || echo '$(srcdir)/'`pssaupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssaupd.lo `test -f 'pssaupd.f' || echo '$(srcdir)/'`pssaupd.f + + libparpacksrcmpi_la-psseigt.lo: psseigt.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psseigt.lo `test -f 'psseigt.f' || echo '$(srcdir)/'`psseigt.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psseigt.lo `test -f 'psseigt.f' || echo '$(srcdir)/'`psseigt.f + + libparpacksrcmpi_la-pssgets.lo: pssgets.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssgets.lo `test -f 'pssgets.f' || echo '$(srcdir)/'`pssgets.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pssgets.lo `test -f 'pssgets.f' || echo '$(srcdir)/'`pssgets.f + + libparpacksrcmpi_la-psneupd.lo: psneupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psneupd.lo `test -f 'psneupd.f' || echo '$(srcdir)/'`psneupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psneupd.lo `test -f 'psneupd.f' || echo '$(srcdir)/'`psneupd.f + + libparpacksrcmpi_la-psseupd.lo: psseupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psseupd.lo `test -f 'psseupd.f' || echo '$(srcdir)/'`psseupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psseupd.lo `test -f 'psseupd.f' || echo '$(srcdir)/'`psseupd.f + + libparpacksrcmpi_la-pslarnv.lo: pslarnv.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pslarnv.lo `test -f 'pslarnv.f' || echo '$(srcdir)/'`pslarnv.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pslarnv.lo `test -f 'pslarnv.f' || echo '$(srcdir)/'`pslarnv.f + + libparpacksrcmpi_la-psnorm2.lo: psnorm2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnorm2.lo `test -f 'psnorm2.f' || echo '$(srcdir)/'`psnorm2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-psnorm2.lo `test -f 'psnorm2.f' || echo '$(srcdir)/'`psnorm2.f + + libparpacksrcmpi_la-pdgetv0.lo: pdgetv0.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdgetv0.lo `test -f 'pdgetv0.f' || echo '$(srcdir)/'`pdgetv0.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdgetv0.lo `test -f 'pdgetv0.f' || echo '$(srcdir)/'`pdgetv0.f + + libparpacksrcmpi_la-pdnaitr.lo: pdnaitr.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnaitr.lo `test -f 'pdnaitr.f' || echo '$(srcdir)/'`pdnaitr.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnaitr.lo `test -f 'pdnaitr.f' || echo '$(srcdir)/'`pdnaitr.f + + libparpacksrcmpi_la-pdnapps.lo: pdnapps.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnapps.lo `test -f 'pdnapps.f' || echo '$(srcdir)/'`pdnapps.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnapps.lo `test -f 'pdnapps.f' || echo '$(srcdir)/'`pdnapps.f + + libparpacksrcmpi_la-pdnaup2.lo: pdnaup2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnaup2.lo `test -f 'pdnaup2.f' || echo '$(srcdir)/'`pdnaup2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnaup2.lo `test -f 'pdnaup2.f' || echo '$(srcdir)/'`pdnaup2.f + + libparpacksrcmpi_la-pdnaupd.lo: pdnaupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnaupd.lo `test -f 'pdnaupd.f' || echo '$(srcdir)/'`pdnaupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnaupd.lo `test -f 'pdnaupd.f' || echo '$(srcdir)/'`pdnaupd.f + + libparpacksrcmpi_la-pdneigh.lo: pdneigh.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdneigh.lo `test -f 'pdneigh.f' || echo '$(srcdir)/'`pdneigh.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdneigh.lo `test -f 'pdneigh.f' || echo '$(srcdir)/'`pdneigh.f + + libparpacksrcmpi_la-pdngets.lo: pdngets.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdngets.lo `test -f 'pdngets.f' || echo '$(srcdir)/'`pdngets.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdngets.lo `test -f 'pdngets.f' || echo '$(srcdir)/'`pdngets.f + + libparpacksrcmpi_la-pdsaitr.lo: pdsaitr.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsaitr.lo `test -f 'pdsaitr.f' || echo '$(srcdir)/'`pdsaitr.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsaitr.lo `test -f 'pdsaitr.f' || echo '$(srcdir)/'`pdsaitr.f + + libparpacksrcmpi_la-pdsapps.lo: pdsapps.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsapps.lo `test -f 'pdsapps.f' || echo '$(srcdir)/'`pdsapps.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsapps.lo `test -f 'pdsapps.f' || echo '$(srcdir)/'`pdsapps.f + + libparpacksrcmpi_la-pdsaup2.lo: pdsaup2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsaup2.lo `test -f 'pdsaup2.f' || echo '$(srcdir)/'`pdsaup2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsaup2.lo `test -f 'pdsaup2.f' || echo '$(srcdir)/'`pdsaup2.f + + libparpacksrcmpi_la-pdsaupd.lo: pdsaupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsaupd.lo `test -f 'pdsaupd.f' || echo '$(srcdir)/'`pdsaupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsaupd.lo `test -f 'pdsaupd.f' || echo '$(srcdir)/'`pdsaupd.f + + libparpacksrcmpi_la-pdseigt.lo: pdseigt.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdseigt.lo `test -f 'pdseigt.f' || echo '$(srcdir)/'`pdseigt.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdseigt.lo `test -f 'pdseigt.f' || echo '$(srcdir)/'`pdseigt.f + + libparpacksrcmpi_la-pdsgets.lo: pdsgets.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsgets.lo `test -f 'pdsgets.f' || echo '$(srcdir)/'`pdsgets.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdsgets.lo `test -f 'pdsgets.f' || echo '$(srcdir)/'`pdsgets.f + + libparpacksrcmpi_la-pdneupd.lo: pdneupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdneupd.lo `test -f 'pdneupd.f' || echo '$(srcdir)/'`pdneupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdneupd.lo `test -f 'pdneupd.f' || echo '$(srcdir)/'`pdneupd.f + + libparpacksrcmpi_la-pdseupd.lo: pdseupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdseupd.lo `test -f 'pdseupd.f' || echo '$(srcdir)/'`pdseupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdseupd.lo `test -f 'pdseupd.f' || echo '$(srcdir)/'`pdseupd.f + + libparpacksrcmpi_la-pdlarnv.lo: pdlarnv.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdlarnv.lo `test -f 'pdlarnv.f' || echo '$(srcdir)/'`pdlarnv.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdlarnv.lo `test -f 'pdlarnv.f' || echo '$(srcdir)/'`pdlarnv.f + + libparpacksrcmpi_la-pdnorm2.lo: pdnorm2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnorm2.lo `test -f 'pdnorm2.f' || echo '$(srcdir)/'`pdnorm2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdnorm2.lo `test -f 'pdnorm2.f' || echo '$(srcdir)/'`pdnorm2.f + + libparpacksrcmpi_la-pcnaitr.lo: pcnaitr.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnaitr.lo `test -f 'pcnaitr.f' || echo '$(srcdir)/'`pcnaitr.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnaitr.lo `test -f 'pcnaitr.f' || echo '$(srcdir)/'`pcnaitr.f + + libparpacksrcmpi_la-pcnapps.lo: pcnapps.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnapps.lo `test -f 'pcnapps.f' || echo '$(srcdir)/'`pcnapps.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnapps.lo `test -f 'pcnapps.f' || echo '$(srcdir)/'`pcnapps.f + + libparpacksrcmpi_la-pcnaup2.lo: pcnaup2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnaup2.lo `test -f 'pcnaup2.f' || echo '$(srcdir)/'`pcnaup2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnaup2.lo `test -f 'pcnaup2.f' || echo '$(srcdir)/'`pcnaup2.f + + libparpacksrcmpi_la-pcnaupd.lo: pcnaupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnaupd.lo `test -f 'pcnaupd.f' || echo '$(srcdir)/'`pcnaupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcnaupd.lo `test -f 'pcnaupd.f' || echo '$(srcdir)/'`pcnaupd.f + + libparpacksrcmpi_la-pcneigh.lo: pcneigh.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcneigh.lo `test -f 'pcneigh.f' || echo '$(srcdir)/'`pcneigh.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcneigh.lo `test -f 'pcneigh.f' || echo '$(srcdir)/'`pcneigh.f + + libparpacksrcmpi_la-pcneupd.lo: pcneupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcneupd.lo `test -f 'pcneupd.f' || echo '$(srcdir)/'`pcneupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcneupd.lo `test -f 'pcneupd.f' || echo '$(srcdir)/'`pcneupd.f + + libparpacksrcmpi_la-pcngets.lo: pcngets.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcngets.lo `test -f 'pcngets.f' || echo '$(srcdir)/'`pcngets.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcngets.lo `test -f 'pcngets.f' || echo '$(srcdir)/'`pcngets.f + + libparpacksrcmpi_la-pcgetv0.lo: pcgetv0.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcgetv0.lo `test -f 'pcgetv0.f' || echo '$(srcdir)/'`pcgetv0.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pcgetv0.lo `test -f 'pcgetv0.f' || echo '$(srcdir)/'`pcgetv0.f + + libparpacksrcmpi_la-pscnorm2.lo: pscnorm2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pscnorm2.lo `test -f 'pscnorm2.f' || echo '$(srcdir)/'`pscnorm2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pscnorm2.lo `test -f 'pscnorm2.f' || echo '$(srcdir)/'`pscnorm2.f + + libparpacksrcmpi_la-pclarnv.lo: pclarnv.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pclarnv.lo `test -f 'pclarnv.f' || echo '$(srcdir)/'`pclarnv.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pclarnv.lo `test -f 'pclarnv.f' || echo '$(srcdir)/'`pclarnv.f + + libparpacksrcmpi_la-pznaitr.lo: pznaitr.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznaitr.lo `test -f 'pznaitr.f' || echo '$(srcdir)/'`pznaitr.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznaitr.lo `test -f 'pznaitr.f' || echo '$(srcdir)/'`pznaitr.f + + libparpacksrcmpi_la-pznapps.lo: pznapps.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznapps.lo `test -f 'pznapps.f' || echo '$(srcdir)/'`pznapps.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznapps.lo `test -f 'pznapps.f' || echo '$(srcdir)/'`pznapps.f + + libparpacksrcmpi_la-pznaup2.lo: pznaup2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznaup2.lo `test -f 'pznaup2.f' || echo '$(srcdir)/'`pznaup2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznaup2.lo `test -f 'pznaup2.f' || echo '$(srcdir)/'`pznaup2.f + + libparpacksrcmpi_la-pznaupd.lo: pznaupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznaupd.lo `test -f 'pznaupd.f' || echo '$(srcdir)/'`pznaupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pznaupd.lo `test -f 'pznaupd.f' || echo '$(srcdir)/'`pznaupd.f + + libparpacksrcmpi_la-pzneigh.lo: pzneigh.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzneigh.lo `test -f 'pzneigh.f' || echo '$(srcdir)/'`pzneigh.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzneigh.lo `test -f 'pzneigh.f' || echo '$(srcdir)/'`pzneigh.f + + libparpacksrcmpi_la-pzneupd.lo: pzneupd.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzneupd.lo `test -f 'pzneupd.f' || echo '$(srcdir)/'`pzneupd.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzneupd.lo `test -f 'pzneupd.f' || echo '$(srcdir)/'`pzneupd.f + + libparpacksrcmpi_la-pzngets.lo: pzngets.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzngets.lo `test -f 'pzngets.f' || echo '$(srcdir)/'`pzngets.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzngets.lo `test -f 'pzngets.f' || echo '$(srcdir)/'`pzngets.f + + libparpacksrcmpi_la-pzgetv0.lo: pzgetv0.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzgetv0.lo `test -f 'pzgetv0.f' || echo '$(srcdir)/'`pzgetv0.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzgetv0.lo `test -f 'pzgetv0.f' || echo '$(srcdir)/'`pzgetv0.f + + libparpacksrcmpi_la-pdznorm2.lo: pdznorm2.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdznorm2.lo `test -f 'pdznorm2.f' || echo '$(srcdir)/'`pdznorm2.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pdznorm2.lo `test -f 'pdznorm2.f' || echo '$(srcdir)/'`pdznorm2.f + + libparpacksrcmpi_la-pzlarnv.lo: pzlarnv.f +- $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzlarnv.lo `test -f 'pzlarnv.f' || echo '$(srcdir)/'`pzlarnv.f ++ $(AM_V_F77)$(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libparpacksrcmpi_la_FFLAGS) $(FFLAGS) -c -o libparpacksrcmpi_la-pzlarnv.lo `test -f 'pzlarnv.f' || echo '$(srcdir)/'`pzlarnv.f + + mostlyclean-libtool: + -rm -f *.lo +@@ -507,26 +580,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -538,15 +600,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -555,6 +613,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -694,18 +767,19 @@ uninstall-am: + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ ++ ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/SRC/Makefile.in b/PARPACK/SRC/Makefile.in +index a89d9f2..6e8f437 100644 +--- a/PARPACK/SRC/Makefile.in ++++ b/PARPACK/SRC/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,23 +14,51 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +78,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/SRC +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -63,15 +90,28 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive ++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ++ ctags-recursive dvi-recursive html-recursive info-recursive \ ++ install-data-recursive install-dvi-recursive \ ++ install-exec-recursive install-html-recursive \ ++ install-info-recursive install-pdf-recursive \ ++ install-ps-recursive install-recursive installcheck-recursive \ ++ installdirs-recursive pdf-recursive ps-recursive \ ++ tags-recursive uninstall-recursive + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -79,9 +119,29 @@ am__can_run_installinfo = \ + esac + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++am__recursive_targets = \ ++ $(RECURSIVE_TARGETS) \ ++ $(RECURSIVE_CLEAN_TARGETS) \ ++ $(am__extra_recursive_targets) ++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -113,6 +173,7 @@ am__relativize = \ + reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -276,22 +337,25 @@ clean-libtool: + -rm -rf .libs _libs + + # This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++# into them and run 'make' without going through this Makefile. ++# To change the values of 'make' variables: instead of editing Makefiles, ++# (1) if the variable is set in 'config.status', edit 'config.status' ++# (which will cause the Makefiles to be regenerated when you run 'make'); ++# (2) otherwise, pass the desired values on the 'make' command line. ++$(am__recursive_targets): ++ @fail=; \ ++ if $(am__make_keepgoing); then \ ++ failcom='fail=yes'; \ ++ else \ ++ failcom='exit 1'; \ ++ fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ +@@ -306,57 +370,12 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-recursive ++TAGS: tags + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +@@ -372,12 +391,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -389,15 +403,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-recursive ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -406,6 +416,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-recursive ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -566,22 +591,20 @@ ps-am: + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am check check-am clean clean-generic clean-libtool \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am ++.MAKE: $(am__recursive_targets) install-am install-strip ++ ++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ ++ check-am clean clean-generic clean-libtool cscopelist-am ctags \ ++ ctags-am distclean distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/UTIL/BLACS/Makefile.in b/PARPACK/UTIL/BLACS/Makefile.in +index ed1003d..11a6b0a 100644 +--- a/PARPACK/UTIL/BLACS/Makefile.in ++++ b/PARPACK/UTIL/BLACS/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/UTIL/BLACS +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -69,14 +96,38 @@ libparpackutilblacs_la_LIBADD = + am_libparpackutilblacs_la_OBJECTS = pcmout.lo pcvout.lo pdmout.lo \ + pdvout.lo pivout.lo psmout.lo psvout.lo pzmout.lo pzvout.lo + libparpackutilblacs_la_OBJECTS = $(am_libparpackutilblacs_la_OBJECTS) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libparpackutilblacs_la_SOURCES) + DIST_SOURCES = $(libparpackutilblacs_la_SOURCES) + am__can_run_installinfo = \ +@@ -84,11 +135,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -252,14 +321,17 @@ $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(noinst_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libparpackutilblacs.la: $(libparpackutilblacs_la_OBJECTS) $(libparpackutilblacs_la_DEPENDENCIES) $(EXTRA_libparpackutilblacs_la_DEPENDENCIES) +- $(F77LINK) $(libparpackutilblacs_la_OBJECTS) $(libparpackutilblacs_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(libparpackutilblacs_la_OBJECTS) $(libparpackutilblacs_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -268,13 +340,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -282,26 +354,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -313,15 +374,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -330,6 +387,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -469,18 +541,19 @@ uninstall-am: + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ ++ ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/UTIL/MPI/Makefile.in b/PARPACK/UTIL/MPI/Makefile.in +index d3ba1fe..7551a3c 100644 +--- a/PARPACK/UTIL/MPI/Makefile.in ++++ b/PARPACK/UTIL/MPI/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/UTIL/MPI +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -69,14 +96,38 @@ libparpackutilmpi_la_LIBADD = + am_libparpackutilmpi_la_OBJECTS = pivout.lo psvout.lo psmout.lo \ + pdvout.lo pdmout.lo pcvout.lo pcmout.lo pzvout.lo pzmout.lo + libparpackutilmpi_la_OBJECTS = $(am_libparpackutilmpi_la_OBJECTS) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libparpackutilmpi_la_SOURCES) + DIST_SOURCES = $(libparpackutilmpi_la_SOURCES) + am__can_run_installinfo = \ +@@ -84,11 +135,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -252,14 +321,17 @@ $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(noinst_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libparpackutilmpi.la: $(libparpackutilmpi_la_OBJECTS) $(libparpackutilmpi_la_DEPENDENCIES) $(EXTRA_libparpackutilmpi_la_DEPENDENCIES) +- $(F77LINK) $(libparpackutilmpi_la_OBJECTS) $(libparpackutilmpi_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(libparpackutilmpi_la_OBJECTS) $(libparpackutilmpi_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -268,13 +340,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -282,26 +354,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -313,15 +374,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -330,6 +387,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -469,18 +541,19 @@ uninstall-am: + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ ++ ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/PARPACK/UTIL/Makefile.in b/PARPACK/UTIL/Makefile.in +index 84d0c21..0db143f 100644 +--- a/PARPACK/UTIL/Makefile.in ++++ b/PARPACK/UTIL/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,23 +14,51 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +78,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = PARPACK/UTIL +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -63,15 +90,28 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive ++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ++ ctags-recursive dvi-recursive html-recursive info-recursive \ ++ install-data-recursive install-dvi-recursive \ ++ install-exec-recursive install-html-recursive \ ++ install-info-recursive install-pdf-recursive \ ++ install-ps-recursive install-recursive installcheck-recursive \ ++ installdirs-recursive pdf-recursive ps-recursive \ ++ tags-recursive uninstall-recursive + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -79,9 +119,29 @@ am__can_run_installinfo = \ + esac + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++am__recursive_targets = \ ++ $(RECURSIVE_TARGETS) \ ++ $(RECURSIVE_CLEAN_TARGETS) \ ++ $(am__extra_recursive_targets) ++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -113,6 +173,7 @@ am__relativize = \ + reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -276,22 +337,25 @@ clean-libtool: + -rm -rf .libs _libs + + # This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++# into them and run 'make' without going through this Makefile. ++# To change the values of 'make' variables: instead of editing Makefiles, ++# (1) if the variable is set in 'config.status', edit 'config.status' ++# (which will cause the Makefiles to be regenerated when you run 'make'); ++# (2) otherwise, pass the desired values on the 'make' command line. ++$(am__recursive_targets): ++ @fail=; \ ++ if $(am__make_keepgoing); then \ ++ failcom='fail=yes'; \ ++ else \ ++ failcom='exit 1'; \ ++ fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ +@@ -306,57 +370,12 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-recursive ++TAGS: tags + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +@@ -372,12 +391,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -389,15 +403,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-recursive ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -406,6 +416,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-recursive ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -566,22 +591,20 @@ ps-am: + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am check check-am clean clean-generic clean-libtool \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am ++.MAKE: $(am__recursive_targets) install-am install-strip ++ ++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ ++ check-am clean clean-generic clean-libtool cscopelist-am ctags \ ++ ctags-am distclean distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/SRC/Makefile.in b/SRC/Makefile.in +index 868e08f..9802729 100644 +--- a/SRC/Makefile.in ++++ b/SRC/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = SRC +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -79,14 +106,38 @@ am_libarpacksrc_la_OBJECTS = sgetv0.lo slaqrb.lo sstqrb.lo ssortc.lo \ + znaitr.lo znapps.lo znaup2.lo znaupd.lo zneigh.lo zneupd.lo \ + zngets.lo zgetv0.lo zsortc.lo zstatn.lo + libarpacksrc_la_OBJECTS = $(am_libarpacksrc_la_OBJECTS) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libarpacksrc_la_SOURCES) + DIST_SOURCES = $(libarpacksrc_la_SOURCES) + am__can_run_installinfo = \ +@@ -94,11 +145,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -273,14 +342,17 @@ $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(noinst_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libarpacksrc.la: $(libarpacksrc_la_OBJECTS) $(libarpacksrc_la_DEPENDENCIES) $(EXTRA_libarpacksrc_la_DEPENDENCIES) +- $(F77LINK) $(libarpacksrc_la_OBJECTS) $(libarpacksrc_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(libarpacksrc_la_OBJECTS) $(libarpacksrc_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -289,13 +361,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -303,26 +375,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -334,15 +395,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -351,6 +408,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -490,18 +562,19 @@ uninstall-am: + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ ++ ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/TESTS/Makefile.in b/TESTS/Makefile.in +index 596d6af..e5a353e 100644 +--- a/TESTS/Makefile.in ++++ b/TESTS/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -53,7 +80,7 @@ build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = dnsimp$(EXEEXT) + subdir = TESTS +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -72,23 +99,56 @@ dnsimp_OBJECTS = $(am_dnsimp_OBJECTS) + am__DEPENDENCIES_1 = + dnsimp_DEPENDENCIES = ../libarpack.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CFLAGS) $(CFLAGS) ++AM_V_CC = $(am__v_CC_@AM_V@) ++am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) ++am__v_CC_0 = @echo " CC " $@; ++am__v_CC_1 = + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_CCLD = $(am__v_CCLD_@AM_V@) ++am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) ++am__v_CCLD_0 = @echo " CCLD " $@; ++am__v_CCLD_1 = + SOURCES = $(dnsimp_SOURCES) + DIST_SOURCES = $(dnsimp_SOURCES) + am__can_run_installinfo = \ +@@ -96,11 +156,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -268,10 +346,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ +- while read p p1; do if test -f $$p || test -f $$p1; \ +- then echo "$$p"; echo "$$p"; else :; fi; \ ++ while read p p1; do if test -f $$p \ ++ || test -f $$p1 \ ++ ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ +- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ sed -e 'p;s,.*/,,;n;h' \ ++ -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ +@@ -292,7 +372,8 @@ uninstall-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ +- -e 's/$$/$(EXEEXT)/' `; \ ++ -e 's/$$/$(EXEEXT)/' \ ++ `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files +@@ -305,9 +386,10 @@ clean-binPROGRAMS: + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list ++ + dnsimp$(EXEEXT): $(dnsimp_OBJECTS) $(dnsimp_DEPENDENCIES) $(EXTRA_dnsimp_DEPENDENCIES) + @rm -f dnsimp$(EXEEXT) +- $(F77LINK) $(dnsimp_OBJECTS) $(dnsimp_LDADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(dnsimp_OBJECTS) $(dnsimp_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -316,13 +398,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -330,26 +412,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -361,15 +432,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -378,6 +445,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -519,19 +601,19 @@ uninstall-am: uninstall-binPROGRAMS + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ +- clean-generic clean-libtool ctags distclean distclean-compile \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-binPROGRAMS ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ ++ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ++ ctags ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-binPROGRAMS \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/UTIL/Makefile.in b/UTIL/Makefile.in +index 02c2b55..824730d 100644 +--- a/UTIL/Makefile.in ++++ b/UTIL/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.13.3 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +79,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = UTIL +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_blas.m4 \ + $(top_srcdir)/m4/ax_lapack.m4 $(top_srcdir)/m4/ax_mpi.m4 \ +@@ -70,14 +97,38 @@ am_libarpackutil_la_OBJECTS = icnteq.lo icopy.lo iset.lo iswap.lo \ + ivout.lo second_NONE.lo svout.lo smout.lo dvout.lo dmout.lo \ + cvout.lo cmout.lo zvout.lo zmout.lo + libarpackutil_la_OBJECTS = $(am_libarpackutil_la_OBJECTS) ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) ++AM_V_F77 = $(am__v_F77_@AM_V@) ++am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) ++am__v_F77_0 = @echo " F77 " $@; ++am__v_F77_1 = + F77LD = $(F77) +-F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_F77LD = $(am__v_F77LD_@AM_V@) ++am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) ++am__v_F77LD_0 = @echo " F77LD " $@; ++am__v_F77LD_1 = + SOURCES = $(libarpackutil_la_SOURCES) + DIST_SOURCES = $(libarpackutil_la_SOURCES) + am__can_run_installinfo = \ +@@ -85,11 +136,29 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AS = @AS@ + AUTOCONF = @AUTOCONF@ +@@ -255,14 +324,17 @@ $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done ++ @list='$(noinst_LTLIBRARIES)'; \ ++ locs=`for p in $$list; do echo $$p; done | \ ++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ ++ sort -u`; \ ++ test -z "$$locs" || { \ ++ echo rm -f $${locs}; \ ++ rm -f $${locs}; \ ++ } ++ + libarpackutil.la: $(libarpackutil_la_OBJECTS) $(libarpackutil_la_DEPENDENCIES) $(EXTRA_libarpackutil_la_DEPENDENCIES) +- $(F77LINK) $(libarpackutil_la_OBJECTS) $(libarpackutil_la_LIBADD) $(LIBS) ++ $(AM_V_F77LD)$(F77LINK) $(libarpackutil_la_OBJECTS) $(libarpackutil_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -271,13 +343,13 @@ distclean-compile: + -rm -f *.tab.c + + .f.o: +- $(F77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ $< + + .f.obj: +- $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ $(AM_V_F77)$(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .f.lo: +- $(LTF77COMPILE) -c -o $@ $< ++ $(AM_V_F77)$(LTF77COMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -285,26 +357,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -316,15 +377,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -333,6 +390,21 @@ GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -472,18 +544,19 @@ uninstall-am: + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ ++ ctags-am distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff --git a/aclocal.m4 b/aclocal.m4 +index 3560423..375d1a7 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,8 +1,7 @@ +-# generated automatically by aclocal 1.11.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.13.3 -*- Autoconf -*- ++ ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +-# Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -12,33 +11,31 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, + [m4_warning([this file was generated for autoconf 2.69. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. +-To do so, use the procedure documented by the package, typically `autoreconf'.])]) ++To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 2002-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 1 +- + # AM_AUTOMAKE_VERSION(VERSION) + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' ++[am__api_version='1.13' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11.6], [], ++m4_if([$1], [1.13.3], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -54,24 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11.6])dnl ++[AM_AUTOMAKE_VERSION([1.13.3])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 1 +- + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to ++# '$srcdir', '$srcdir/..', or '$srcdir/../..'. + # + # Of course, Automake must honor this variable whenever it calls a + # tool from the auxiliary directory. The problem is that $srcdir (and +@@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + # + # The reason of the latter failure is that $top_srcdir and $ac_aux_dir + # are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you ++# harmless because $srcdir is '.', but things will broke when you + # start a VPATH build or use an absolute $srcdir. + # + # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +@@ -116,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +-# Free Software Foundation, Inc. ++# Copyright (C) 1997-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 +- + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- + # Define a conditional. + AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++[AC_PREREQ([2.52])dnl ++ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl + AC_SUBST([$1_TRUE])dnl + AC_SUBST([$1_FALSE])dnl + _AM_SUBST_NOTMAKE([$1_TRUE])dnl +@@ -150,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE( + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +-# 2010, 2011 Free Software Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 12 + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, + # will think it sees a *use*, and therefore will trigger all it's + # C support machinery. Also note that it means that autoscan, seeing +@@ -169,7 +159,7 @@ fi])]) + # _AM_DEPENDENCIES(NAME) + # ---------------------- + # See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". + # We try a few techniques and use that to set a single cache variable. + # + # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +@@ -182,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl + AC_REQUIRE([AM_MAKE_INCLUDE])dnl + AC_REQUIRE([AM_DEP_TRACK])dnl + +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], ++ [$1], [CXX], [depcc="$CXX" am_compiler_list=], ++ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], ++ [$1], [UPC], [depcc="$UPC" am_compiler_list=], ++ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + + AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +@@ -195,8 +186,8 @@ AC_CACHE_CHECK([dependency style of $depcc], + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. ++ # making a dummy file named 'D' -- because '-MD' means "put the output ++ # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're +@@ -236,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc], + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with ++ # Solaris 10 /bin/sh. ++ echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs ++ # handle '-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in +@@ -254,8 +245,8 @@ AC_CACHE_CHECK([dependency style of $depcc], + test "$am__universal" = false || continue + ;; + nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested ++ # After this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else +@@ -263,7 +254,7 @@ AC_CACHE_CHECK([dependency style of $depcc], + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has ++ # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} +@@ -311,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [ + # AM_SET_DEPDIR + # ------------- + # Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES. + AC_DEFUN([AM_SET_DEPDIR], + [AC_REQUIRE([AM_SET_LEADING_DOT])dnl + AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +@@ -321,9 +312,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl + # AM_DEP_TRACK + # ------------ + AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) ++[AC_ARG_ENABLE([dependency-tracking], [dnl ++AS_HELP_STRING( ++ [--enable-dependency-tracking], ++ [do not reject slow dependency extractors]) ++AS_HELP_STRING( ++ [--disable-dependency-tracking], ++ [speeds up one-time build])]) + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +@@ -338,20 +333,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl + + # Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 5 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + [{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in +@@ -364,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but ++ # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +@@ -376,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. ++ # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue ++ test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` +@@ -408,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + # This macro should only be invoked once -- use via AC_REQUIRE. + # + # This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will ++# is enabled. FIXME. This creates each '.P' file that we will + # need in order to bootstrap the dependency handling code. + AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], + [AC_CONFIG_COMMANDS([depfiles], +@@ -418,15 +409,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 16 +- + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. + +@@ -442,7 +430,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl ++[AC_PREREQ([2.65])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +@@ -471,31 +459,40 @@ AC_SUBST([CYGPATH_W]) + # Define the identity of the package. + dnl Distinguish between old-style and new-style calls. + m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++[AC_DIAGNOSE([obsolete], ++ [$0: two- and three-arguments forms are deprecated.]) ++m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl + dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++m4_if( ++ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), ++ [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + + _AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) ++ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + + # Some tools Automake needs. + AC_REQUIRE([AM_SANITY_CHECK])dnl + AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) ++AM_MISSING_PROG([AUTOCONF], [autoconf]) ++AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) ++AM_MISSING_PROG([AUTOHEADER], [autoheader]) ++AM_MISSING_PROG([MAKEINFO], [makeinfo]) + AC_REQUIRE([AM_PROG_INSTALL_SH])dnl + AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++# For better backward compatibility. To be removed once Automake 1.9.x ++# dies out for good. For more background, see: ++# ++# ++AC_SUBST([mkdir_p], ['$(MKDIR_P)']) + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + AC_REQUIRE([AC_PROG_AWK])dnl +@@ -506,28 +503,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++ [_AM_DEPENDENCIES([CC])], ++ [m4_define([AC_PROG_CC], ++ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++ [_AM_DEPENDENCIES([CXX])], ++ [m4_define([AC_PROG_CXX], ++ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl + AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++ [_AM_DEPENDENCIES([OBJC])], ++ [m4_define([AC_PROG_OBJC], ++ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], ++ [_AM_DEPENDENCIES([OBJCXX])], ++ [m4_define([AC_PROG_OBJCXX], ++ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl + ]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_REQUIRE([AM_SILENT_RULES])dnl ++dnl The testsuite driver may need to know about EXEEXT, so add the ++dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This ++dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. + AC_CONFIG_COMMANDS_PRE(dnl + [m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not + dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further + dnl mangled by Autoconf and run in a shell conditional statement. + m4_define([_AC_COMPILER_EXEEXT], +@@ -555,15 +556,12 @@ for _am_header in $config_headers :; do + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +-# Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 1 +- + # AM_PROG_INSTALL_SH + # ------------------ + # Define $install_sh. +@@ -577,16 +575,14 @@ if test x"${install_sh}" != xset; then + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac + fi +-AC_SUBST(install_sh)]) ++AC_SUBST([install_sh])]) + +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2003-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- + # Check whether the underlying file-system supports filenames + # with a leading dot. For instance MS-DOS doesn't. + AC_DEFUN([AM_SET_LEADING_DOT], +@@ -603,20 +599,17 @@ AC_SUBST([am__leading_dot])]) + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +-# 2011 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 +- + # AM_MAINTAINER_MODE([DEFAULT-MODE]) + # ---------------------------------- + # Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user ++# Default is to disable them, unless 'enable' is passed literally. ++# For symmetry, 'disable' may be passed as well. Anyway, the user + # can override the default with the --enable/--disable switch. + AC_DEFUN([AM_MAINTAINER_MODE], + [m4_case(m4_default([$1], [disable]), +@@ -627,10 +620,11 @@ AC_DEFUN([AM_MAINTAINER_MODE], + AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], ++ am_maintainer_other[ make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer])], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE +@@ -638,18 +632,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + ] + ) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +- + # Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 +- + # AM_MAKE_INCLUDE() + # ----------------- + # Check to see how make treats includes. +@@ -667,7 +657,7 @@ am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. ++# Ignore all kinds of additional output from 'make'. + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=include +@@ -694,15 +684,12 @@ rm -f confinc confmf + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. ++# Copyright (C) 1997-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 6 +- + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ + AC_DEFUN([AM_MISSING_PROG], +@@ -710,11 +697,10 @@ AC_DEFUN([AM_MISSING_PROG], + $1=${$1-"${am_missing_run}$2"} + AC_SUBST($1)]) + +- + # AM_MISSING_HAS_RUN + # ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. ++# Define MISSING if not defined so far and test if it is modern enough. ++# If it is, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl +@@ -727,54 +713,22 @@ if test x"${MISSING+set}" != xset; then + esac + fi + # Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if eval "$MISSING --is-lightweight"; then ++ am_missing_run="$MISSING " + else + am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++ AC_MSG_WARN(['missing' script is too old or missing]) + fi + ]) + +-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +-# Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 1 +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) +- + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +-# Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 +- + # _AM_MANGLE_OPTION(NAME) + # ----------------------- + AC_DEFUN([_AM_MANGLE_OPTION], +@@ -784,7 +738,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], + # -------------------- + # Set option NAME. Presently that only means defining a flag for this option. + AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + + # _AM_SET_OPTIONS(OPTIONS) + # ------------------------ +@@ -800,22 +754,16 @@ AC_DEFUN([_AM_IF_OPTION], + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 +- + # AM_SANITY_CHECK + # --------------- + AC_DEFUN([AM_SANITY_CHECK], + [AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' +@@ -826,32 +774,40 @@ case `pwd` in + esac + case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; + esac + +-# Do `set' in a subshell so we don't clobber the current shell's ++# Do 'set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi +- ++ am_has_slept=no ++ for am_try in 1 2; do ++ echo "timestamp, slept: $am_has_slept" > conftest.file ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++ alias in your environment]) ++ fi ++ if test "$[2]" = conftest.file || test $am_try -eq 2; then ++ break ++ fi ++ # Just in case. ++ sleep 1 ++ am_has_slept=yes ++ done + test "$[2]" = conftest.file + ) + then +@@ -861,46 +817,118 @@ else + AC_MSG_ERROR([newly created file is older than distributed files! + Check your system clock]) + fi +-AC_MSG_RESULT(yes)]) ++AC_MSG_RESULT([yes]) ++# If we didn't sleep, we still need to ensure time stamps of config.status and ++# generated files are strictly newer. ++am_sleep_pid= ++if grep 'slept: no' conftest.file >/dev/null 2>&1; then ++ ( sleep 1 ) & ++ am_sleep_pid=$! ++fi ++AC_CONFIG_COMMANDS_PRE( ++ [AC_MSG_CHECKING([that generated files are newer than configure]) ++ if test -n "$am_sleep_pid"; then ++ # Hide warnings about reused PIDs. ++ wait $am_sleep_pid 2>/dev/null ++ fi ++ AC_MSG_RESULT([done])]) ++rm -f conftest.file ++]) + +-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. ++# Copyright (C) 2009-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 1 ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# ("yes" being less verbose, "no" or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], [dnl ++AS_HELP_STRING( ++ [--enable-silent-rules], ++ [less verbose build output (undo: "make V=1")]) ++AS_HELP_STRING( ++ [--disable-silent-rules], ++ [verbose build output (undo: "make V=0")])dnl ++]) ++case $enable_silent_rules in @%:@ ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++dnl ++dnl A few 'make' implementations (e.g., NonStop OS and NextStep) ++dnl do not support nested variable expansions. ++dnl See automake bug#9928 and bug#10237. ++am_make=${MAKE-make} ++AC_CACHE_CHECK([whether $am_make supports nested variables], ++ [am_cv_make_support_nested_variables], ++ [if AS_ECHO([['TRUE=$(BAR$(V)) ++BAR0=false ++BAR1=true ++V=1 ++am__doit: ++ @$(TRUE) ++.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then ++ am_cv_make_support_nested_variables=yes ++else ++ am_cv_make_support_nested_variables=no ++fi]) ++if test $am_cv_make_support_nested_variables = yes; then ++ dnl Using '$V' instead of '$(V)' breaks IRIX make. ++ AM_V='$(V)' ++ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' ++else ++ AM_V=$AM_DEFAULT_VERBOSITY ++ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY ++fi ++AC_SUBST([AM_V])dnl ++AM_SUBST_NOTMAKE([AM_V])dnl ++AC_SUBST([AM_DEFAULT_V])dnl ++AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) ++ ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + + # AM_PROG_INSTALL_STRIP + # --------------------- +-# One issue with vendor `install' (even GNU) is that you can't ++# One issue with vendor 'install' (even GNU) is that you can't + # specify the program used to strip binaries. This is especially + # annoying in cross-compiling environments, where the build's strip + # is unlikely to handle the host's binaries. + # Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize ++# always use install-sh in "make install-strip", and initialize + # STRIPPROG with the value of the STRIP variable (set by the user). + AC_DEFUN([AM_PROG_INSTALL_STRIP], + [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right ++# Installed binaries are usually stripped using 'strip' when the user ++# run "make install-strip". However 'strip' might not be the right + # tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++# will honor the 'STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. ++# Copyright (C) 2006-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 +- + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- + # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +@@ -914,18 +942,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + + # Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. ++# Copyright (C) 2004-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- + # _AM_PROG_TAR(FORMAT) + # -------------------- + # Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. ++# FORMAT should be one of 'v7', 'ustar', or 'pax'. + # + # Substitute a variable $(am__tar) that is a command + # writing to stdout a FORMAT-tarball containing the directory +@@ -935,76 +961,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Substitute a variable $(am__untar) that extract such + # a tarball read from stdin. + # $(am__untar) < result.tar ++# + AC_DEFUN([_AM_PROG_TAR], + [# Always define AMTAR for backward compatibility. Yes, it's still used + # in the wild :-( We should find a proper way to deprecate it ... + AC_SUBST([AMTAR], ['$${TAR-tar}']) +-m4_if([$1], [v7], +- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. ++ ++# We'll loop over all known methods to create a tar archive until one works. + _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break ++m4_if([$1], [v7], ++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], ++ ++ [m4_case([$1], ++ [ustar], ++ [# The POSIX 1988 'ustar' format is defined with fixed-size fields. ++ # There is notably a 21 bits limit for the UID and the GID. In fact, ++ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 ++ # and bug#13588). ++ am_max_uid=2097151 # 2^21 - 1 ++ am_max_gid=$am_max_uid ++ # The $UID and $GID variables are not portable, so we need to resort ++ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls ++ # below are definitely unexpected, so allow the users to see them ++ # (that is, avoid stderr redirection). ++ am_uid=`id -u || echo unknown` ++ am_gid=`id -g || echo unknown` ++ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) ++ if test $am_uid -le $am_max_uid; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ _am_tools=none ++ fi ++ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) ++ if test $am_gid -le $am_max_gid; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ _am_tools=none ++ fi], ++ ++ [pax], ++ [], ++ ++ [m4_fatal([Unknown tar format])]) ++ ++ AC_MSG_CHECKING([how to create a $1 tar archive]) ++ ++ # Go ahead even if we have the value already cached. We do so because we ++ # need to set the values for the 'am__tar' and 'am__untar' variables. ++ _am_tools=${am_cv_prog_tar_$1-$_am_tools} ++ ++ for _am_tool in $_am_tools; do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works. ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++ done + rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++ AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++ + AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR +diff --git a/configure b/configure +index e32e9c7..6155677 100755 +--- a/configure ++++ b/configure +@@ -697,6 +697,10 @@ F77 + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE ++AM_BACKSLASH ++AM_DEFAULT_VERBOSITY ++AM_DEFAULT_V ++AM_V + am__untar + am__tar + AMTAR +@@ -761,6 +765,7 @@ SHELL' + ac_subst_files='' + ac_user_opts=' + enable_option_checking ++enable_silent_rules + enable_maintainer_mode + enable_shared + enable_static +@@ -1404,14 +1409,19 @@ Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer ++ --enable-silent-rules less verbose build output (undo: "make V=1") ++ --disable-silent-rules verbose build output (undo: "make V=0") ++ --enable-maintainer-mode ++ enable make rules and dependencies not useful (and ++ sometimes confusing) to the casual installer + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] +- --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors ++ --enable-dependency-tracking ++ do not reject slow dependency extractors ++ --disable-dependency-tracking ++ speeds up one-time build + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-mpi build parallel version of arpack with MPI + +@@ -2215,7 +2225,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-am__api_version='1.11' ++am__api_version='1.13' + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -2341,9 +2351,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } +-# Just in case +-sleep 1 +-echo timestamp > conftest.file + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' +@@ -2354,32 +2361,40 @@ case `pwd` in + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; + esac + +-# Do `set' in a subshell so we don't clobber the current shell's ++# Do 'set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$*" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$*" != "X $srcdir/configure conftest.file" \ +- && test "$*" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +-alias in your environment" "$LINENO" 5 +- fi +- ++ am_has_slept=no ++ for am_try in 1 2; do ++ echo "timestamp, slept: $am_has_slept" > conftest.file ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$*" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ if test "$*" != "X $srcdir/configure conftest.file" \ ++ && test "$*" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken ++ alias in your environment" "$LINENO" 5 ++ fi ++ if test "$2" = conftest.file || test $am_try -eq 2; then ++ break ++ fi ++ # Just in case. ++ sleep 1 ++ am_has_slept=yes ++ done + test "$2" = conftest.file + ) + then +@@ -2391,6 +2406,16 @@ Check your system clock" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } ++# If we didn't sleep, we still need to ensure time stamps of config.status and ++# generated files are strictly newer. ++am_sleep_pid= ++if grep 'slept: no' conftest.file >/dev/null 2>&1; then ++ ( sleep 1 ) & ++ am_sleep_pid=$! ++fi ++ ++rm -f conftest.file ++ + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. +@@ -2413,12 +2438,12 @@ if test x"${MISSING+set}" != xset; then + esac + fi + # Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if eval "$MISSING --is-lightweight"; then ++ am_missing_run="$MISSING " + else + am_missing_run= +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + fi + + if test x"${install_sh}" != xset; then +@@ -2430,10 +2455,10 @@ if test x"${install_sh}" != xset; then + esac + fi + +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right ++# Installed binaries are usually stripped using 'strip' when the user ++# run "make install-strip". However 'strip' might not be the right + # tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. ++# will honor the 'STRIP' environment variable to overrule this program. + if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +@@ -2572,12 +2597,6 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + +-mkdir_p="$MKDIR_P" +-case $mkdir_p in +- [\\/$]* | ?:[\\/]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +- + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -2660,6 +2679,45 @@ else + fi + rmdir .tst 2>/dev/null + ++# Check whether --enable-silent-rules was given. ++if test "${enable_silent_rules+set}" = set; then : ++ enableval=$enable_silent_rules; ++fi ++ ++case $enable_silent_rules in # ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ *) AM_DEFAULT_VERBOSITY=1;; ++esac ++am_make=${MAKE-make} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 ++$as_echo_n "checking whether $am_make supports nested variables... " >&6; } ++if ${am_cv_make_support_nested_variables+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if $as_echo 'TRUE=$(BAR$(V)) ++BAR0=false ++BAR1=true ++V=1 ++am__doit: ++ @$(TRUE) ++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then ++ am_cv_make_support_nested_variables=yes ++else ++ am_cv_make_support_nested_variables=no ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 ++$as_echo "$am_cv_make_support_nested_variables" >&6; } ++if test $am_cv_make_support_nested_variables = yes; then ++ AM_V='$(V)' ++ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' ++else ++ AM_V=$AM_DEFAULT_VERBOSITY ++ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY ++fi ++AM_BACKSLASH='\' ++ + if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." +@@ -2710,12 +2768,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + ++# For better backward compatibility. To be removed once Automake 1.9.x ++# dies out for good. For more background, see: ++# ++# ++mkdir_p='$(MKDIR_P)' ++ + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. Yes, it's still used + # in the wild :-( We should find a proper way to deprecate it ... + AMTAR='$${TAR-tar}' + ++ ++# We'll loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar pax cpio none' ++ + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + +@@ -2723,6 +2791,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +@@ -3379,7 +3448,7 @@ am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. ++# Ignore all kinds of additional output from 'make'. + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=include +@@ -3973,8 +4042,8 @@ else + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. ++ # making a dummy file named 'D' -- because '-MD' means "put the output ++ # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're +@@ -4009,16 +4078,16 @@ else + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with ++ # Solaris 10 /bin/sh. ++ echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs ++ # handle '-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in +@@ -4027,8 +4096,8 @@ else + test "$am__universal" = false || continue + ;; + nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested ++ # After this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else +@@ -4036,7 +4105,7 @@ else + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has ++ # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} +@@ -16773,6 +16842,14 @@ LIBOBJS=$ac_libobjs + LTLIBOBJS=$ac_ltlibobjs + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 ++$as_echo_n "checking that generated files are newer than configure... " >&6; } ++ if test -n "$am_sleep_pid"; then ++ # Hide warnings about reused PIDs. ++ wait $am_sleep_pid 2>/dev/null ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 ++$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +@@ -18170,7 +18247,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { +- # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in +@@ -18183,7 +18260,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but ++ # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +@@ -18217,21 +18294,19 @@ $as_echo X"$mf" | + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. ++ # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue ++ test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +-- +1.8.3.1 + + +From 1ae47e63ddafd0fd958040ae7aaa20d40cfc7eda Mon Sep 17 00:00:00 2001 +From: Pauli Virtanen +Date: Wed, 28 Aug 2013 15:20:28 -0400 +Subject: [PATCH 5/6] Fix issue #1259 in DSEUPD and SSEUPD + +The Ritz vector purification step assumes workl(iq) still contains the +original Q matrix. This is however overwritten by the call to xGEQR2 +earlier. + +This patch fixes the issue by making a copy of the last row of the +eigenvector matrix, after it is recomputed after QR by xORM2R. The work +space WORKL(IW+NCV:IW+2*NCV) is not used later in the routine, and can +be used for this. + +Thanks to Wimmer for tracing the issue. + +--HG-- +extra : amend_source : 3ba6513783201433d5f7b9b2d1bcbc08a0554007 +--- + SRC/dseupd.f | 14 ++++++++++++-- + SRC/sseupd.f | 14 ++++++++++++-- + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/SRC/dseupd.f b/SRC/dseupd.f +index e510d3b..c18ef22 100644 +--- a/SRC/dseupd.f ++++ b/SRC/dseupd.f +@@ -760,6 +760,16 @@ c + & ldq , workl(iw+ncv), workl(ihb), + & ncv , temp , ierr) + c ++c %-----------------------------------------------------% ++c | Make a copy of the last row into | ++c | workl(iw+ncv:iw+2*ncv), as it is needed again in | ++c | the Ritz vector purification step below | ++c %-----------------------------------------------------% ++c ++ do 67 j = 1, nconv ++ workl(iw+ncv+j-1) = workl(ihb+j-1) ++ 67 continue ++ + else if (rvec .and. howmny .eq. 'S') then + c + c Not yet implemented. See remark 2 above. +@@ -830,14 +840,14 @@ c + if (rvec .and. (type .eq. 'SHIFTI' .or. type .eq. 'CAYLEY')) then + c + do 110 k=0, nconv-1 +- workl(iw+k) = workl(iq+k*ldq+ncv-1) ++ workl(iw+k) = workl(iw+ncv+k) + & / workl(iw+k) + 110 continue + c + else if (rvec .and. type .eq. 'BUCKLE') then + c + do 120 k=0, nconv-1 +- workl(iw+k) = workl(iq+k*ldq+ncv-1) ++ workl(iw+k) = workl(iw+ncv+k) + & / (workl(iw+k)-one) + 120 continue + c +diff --git a/SRC/sseupd.f b/SRC/sseupd.f +index 35eb812..9349d11 100644 +--- a/SRC/sseupd.f ++++ b/SRC/sseupd.f +@@ -760,6 +760,16 @@ c + & ldq , workl(iw+ncv), workl(ihb), + & ncv , temp , ierr) + c ++c %-----------------------------------------------------% ++c | Make a copy of the last row into | ++c | workl(iw+ncv:iw+2*ncv), as it is needed again in | ++c | the Ritz vector purification step below | ++c %-----------------------------------------------------% ++c ++ do 67 j = 1, nconv ++ workl(iw+ncv+j-1) = workl(ihb+j-1) ++ 67 continue ++ + else if (rvec .and. howmny .eq. 'S') then + c + c Not yet implemented. See remark 2 above. +@@ -830,14 +840,14 @@ c + if (rvec .and. (type .eq. 'SHIFTI' .or. type .eq. 'CAYLEY')) then + c + do 110 k=0, nconv-1 +- workl(iw+k) = workl(iq+k*ldq+ncv-1) ++ workl(iw+k) = workl(iw+ncv+k) + & / workl(iw+k) + 110 continue + c + else if (rvec .and. type .eq. 'BUCKLE') then + c + do 120 k=0, nconv-1 +- workl(iw+k) = workl(iq+k*ldq+ncv-1) ++ workl(iw+k) = workl(iw+ncv+k) + & / (workl(iw+k)-one) + 120 continue + c +-- +1.8.3.1 + + +From 0fea7c6990ffeb83da45f1eb1aa4a668d68ec8b6 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Thu, 29 Aug 2013 10:54:15 +0200 +Subject: [PATCH 6/6] update of the changelog + +--- + CHANGES | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/CHANGES b/CHANGES +index a11e209..996a54b 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,17 @@ ++arpack-ng - 3.1.5 ++ ++ * Fix issue #1259 in DSEUPD and SSEUPD ++ The Ritz vector purification step assumes workl(iq) still contains the ++ original Q matrix. This is however overwritten by the call to xGEQR2 ++ earlier. ++ . ++ This patch fixes the issue by making a copy of the last row of the ++ eigenvector matrix, after it is recomputed after QR by xORM2R. The work ++ space WORKL(IW+NCV:IW+2*NCV) is not used later in the routine, and can ++ be used for this. ++ ++ -- Sylvestre Ledru Thu, 29 Aug 2013 10:53:03 +0200 ++ + arpack-ng - 3.1.4 + + * libparpack2: missing dependency on MPI: +-- +1.8.3.1 + -- GitLab From cd6fb5b614568b3cf560649398869b5644f027fd Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 4 Nov 2013 11:00:59 +0100 Subject: [PATCH 182/811] arpack-ng: added libparpack to sanity check --- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb index f81c910467..ca2cadff5f 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb @@ -20,7 +20,7 @@ patches = [ configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' sanity_check_paths = { - 'files': ["lib/libarpack.a", "lib/libarpack.so"], + 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libarpack.a"], 'dirs': [] } -- GitLab From 03e58ff94f0c61cd09d2c997c43b9f42f59527db Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 4 Nov 2013 11:01:33 +0100 Subject: [PATCH 183/811] arpack-ng: updated patches for ictce-5.3 build --- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb index a7cc90eaa8..a881a858db 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb @@ -10,7 +10,12 @@ toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True} source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['arpack-ng-3.1.3-configure-mpi.patch'] +# do not change the order of the patches or things will break +patches = [ + 'arpack-ng-3.1.3-update-to-head.patch', + 'arpack-ng-3.1.3-pkgconfig.patch', + 'arpack-ng-3.1.3-configure-mpi.patch', +] configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' -- GitLab From a629981ce81004a360f5b54038c6f0fc052b4da7 Mon Sep 17 00:00:00 2001 From: Xavier Besseron Date: Tue, 5 Nov 2013 15:57:47 +0100 Subject: [PATCH 184/811] Remove HDF5-serial easyconfigs based on the HDF5-serial easyblock and add new HDF5 easyconfigs without MPI-support --- .../h/HDF5-serial/configure_libtool.patch | 16 ---------------- .../HDF5-1.8.10-GCC-4.8.1-serial.eb} | 10 ++++------ .../HDF5-1.8.11-GCC-4.8.1-serial.eb} | 10 ++++------ 3 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch rename easybuild/easyconfigs/h/{HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb => HDF5/HDF5-1.8.10-GCC-4.8.1-serial.eb} (81%) rename easybuild/easyconfigs/h/{HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb => HDF5/HDF5-1.8.11-GCC-4.8.1-serial.eb} (81%) diff --git a/easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch b/easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch deleted file mode 100644 index 08b436b4a6..0000000000 --- a/easybuild/easyconfigs/h/HDF5-serial/configure_libtool.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- hdf5-1.8.7.orig/configure 2011-05-10 16:20:59.000000000 +0200 -+++ hdf5-1.8.7/configure 2012-06-19 10:39:14.925704379 +0200 -@@ -18836,11 +18836,13 @@ - # linked, so don't bother handling this case. - esac - else -+ if [ "${prev}${p}" != "-l" ]; then - if test -z "$postdeps_FC"; then - postdeps_FC="${prev}${p}" - else - postdeps_FC="${postdeps_FC} ${prev}${p}" - fi -+ fi - fi - prev= - ;; diff --git a/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-GCC-4.8.1-serial.eb similarity index 81% rename from easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb rename to easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-GCC-4.8.1-serial.eb index 1ad66be02d..9d10ec816c 100644 --- a/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.10-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-GCC-4.8.1-serial.eb @@ -1,21 +1,19 @@ -name = 'HDF5-serial' +name = 'HDF5' version = '1.8.10' - -easyblock = 'EB_HDF5_serial' +versionsuffix = '-serial' homepage = 'http://www.hdfgroup.org/HDF5/' description = """HDF5 is a unique technology suite that makes possible the management of extremely large and complex data collections.""" toolchain = {'name': 'GCC', 'version': '4.8.1'} - toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] -sources = ['hdf5-%(version)s.tar.gz'] +sources = [SOURCELOWER_TAR_GZ] dependencies = [ - ('zlib', '1.2.8'), + ('zlib', '1.2.7'), ('Szip', '2.1'), ] diff --git a/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-GCC-4.8.1-serial.eb similarity index 81% rename from easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb rename to easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-GCC-4.8.1-serial.eb index 9027b2ff87..d4743307f6 100644 --- a/easybuild/easyconfigs/h/HDF5-serial/HDF5-serial-1.8.11-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-GCC-4.8.1-serial.eb @@ -1,21 +1,19 @@ -name = 'HDF5-serial' +name = 'HDF5' version = '1.8.11' - -easyblock = 'EB_HDF5_serial' +versionsuffix = '-serial' homepage = 'http://www.hdfgroup.org/HDF5/' description = """HDF5 is a unique technology suite that makes possible the management of extremely large and complex data collections.""" toolchain = {'name': 'GCC', 'version': '4.8.1'} - toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] -sources = ['hdf5-%(version)s.tar.gz'] +sources = [SOURCELOWER_TAR_GZ] dependencies = [ - ('zlib', '1.2.8'), + ('zlib', '1.2.7'), ('Szip', '2.1'), ] -- GitLab From 3d9aa8b04429553a9cb151011b8bd1bbcf2ab009 Mon Sep 17 00:00:00 2001 From: Xavier Besseron Date: Tue, 5 Nov 2013 17:04:51 +0100 Subject: [PATCH 185/811] Change zlib-1.2.8-GCC-4.8.1 to zlib-1.2.7-GCC-4.8.1 --- .../z/zlib/{zlib-1.2.8-GCC-4.8.1.eb => zlib-1.2.7-GCC-4.8.1.eb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename easybuild/easyconfigs/z/zlib/{zlib-1.2.8-GCC-4.8.1.eb => zlib-1.2.7-GCC-4.8.1.eb} (97%) diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb similarity index 97% rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb rename to easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb index 93fdc0a3b5..9dd779075e 100644 --- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb @@ -1,5 +1,5 @@ name = 'zlib' -version = '1.2.8' +version = '1.2.7' homepage = 'http://www.zlib.net/' description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, -- GitLab From 7d8e3d414540c58e60904db49e73e22d26e6ac39 Mon Sep 17 00:00:00 2001 From: Bart Verleye Date: Wed, 6 Nov 2013 16:26:23 +1300 Subject: [PATCH 186/811] Adding all easyconfigs files needed for the installation of paraview in gmpolf. Basically only the paraview eb is new, the others are made with --try-toolchain. --- .../b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb | 19 +++++++ .../b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb | 22 ++++++++ .../b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb | 14 +++++ .../c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb | 17 ++++++ .../c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb | 19 +++++++ .../d/DB/DB-5.3.28-gmpolf-1.4.8.eb | 18 +++++++ .../g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb | 19 +++++++ .../g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb | 15 ++++++ .../l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb | 15 ++++++ .../l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb | 20 +++++++ .../l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb | 17 ++++++ .../libreadline-6.2-gmpolf-1.4.8.eb | 23 ++++++++ .../m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb | 17 ++++++ .../m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb | 19 +++++++ .../m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb | 22 ++++++++ .../MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb | 21 ++++++++ .../o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb | 20 +++++++ .../p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb | 21 ++++++++ .../p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb | 19 +++++++ .../p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb | 21 ++++++++ .../p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 52 +++++++++++++++++++ .../easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb | 19 +++++++ .../SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb | 13 +++++ ...ficPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb | 30 +++++++++++ ...eSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb | 15 ++++++ .../z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb | 19 +++++++ 26 files changed, 526 insertions(+) create mode 100644 easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/d/DB/DB-5.3.28-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..e116d77620 --- /dev/null +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'BLACS' +version = '1.1' + +homepage = 'http://www.netlib.org/blacs/' +description = """The BLACS (Basic Linear Algebra Communication Subprograms) project is + an ongoing investigation whose purpose is to create a linear algebra oriented message passing interface + that may be implemented efficiently and uniformly across a large range of distributed memory platforms.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'gompi', 'version': '1.1.0-no-OFED'}) +toolchainopts = {'pic': True} + +sources = [ + 'mpiblacs.tgz', + 'mpiblacs-patch03.tgz' + ] +source_urls = [homepage] + +patches = ['bmake.mpi.patch'] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..98925b48ee --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb @@ -0,0 +1,22 @@ +name = 'Boost' +version = '1.51.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +dependencies = [('bzip2', '1.0.6')] + +configopts = '--without-libraries=python' + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] +#maxparallel=1 +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..729f070cf0 --- /dev/null +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb @@ -0,0 +1,14 @@ +name = 'bzip2' +version = '1.0.6' + +homepage = 'http://www.bzip.org/' +description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically + compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical + compressors), whilst being around twice as fast at compression and six times faster at decompression.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) +toolchainopts = {'pic': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.bzip.org/%(version)s/'] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..4112103015 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb @@ -0,0 +1,17 @@ +name = 'CMake' +version = "2.8.10.2" + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..b4c491760f --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'CMake' +version = '2.8.4' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/DB/DB-5.3.28-gmpolf-1.4.8.eb b/easybuild/easyconfigs/d/DB/DB-5.3.28-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..aa46c220a5 --- /dev/null +++ b/easybuild/easyconfigs/d/DB/DB-5.3.28-gmpolf-1.4.8.eb @@ -0,0 +1,18 @@ +name = 'DB' +version = '5.3.28' + +homepage = 'http://www.oracle.com/technetwork/products/berkeleydb' +description = """Berkeley DB enables the development of custom data management solutions, + without the overhead traditionally associated with such custom projects.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} + +# download via http://www.oracle.com/technetwork/products/berkeleydb/downloads/, requires registration +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ["include/db.h"], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..45fb82af4e --- /dev/null +++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'GLib' +version = '2.34.3' + +homepage = 'http://www.gtk.org/' +description = """GLib is one of the base libraries of the GTK+ project""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/'] +sources = ['glib-%(version)s.tar.xz'] + +dependencies = [ + ('libffi', '3.0.13'), + ('gettext', '0.18.2'), +] +builddependencies = [('Python', '2.7.3')] + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..9b1102a364 --- /dev/null +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb @@ -0,0 +1,15 @@ +name = 'gettext' +version = '0.18.2' + +homepage = 'http://www.gnu.org/software/gettext/' +description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may +build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools +and documentation""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] + +configopts = '--without-emacs' + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb new file mode 100644 index 0000000000..c68bfa3e9c --- /dev/null +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb @@ -0,0 +1,15 @@ +name = 'LAPACK' +version = "3.4.2" + +homepage = 'http://www.netlib.org/lapack/' +description = """LAPACK is written in Fortran90 and provides routines for solving systems of + simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue + problems, and singular value problems.""" + +toolchain = {'name': 'gmpich2', 'version': '1.4.8'} +toolchainopts = {'pic': True} + +sources = ['%(namelower)s-%(version)s.tgz'] +source_urls = [homepage] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..eab90dde3c --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb @@ -0,0 +1,20 @@ +name = 'libffi' +version = '3.0.11' + +homepage = 'http://sourceware.org/libffi' +description = """The libffi library provides a portable, high level programming interface to various calling conventions. + This allows a programmer to call any function specified by a call interface description at run-time. + +FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the interface that +allows code written in one language to call code written in another language.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['ftp://sourceware.org/pub/libffi/'] + +sanity_check_paths = { + 'files': ['lib/libffi.a'], + 'dirs': [] + } + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..b42c0e2586 --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb @@ -0,0 +1,17 @@ +name = 'libffi' +version = '3.0.13' + +homepage = 'http://sourceware.org/libffi/' +description = """The libffi library provides a portable, high level programming interface to various calling +conventions. This allows a programmer to call any function specified by a call interface description at run-time.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +source_urls = ['ftp://sourceware.org/pub/libffi/'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ['lib64/libffi.%s' % SHLIB_EXT, 'lib64/libffi.a'], + 'dirs': [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..7ee323fa94 --- /dev/null +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb @@ -0,0 +1,23 @@ +name = 'libreadline' +version = '6.2' + +homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html' +description = """The GNU Readline library provides a set of functions for use by applications that + allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. + The Readline library includes additional functions to maintain a list of previously-entered command lines, + to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +sources = ['readline-%(version)s.tar.gz'] +source_urls = ['http://ftpmirror.gnu.org/readline/'] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h', + 'rlstdc.h', 'rltypedefs.h', 'tilde.h']], + 'dirs' : [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..4e5decf1c2 --- /dev/null +++ b/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb @@ -0,0 +1,17 @@ +name = 'METIS' +version = '4.0.3' + +homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview' +description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes, + and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the + multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [ + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD', +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..299d995c99 --- /dev/null +++ b/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'METIS' +version = '5.0.2' + +homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview' +description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes, + and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the + multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [ + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD', +] + +dependencies = [('CMake', '2.8.4')] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb new file mode 100644 index 0000000000..96718532d3 --- /dev/null +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb @@ -0,0 +1,22 @@ +name = 'MPICH2' +version = '1.1' + +homepage = 'http://www.mpich.org/' +description = """MPICH v3.x is an open source high-performance MPI 3.0 implementation. +It does not support InfiniBand (use MVAPICH2 with InfiniBand devices).""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} + +sources = ['mpich2-%(version)s.tar.gz'] +source_urls = ['http://www.mpich.org/static/tarballs/%(version)s'] + +# MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS. +preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; ' + +sanity_check_paths = { + 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', + 'bin/mpiexec', 'bin/mpirun', 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], + 'dirs': [], +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb b/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb new file mode 100644 index 0000000000..7ab8745e78 --- /dev/null +++ b/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb @@ -0,0 +1,21 @@ +name = 'MUMPS' +version = '4.10.0' +versionsuffix = '-metis' + +homepage = 'http://graal.ens-lyon.fr/MUMPS/' +description = "A parallel sparse direct solver" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = ['http://mumps.enseeiht.fr/'] +sources = ['%(name)s_%(version)s.tar.gz'] + +dependencies = [ + ('SCOTCH', '6.0.0_esmumps'), + ('METIS', '4.0.3'), +] + +parallel = 1 +makeopts = 'all' + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..32c195a23a --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb @@ -0,0 +1,20 @@ +name = 'OpenSSL' +version = '1.0.0' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..e7c1d8ba57 --- /dev/null +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb @@ -0,0 +1,21 @@ +name = 'ParMETIS' +version = '3.2.0' + +homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' +description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, + meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes + routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in + ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning + schemes.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} + +source_urls = [ + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD', +] +sources = ['ParMetis-%(version)s.tar.gz'] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..ce6d6c382e --- /dev/null +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'ParMETIS' +version = '4.0.2' + +homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' +description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, + meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes + routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in + ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning + schemes.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} + +source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD'] +sources = [SOURCELOWER_TAR_GZ] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..9fa5a685d6 --- /dev/null +++ b/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb @@ -0,0 +1,21 @@ +easyblock = 'Paraview' +name = "Paraview" +version = "4.0.1" +versionsuffix ='' + +homepage = 'http://www.paraview.org' +description = 'Paraview is a scientific parallel visualizer' + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'usempi': True, 'pic': True} + +source_urls = ['http://www.paraview.org/paraview-downloads/'] +sources = [("download.php?submit=Download&version=v4.0&type=source&os=all&downloadFile=ParaView-v4.0.1-source.tgz",'tar xzf "%s"')] + +dependencies = [('Qt','4.8.5')] +preconfigopts = "mkdir obj && cd obj && " +preinstallopts="cd obj &&" +premakeopts ="cd obj &&" +srcdir="/home/bver018" +builddependencies = [('CMake', '2.8.10.2')] +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..7e5fa064a5 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -0,0 +1,52 @@ +name = 'Python' +version = '2.7.3' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.6.1' +scipyversion = '0.10.1' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '0.6c11', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('nose', '1.1.2', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.17.2', { + 'source_urls': ['http://www.cython.org/release/'], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..faddb7d77e --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'Qt' +version = '4.8.5' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} + +source_urls = ['http://download.qt-project.org/official_releases/qt/4.8/4.8.5/'] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +configopts="-confirm-license -opensource -silent" + +sanity_check_paths = { + 'files': ['lib/libQtCore.so'], + 'dirs': [], +} +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..2965588b4c --- /dev/null +++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb @@ -0,0 +1,13 @@ +name = 'SCOTCH' +version = '6.0.0_esmumps' + +homepage = 'http://www.labri.fr/perso/pelegrin/scotch/' +description = """Software package and libraries for sequential and parallel graph partitioning, +static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'pic': True} + +source_urls = ['https://gforge.inria.fr/frs/download.php/31832/'] +sources = ['%(namelower)s_%(version)s.tar.gz'] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb new file mode 100644 index 0000000000..57fd673afe --- /dev/null +++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb @@ -0,0 +1,30 @@ +easyblock = "PythonPackage" + +name = 'ScientificPython' +version = '2.8' + +homepage = 'https://sourcesup.cru.fr/projects/scientific-py/' +description = """ScientificPython is a collection of Python modules for scientific computing. + It contains support for geometry, mathematical functions, statistics, physical units, IO, visualization, + and parallelization.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [(python, pythonversion)] + +options = {'modulename': 'Scientific'} + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/Scientific' % pythonshortversion], +} + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb new file mode 100644 index 0000000000..b785bb3bb7 --- /dev/null +++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb @@ -0,0 +1,15 @@ +name = 'SuiteSparse' +version = '3.7.0' +versionsuffix = '-withparmetis' + +homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' +description = """SuiteSparse is a collection of libraries manipulate sparse matrices.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) +toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True} + +source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [('ParMETIS', '4.0.2')] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..6c43ff62ba --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb @@ -0,0 +1,19 @@ +name = 'zlib' +version = '1.2.7' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, +not covered by any patents -- lossless data-compression library for use on virtually any +computer hardware and operating system.""" +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 13143a1957033c026beff1ceeb691675c3f46f09 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 6 Nov 2013 17:15:29 +0100 Subject: [PATCH 187/811] Added numpy-1.8.0 with ictce-5.5.0 and Python-2.7.5 --- .../numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb | 27 +++ .../easyconfigs/n/numpy/numpy-1.8.0-mkl.patch | 213 ++++++++++++++++++ 2 files changed, 240 insertions(+) create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.8.0-mkl.patch diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..b251741e43 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,27 @@ +name = 'numpy' +version = '1.8.0' + +homepage = 'http://www.numpy.org' +description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things: + a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran + code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses, + NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be + defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCE_TAR_GZ] + +patches = ['numpy-1.8.0-mkl.patch'] + +python = 'Python' +pyver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.0-mkl.patch b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-mkl.patch new file mode 100644 index 0000000000..f2ffc7677b --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-mkl.patch @@ -0,0 +1,213 @@ +diff -ur numpy-1.8.0.orig/numpy/distutils/fcompiler/__init__.py numpy-1.8.0-2/numpy/distutils/fcompiler/__init__.py +--- numpy-1.8.0.orig/numpy/distutils/fcompiler/__init__.py 2013-10-30 19:31:40.000000000 +0100 ++++ numpy-1.8.0-2/numpy/distutils/fcompiler/__init__.py 2013-11-06 15:40:52.146711618 +0100 +@@ -628,7 +628,10 @@ + return options + + def library_option(self, lib): +- return "-l" + lib ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib + def library_dir_option(self, dir): + return "-L" + dir + +diff -ur numpy-1.8.0.orig/numpy/distutils/system_info.py numpy-1.8.0-2/numpy/distutils/system_info.py +--- numpy-1.8.0.orig/numpy/distutils/system_info.py 2013-10-30 19:31:40.000000000 +0100 ++++ numpy-1.8.0-2/numpy/distutils/system_info.py 2013-11-06 15:42:32.397199094 +0100 +@@ -600,7 +600,7 @@ + if is_string(default): + return [default] + return default +- return [b for b in [a.strip() for a in libs.split(',')] if b] ++ return [b for b in [a.strip().replace(':',',') for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): + return self.get_libs(key, '') +@@ -642,6 +642,23 @@ + lib_dirs) + return info + ++ def check_libs_all(self,lib_dir,libs,opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks for all libraries as shared libraries first, then ++ static (or vice versa if self.search_static_first is True). ++ """ ++ exts = self.library_extensions() ++ info = None ++ for ext in exts: ++ info = self._check_libs_all(lib_dir,libs,opt_libs,[ext]) ++ if info is not None: ++ break ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), lib_dir) ++ return info ++ + def check_libs2(self, lib_dirs, libs, opt_libs=[]): + """If static or shared libraries are available then return + their info dictionary. +@@ -655,6 +672,18 @@ + lib_dirs) + return info + ++ def check_libs2_all(self, lib_dirs, libs, opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks each library for shared or static. ++ """ ++ exts = self.library_extensions() ++ info = self._check_libs_all(lib_dirs,libs,opt_libs,exts) ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), os.pathsep.join(lib_dirs)) ++ return info ++ + def _lib_list(self, lib_dir, libs, exts): + assert is_string(lib_dir) + liblist = [] +@@ -665,6 +694,9 @@ + lib_prefixes = ['lib'] + # for each library name, see if we can find a file for it. + for l in libs: ++ if l[0]=='-': ++ liblist.append(l) ++ continue + for ext in exts: + for prefix in lib_prefixes: + p = self.combine_paths(lib_dir, prefix + l + ext) +@@ -680,6 +712,19 @@ + break + return liblist + ++ def _lib_list_all(self, lib_dirs, libs, exts): ++ assert (type(lib_dirs)==list) ++ if lib_dirs: ++ assert is_string(lib_dirs[0]) ++ liblist=[] ++ for lib_dir in lib_dirs: ++ ls=self._lib_list(lib_dir,libs,exts) ++ for l in ls: ++ log.info("(_lib_list_all) Found %s in %s"%(l,lib_dir)) ++ if l not in liblist: ++ liblist.append(l) ++ return liblist ++ + def _check_libs(self, lib_dirs, libs, opt_libs, exts): + """Find mandatory and optional libs in expected paths. + +@@ -721,6 +766,22 @@ + else: + return None + ++ def _check_libs_all(self, lib_dirs, libs, opt_libs, exts): ++ found_libs_unordered = self._lib_list_all(lib_dirs, libs, exts) ++ # ensure same order as in lib_dirs ++ found_libs = [] ++ for lib_dir in libs: ++ if lib_dir in found_libs_unordered: ++ found_libs.append(lib_dir) ++ if len(found_libs) == len(libs): ++ info = {'libraries' : found_libs, 'library_dirs' : lib_dirs} ++ opt_found_libs = self._lib_list_all(lib_dirs, opt_libs, exts) ++ if len(opt_found_libs) == len(opt_libs): ++ info['libraries'].extend(opt_found_libs) ++ return info ++ else: ++ return ++ + def combine_paths(self, *args): + """Return a list of existing paths composed by all combinations + of items from the arguments. +@@ -956,9 +1017,11 @@ + lib_dirs = self.get_lib_dirs() + incl_dirs = self.get_include_dirs() + mkl_libs = self.get_libs('mkl_libs', self._lib_mkl) +- info = self.check_libs2(lib_dirs, mkl_libs) +- if info is None: ++ mkl = None ++ mkl = self.check_libs2_all(lib_dirs,mkl_libs) ++ if mkl is None: + return ++ info = mkl + dict_append(info, + define_macros=[('SCIPY_MKL_H', None)], + include_dirs=incl_dirs) +@@ -1020,16 +1083,13 @@ + atlas = None + lapack = None + atlas_1 = None +- for d in lib_dirs: +- atlas = self.check_libs2(d, atlas_libs, []) +- lapack_atlas = self.check_libs2(d, ['lapack_atlas'], []) +- if atlas is not None: +- lib_dirs2 = [d] + self.combine_paths(d, ['atlas*', 'ATLAS*']) +- lapack = self.check_libs2(lib_dirs2, lapack_libs, []) +- if lapack is not None: +- break +- if atlas: +- atlas_1 = atlas ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs) ++ lapack_atlas = self.check_libs2_all(lib_dirs, ['lapack_atlas']) ++ if atlas is not None: ++ lib_dirs2 = lib_dirs + self.combine_paths(lib_dirs,['atlas*','ATLAS*']) ++ lapack = self.check_libs2_all(lib_dirs2, lapack_libs) ++ if atlas: ++ atlas_1 = atlas + log.info(self.__class__) + if atlas is None: + atlas = atlas_1 +@@ -1108,7 +1168,8 @@ + info = {} + atlas_libs = self.get_libs('atlas_libs', + self._lib_names + self._lib_atlas) +- atlas = self.check_libs2(lib_dirs, atlas_libs, []) ++ atlas = None ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs) + if atlas is None: + return + include_dirs = self.get_include_dirs() +@@ -1156,8 +1217,10 @@ + lib_dirs = self.get_lib_dirs() + + lapack_libs = self.get_libs('lapack_libs', self._lib_names) +- info = self.check_libs(lib_dirs, lapack_libs, []) +- if info is None: ++ lapack = self.check_libs_all(lib_dirs, lapack_libs, []) ++ if lapack is not None: ++ info = lapack ++ else: + return + info['language'] = 'f77' + self.set_info(**info) +@@ -1549,8 +1612,10 @@ + lib_dirs = self.get_lib_dirs() + + blas_libs = self.get_libs('blas_libs', self._lib_names) +- info = self.check_libs(lib_dirs, blas_libs, []) +- if info is None: ++ blas = self.check_libs_all(lib_dirs, blas_libs, []) ++ if blas is not None: ++ info = blas ++ else: + return + info['language'] = 'f77' # XXX: is it generally true? + self.set_info(**info) +diff -ur numpy-1.8.0.orig/numpy/distutils/unixccompiler.py numpy-1.8.0-2/numpy/distutils/unixccompiler.py +--- numpy-1.8.0.orig/numpy/distutils/unixccompiler.py 2013-10-30 19:31:40.000000000 +0100 ++++ numpy-1.8.0-2/numpy/distutils/unixccompiler.py 2013-11-06 15:38:08.942524314 +0100 +@@ -111,3 +111,12 @@ + + replace_method(UnixCCompiler, 'create_static_lib', + UnixCCompiler_create_static_lib) ++ ++def UnixCCompiler_library_option(self, lib): ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib ++ ++replace_method(UnixCCompiler, 'library_option', ++ UnixCCompiler_library_option) -- GitLab From a85b0c36348edd02bb2f15797d6d27358ffb6a81 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 6 Nov 2013 17:19:02 +0100 Subject: [PATCH 188/811] Update matplotlib to 1.3.1 with ictce-5.5.0 and Python-2.7.5 --- .../freetype/freetype-2.5.0.1-ictce-5.5.0.eb | 19 +++++++++++ .../l/libpng/libpng-1.6.6-ictce-5.5.0.eb | 17 ++++++++++ ...tplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb | 34 +++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..757c2ccb44 --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb @@ -0,0 +1,19 @@ +name = 'freetype' +version = '2.5.0.1' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +sources = [SOURCE_TAR_GZ] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb new file mode 100644 index 0000000000..cc63b4067d --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb @@ -0,0 +1,17 @@ +name = 'libpng' +version = '1.6.6' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.8')] + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..6dd46d0c4d --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,34 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.8'), + ('freetype', '2.5.0.1'), + ('libpng', '1.6.6'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], +} + +moduleclass = 'vis' -- GitLab From 32686ab7c544e398d415590102ce369503502545 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 6 Nov 2013 17:19:39 +0100 Subject: [PATCH 189/811] Libint-1.1.4: updated to ictce-5.5.0 --- .../l/Libint/Libint-1.1.4-ictce-5.5.0.eb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb new file mode 100644 index 0000000000..ea3ad71100 --- /dev/null +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb @@ -0,0 +1,24 @@ +name = 'Libint' +version = '1.1.4' + +homepage = 'http://www.files.chem.vt.edu/chem-dept/valeev/software/libint/libint.html' +description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body + matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'download') + +configopts = "--with-pic --enable-shared --enable-deriv --enable-r12" + +sanity_check_paths = { + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[] + } + +moduleclass = 'chem' -- GitLab From 4c7d5b60bd2883899d08b301f54e89c01bff0bca Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 6 Nov 2013 17:20:40 +0100 Subject: [PATCH 190/811] Added PyQuante 1.6.4 PyQuante is an open-source chemistry package for Python. --- .../p/PyQuante/PyQuante-1.6.4-Libint.patch | 29 +++++++++++++++++++ ...PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb | 27 +++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-Libint.patch create mode 100644 easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-Libint.patch b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-Libint.patch new file mode 100644 index 0000000000..a53daea471 --- /dev/null +++ b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-Libint.patch @@ -0,0 +1,29 @@ +--- setup.py.orig 2013-11-06 16:32:26.174723922 +0100 ++++ setup.py 2013-11-06 16:53:09.735778282 +0100 +@@ -83,19 +83,20 @@ + if enable_libint: + # Libint Extension compilation stuff + libint_static = [] # Libint object files ++ libint_prefix = os.environ["EBROOTLIBINT"] + for part in ["libint","libderiv","libr12"]: +- libint_static += glob.glob("libint-1.1.4/src/lib/%s/tmp/%s/.libs/*.o"%(part,part)) +- ++ libint_static += glob.glob("%s/lib/%s.a"%(libint_prefix,part)) ++ + # Error checking + if libint_static == []: + raise Exception("Object files not found, have you compiled libint with configure --enable-shared ?") +- ++ + # Preparing the extension +- libint_includes = ["libint-1.1.4/include/libint"] # Libint include dir +- ++ libint_includes = ["%s/include/libint"%libint_prefix] # Libint include dir ++ + lib_clibint =["Src/lib/clibint.c"] + lib_shell # Thin libint wrapper (actually one function, shell_compute) + clibint_ext_src = ["Src/PyQuante/clibint.c"] + lib_clibint # Need to add libint_static when linking +- ++ + clibint_ext = Extension("PyQuante.clibint", + clibint_ext_src, + include_dirs = lib_includes + libint_includes , diff --git a/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..3a6153e8db --- /dev/null +++ b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,27 @@ +name = 'PyQuante' +version = '1.6.4' + +homepage = 'http://pyquante.sourceforge.net' +description = """PyQuante is an open-source suite of programs for developing quantum chemistry methods. The program is written in the Python programming language, but has many 'rate-determining' modules also written in C for speed. The resulting code, though not as fast as Jaguar, NWChem, Gaussian, or MPQC, is much easier to understand and modify. The goal of this software is not necessarily to provide a working quantum chemistry program (although it will hopefully do that), but rather to provide a well-engineered set of tools so that scientists can construct their own quantum chemistry programs without going through the tedium of having to write every low-level routine.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCE_TAR_GZ] + +patches = ['PyQuante-1.6.4-Libint.patch'] + +python = 'Python' +pythonver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('numpy', '1.8.0', versionsuffix), + ('matplotlib', '1.3.1', versionsuffix), + ('Libint', '1.1.4'), +] + +options = {'modulename': 'PyQuante'} + +moduleclass = 'chem' -- GitLab From d6e9ef3cadf83ec3c59fdaad679913f4844cd185 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 6 Nov 2013 23:53:05 +0100 Subject: [PATCH 191/811] contrib qtop Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/q/qtop/qtop-53-1.eb | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 easybuild/easyconfigs/q/qtop/qtop-53-1.eb diff --git a/easybuild/easyconfigs/q/qtop/qtop-53-1.eb b/easybuild/easyconfigs/q/qtop/qtop-53-1.eb new file mode 100644 index 0000000000..c4d421186a --- /dev/null +++ b/easybuild/easyconfigs/q/qtop/qtop-53-1.eb @@ -0,0 +1,36 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +easyblock = "Tarball" + +name = 'qtop' +version = '53' +versionsuffix = '-1' + +homepage = 'http://cern.ch/fotis/QTOP/' +description = """qtop is a nifty command-line tool for monitoring queueing systems, esp. PBS/torque. + It tries to fit as much information as possible in your screen's real estate, + by stitching together the output of commands like pbsnodes -a, qstat & qstat -q. + It is possible to write wrappers for other platforms -people have done so for SGE, OAR etc- + or, even examine traces offline and present the sampled information.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# eg. https://cern.ch/fotis/QTOP/qtop-53.tar.gz +sources = [SOURCE_TAR_GZ] +source_urls = [homepage] + +sanity_check_paths = { + 'files': ["qtop"], + 'dirs': [] +} + +modextrapaths = {'PATH': ''} + +moduleclass = 'tools' -- GitLab From 76a8f3b8feabde67521485fe3d995802182ce581 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 7 Nov 2013 12:26:51 +0100 Subject: [PATCH 192/811] PyQuante: wrap description --- .../p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb index 3a6153e8db..35dc9bd2dd 100644 --- a/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb @@ -2,7 +2,13 @@ name = 'PyQuante' version = '1.6.4' homepage = 'http://pyquante.sourceforge.net' -description = """PyQuante is an open-source suite of programs for developing quantum chemistry methods. The program is written in the Python programming language, but has many 'rate-determining' modules also written in C for speed. The resulting code, though not as fast as Jaguar, NWChem, Gaussian, or MPQC, is much easier to understand and modify. The goal of this software is not necessarily to provide a working quantum chemistry program (although it will hopefully do that), but rather to provide a well-engineered set of tools so that scientists can construct their own quantum chemistry programs without going through the tedium of having to write every low-level routine.""" +description = """PyQuante is an open-source suite of programs for developing quantum chemistry methods. +The program is written in the Python programming language, but has many 'rate-determining' modules also +written in C for speed. The resulting code, though not as fast as Jaguar, NWChem, Gaussian, or MPQC, is +much easier to understand and modify. The goal of this software is not necessarily to provide a working +quantum chemistry program (although it will hopefully do that), but rather to provide a well-engineered +set of tools so that scientists can construct their own quantum chemistry programs without going through +the tedium of having to write every low-level routine.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -- GitLab From 66494436ddbfe97bb23166dc6d833f6f3704ed6b Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 8 Nov 2013 01:35:33 +0100 Subject: [PATCH 193/811] make GIMPS-p95v279.linux64.eb clean and lean Signed-off-by: Fotis Georgatos --- .../easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb index f222a32981..d8b83dfb03 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb @@ -14,16 +14,18 @@ version = 'p95v279.linux64' homepage = 'http://www.mersenne.org/' description = """GIMPS: Great Internet Mersenne Prime Search; - it can be useful for limited stress testing of nodes, in user space""" + it can be useful for limited stress testing of nodes, in user space""" toolchain = {'name': 'dummy', 'version': 'dummy'} -sources = [('%s.tar.gz' % version, 'tar xzf %s;mkdir bin;mv mprime bin')] # this hack ensures PATH is proper +sources = ['%(version)s.tar.gz'] source_urls = ['ftp://mersenne.org/%s/' % name.lower()] sanity_check_paths = { - 'files': ["bin/mprime"], - 'dirs': [] - } + 'files': ["mprime"], + 'dirs': [], +} + +modextrapaths = {'PATH': ''} moduleclass = 'tools' -- GitLab From b00442d3e2a087ec05f8fdc4888ae838b09cf020 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 8 Nov 2013 01:36:07 +0100 Subject: [PATCH 194/811] add c/cURL/cURL-7.33.0-GCC-4.8.2.eb Signed-off-by: Fotis Georgatos --- .../c/cURL/cURL-7.33.0-GCC-4.8.2.eb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb new file mode 100644 index 0000000000..fe4413aa66 --- /dev/null +++ b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb @@ -0,0 +1,22 @@ +name = 'cURL' +version = '7.33.0' + +homepage = 'http://curl.haxx.se' +description = """libcurl is a free and easy-to-use client-side URL transfer library, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports + SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, + proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, + Kerberos), file transfer resume, http proxy tunneling and more.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://curl.haxx.se/download/'] + +sanity_check_paths = { + 'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'tools' -- GitLab From 6b8e5c56fe147f3f98229f724ee26840fa6347c7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 8 Nov 2013 01:41:34 +0100 Subject: [PATCH 195/811] clean up GIMPS-p95v279-GCC-4.8.2.eb Signed-off-by: Fotis Georgatos --- ...goolf-1.4.10.eb => GIMPS-p95v279-GCC-4.8.2.eb} | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) rename easybuild/easyconfigs/g/GIMPS/{GIMPS-p95v279-goolf-1.4.10.eb => GIMPS-p95v279-GCC-4.8.2.eb} (73%) diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb similarity index 73% rename from easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb rename to easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb index 5c8bfec408..0cbc86e733 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb @@ -14,27 +14,24 @@ homepage = 'http://www.mersenne.org/' description = """GIMPS: Great Internet Mersenne Prime Search; it can be useful for limited stress testing of nodes, in user space""" -toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchain = {'name': 'GCC', 'version': '4.8.2'} -dependencies = [('cURL', '7.29.0')] +builddependencies = [('cURL', '7.33.0')] # eg. http://www.mersenne.info/gimps/p95v279.source.zip -sources = [('%s.source.zip' % version, 'unzip -qq %s ; /bin/true')] # workaround since unzip is in effect buggy +sources = [('%s.source.zip' % version, 'unzip -qq %s || /bin/true')] # workaround, since unzip IS effectively buggy source_urls = ['http://www.mersenne.info/%s' % name.lower()] # ref. https://bbs.archlinux.org/viewtopic.php?id=114996 & http://pastebin.com/PEFUUxHq patches = ['gimps-linux64.patch'] skipsteps = ['configure'] - start_dir = 'linux64' preinstallopts = ["PREFIX=%(installdir)s "] sanity_check_paths = { - 'files': ["bin/mprime"], - 'dirs': [] - } - -parallel = 1 + 'files': ["bin/mprime"], + 'dirs': [] +} moduleclass = 'tools' -- GitLab From e107196f38a1d4aecd667b6b9d39f7f6c4f9b5b6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 8 Nov 2013 02:43:19 +0100 Subject: [PATCH 196/811] specialize libpath and sanitychecks for latest Chapel Signed-off-by: Fotis Georgatos --- .../easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb index caf0ad21dc..d996fd401b 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb @@ -29,4 +29,15 @@ unpack_options = '--strip-components=1' # parallel build fails parallel = 1 +import os + +libpath = os.path.join('lib', + 'linux64.gnu.loc-flat.tasks-fifo.pthreads.tmr-generic.mem-default.atomics-intrinsics.gmp-none.re-none.wide-struct.fs-none') + +sanity_check_paths = { + 'files': ['bin/linux64/chpl', 'bin/linux64/chpldoc', + os.path.join(libpath, 'libchpl.a'), os.path.join(libpath, 'main.o')], + 'dirs': [], +} + moduleclass = 'lang' -- GitLab From e41ec6aa4803c9c446fe07a9b7128881452379a4 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 8 Nov 2013 02:43:30 +0100 Subject: [PATCH 197/811] add Chapel-1.8.0-goolf-1.6.10.eb Signed-off-by: Fotis Georgatos --- .../c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb new file mode 100644 index 0000000000..94e4cf582f --- /dev/null +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb @@ -0,0 +1,43 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = 'Chapel' +version = '1.8.0' + +homepage = 'http://chapel.cray.com' +description = """ Chapel is an emerging parallel programming language whose design and development + is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users + while also serving as a portable parallel programming model that can be used on commodity clusters + or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale + parallel computers while matching or beating the performance and portability of current programming + models like MPI.""" + +toolchain = {'name': 'goolf', 'version': '1.6.10'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [SOURCEFORGE_SOURCE] + +unpack_options = '--strip-components=1' + +# parallel build fails +parallel = 1 + +import os + +libpath = os.path.join('lib', + 'linux64.gnu.loc-flat.tasks-fifo.pthreads.tmr-generic.mem-default.atomics-intrinsics.gmp-none.re-none.wide-struct.fs-none') + +sanity_check_paths = { + 'files': ['bin/linux64/chpl', 'bin/linux64/chpldoc', + os.path.join(libpath, 'libchpl.a'), os.path.join(libpath, 'main.o')], + 'dirs': [], +} + +moduleclass = 'lang' -- GitLab From 551e1930af3aa1c51dd86a3cfaeff39e24479acf Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 8 Nov 2013 02:58:43 +0100 Subject: [PATCH 198/811] rewire libffi to more recent patched version and refactorize easyconfigs --- .../g/guile/guile-1.8.8-ictce-5.3.0.eb | 21 +++++++------- .../l/libffi/libffi-3.0.13-ictce-5.3.0.eb | 20 +++++++++++++ ...hon-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb | 28 ------------------- 3 files changed, 30 insertions(+), 39 deletions(-) create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb delete mode 100644 easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb index c2d30cc208..9b84ed765c 100644 --- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb @@ -5,26 +5,25 @@ homepage = 'http://www.gnu.org/software/guile' description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language for the GNU operating system.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%s-%s.tar.gz' % (name.lower(), version)] source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] dependencies = [ - ('libtool', '2.4.2'), - ('GMP', '5.0.5'), - ('libunistring', '0.9.3'), - ('pkg-config', '0.27.1'), - ('libffi', '3.0.11'), - ('libreadline', '6.2'), - ] + ('libtool', '2.4.2'), + ('GMP', '5.0.5'), + ('libunistring', '0.9.3'), + ('pkg-config', '0.27.1'), + ('libffi', '3.0.13'), + ('libreadline', '6.2'), +] configopts = " --enable-error-on-warning=no" sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"], + 'dirs': [] +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb new file mode 100644 index 0000000000..9c5be5f998 --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'libffi' +version = '3.0.13' + +homepage = 'http://sourceware.org/libffi/' +description = """The libffi library provides a portable, high level programming interface to various calling +conventions. This allows a programmer to call any function specified by a call interface description at run-time.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['ftp://sourceware.org/pub/libffi/'] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['libffi-3.0.13_include-xmmintrin.patch'] + +sanity_check_paths = { + 'files': ['lib/libffi.%s' % SHLIB_EXT, 'lib/libffi.a'], + 'dirs': [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb deleted file mode 100644 index a36e1a3a8d..0000000000 --- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-5.3.0-Python-2.7.3.eb +++ /dev/null @@ -1,28 +0,0 @@ -name = 'python-meep' -version = '1.4.2' - -homepage = 'https://code.launchpad.net/python-meep' -description = """Python wrapper for the Meep FDTD solver.""" - - -toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True} - -source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"] -sources = ['%s-%s.tar' % (name.lower(), version)] - -patches = [ - 'MPI_destructor_1.3.patch' - ] - -python = 'Python' -pythonver = '2.7.3' -versionsuffix = '-%s-%s' % (python, pythonver) - -dependencies = [ - (python, pythonver), - ('Meep', '1.2'), - ('SWIG', '2.0.4', '-%s-%s' % (python, pythonver)) - ] - -moduleclass = 'devel' -- GitLab From 4d57eef8c56364ed33a5587f4bfa4f82eca772f7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 8 Nov 2013 10:48:14 +0100 Subject: [PATCH 199/811] add easyconfigs for FLTK, Stride and SURF contributed by Dina during EB hackathon --- .../easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb | 17 ++++++++++ .../f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb | 27 +++++++++++++++ .../s/SURF/SURF-1.0-goolf-1.4.10.eb | 34 +++++++++++++++++++ .../s/Stride/Stride-1.0-goolf-1.4.10.eb | 24 +++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/SURF/SURF-1.0-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb new file mode 100644 index 0000000000..9dcd73edef --- /dev/null +++ b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'ed' +version = '1.9' + +homepage = 'http://www.gnu.org/software/ed/ed.html' +description = """GNU ed is a line-oriented text editor.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/%(name)s/'] + +sanity_check_paths = { + 'files' : ['bin/ed'], + 'dirs' : [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..434e420496 --- /dev/null +++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb @@ -0,0 +1,27 @@ +# +# author: Dina Mahmoud Ibrahim ( Cairo University ) +# +name = 'FLTK' +version = '1.3.2' + +homepage = 'http://www.fltk.org' +description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, + and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL + and its built-in GLUT emulation.""" + +toolchain = {'name': 'goolf' , 'version': '1.4.10'} + +sources = ['%(namelower)s-%(version)s-source.tar.gz'] +source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/'] + +dependencies = [ + ('Tcl', '8.5.12'), + ('Tk', '8.5.12'), +] + +sanity_check_paths = { + 'files': ['bin/fltk-config','bin/fluid'], + 'dirs': ['lib'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/s/SURF/SURF-1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SURF/SURF-1.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..fc4e13aba2 --- /dev/null +++ b/easybuild/easyconfigs/s/SURF/SURF-1.0-goolf-1.4.10.eb @@ -0,0 +1,34 @@ +# +# author: Dina Mahmoud Ibrahim ( Cairo University ) +# +easyblock = 'MakeCp' + +name = 'SURF' +version = '1.0' +ARCH = 'LINUXAMD64' +versionsuffix = '-%s' % ARCH + +homepage = 'http://www.ks.uiuc.edu/Research/vmd/vmd-1.7/ug/node65.html' +description = "A molecular surface solver, which can be used as rendering method in VMD." + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://www.ks.uiuc.edu/Research/vmd/extsrcs'] +sources = [('%(namelower)s.tar.Z', 'tar -xzf %s')] + +builddependencies = [ + ('makedepend', '1.0.4'), + ('ed', '1.9'), +] + +premakeopts = 'make INCLUDE="-I. -I$EBROOTGCC/lib/gcc/x86_64-unknown-linux-gnu/$EBVERSIONGCC/include" depend && ' +makeopts = ' && mv surf surf_%s' % ARCH + +files_to_copy = [(['surf_%s' % ARCH], "bin")] + +sanity_check_paths = { + 'files': ['bin/surf_%s' % ARCH], + 'dirs': [], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..5ab1176c2f --- /dev/null +++ b/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb @@ -0,0 +1,24 @@ +# +# author: Dina Mahmoud Ibrahim ( Cairo University ) +# +easyblock = 'MakeCp' + +name = "Stride" +version = "1.0" + +homepage = 'http://structure.usc.edu/stride/' +description = "STRIDE is a program to recognize secondary structural elements in proteins from their atomic coordinates" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://ftp.ebi.ac.uk/pub/software/unix/stride/src/'] +sources = ['%(namelower)s.tar.gz' ] + +files_to_copy = [(['stride'], "bin")] + +sanity_check_paths = { + 'files': ['bin/stride'], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From 585e76b79a5095083d6542c3e8a32b26089ed403 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 18:20:50 +0100 Subject: [PATCH 200/811] Updated Eigen to 3.1.4 with ictce-5.5.0 --- .../e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb new file mode 100644 index 0000000000..b2a72e5cf0 --- /dev/null +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb @@ -0,0 +1,27 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'Eigen' +version = '3.1.4' + +homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' +description = """Eigen is a C++ template library for linear algebra: + matrices, vectors, numerical solvers, and related algorithms.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = ['%s.tar.bz2' % version] +source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] + +moduleclass = 'math' -- GitLab From 4165ee5050a1eeb4884a941d62e1e6e52a40ddb6 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 18:21:23 +0100 Subject: [PATCH 201/811] Updated CMake to 2.8.12 with ictce-5.5.0 --- .../c/CMake/CMake-2.8.12-ictce-5.5.0.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.5.0.eb new file mode 100644 index 0000000000..f8ec2041f7 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.5.0.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From 48a2543e49aa30e99e2447ab551ffda2431fb263 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 18:22:17 +0100 Subject: [PATCH 202/811] Updated libint2 to build with ictce 5.5.0 --- .../l/libint2/libint2-2.0.3-ictce-5.5.0.eb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..a30d2713b0 --- /dev/null +++ b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb @@ -0,0 +1,21 @@ +easyblock = "EB_libint2" + +name = 'libint2' +version = '2.0.3' + +homepage = 'http://www.files.chem.vt.edu/chem-dept/valeev/software/libint/libint.html' +description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body + matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +sources = ['libint-%(version)s-stable.tgz'] +source_urls = ['http://downloads.sourceforge.net/project/libint/libint-for-mpqc'] + +sanity_check_paths = { + 'files': ['lib/libint2.a', 'lib/libint2.so', 'include/libint2/libint2.h'], + 'dirs': [], +} + +moduleclass = 'chem' -- GitLab From ba4faeef739457876c1f17f6f035770c94458a1a Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 18:22:51 +0100 Subject: [PATCH 203/811] Added OpenBabel 2.3.2 with ictce 5.5.0 --- .../l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb | 22 +++++++++ .../OpenBabel-2.3.2-fix-link-path-tests.patch | 47 +++++++++++++++++++ .../OpenBabel-2.3.2-ignore-failed-test.patch | 11 +++++ .../OpenBabel/OpenBabel-2.3.2-use-xHost.patch | 15 ++++++ .../o/OpenBabel/OpenBabel-2.3.2.eb | 39 +++++++++++++++ 5 files changed, 134 insertions(+) create mode 100644 easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch create mode 100644 easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch create mode 100644 easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch create mode 100644 easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..5c7f304740 --- /dev/null +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb @@ -0,0 +1,22 @@ +easyblock = 'ConfigureMake' + +name = 'libxml2' +version = '2.9.1' + +homepage = 'http://xmlsoft.org/' +description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project + (but usable outside of the Gnome platform).""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [ + 'http://xmlsoft.org/sources/', + 'http://xmlsoft.org/sources/old/' +] +sources = [SOURCELOWER_TAR_GZ] + +configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python' + +dependencies = [('zlib', '1.2.8')] + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch new file mode 100644 index 0000000000..c18e0b45e0 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch @@ -0,0 +1,47 @@ +--- a/test/CMakeLists.txt 2013-11-08 17:23:06.533668767 +0100 ++++ b/test/CMakeLists.txt 2013-11-08 17:23:09.905655675 +0100 +@@ -64,7 +64,7 @@ + add_test(${test}_Test ${TEST_PATH}/test_${test}) + set_tests_properties(${test}_Test PROPERTIES + FAIL_REGULAR_EXPRESSION "ERROR;FAIL;Test failed" +- ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") ++ ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}") + endforeach(test ${tests}) + + ############################################################ +@@ -127,7 +127,7 @@ + ${TEST_PATH}/test_inchiwrite ${inchidata}/${test} ${inchidata}/${test}.txt) + set_tests_properties(inchi${test}_Test PROPERTIES + FAIL_REGULAR_EXPRESSION "Not ok" +- ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib" ++ ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" + ) + endforeach(test ${inchitests}) + endif(WITH_INCHI) +@@ -141,7 +141,7 @@ + add_test(${test}_Test ${TEST_PATH}/test_${test}) + set_tests_properties(${test}_Test PROPERTIES + FAIL_REGULAR_EXPRESSION "not ok" +- ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib" ++ ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" + ) + endforeach(test ${old_tests}) + +@@ -177,7 +177,7 @@ + PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib" + BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib" + BABEL_DATADIR "${CMAKE_SOURCE_DIR}/data" +- LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib" ++ LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" + ) + ADD_PYTHON_TEST(pytest_${pytest} test${pytest}.py) + set_tests_properties(pytest_${pytest} PROPERTIES +@@ -199,7 +199,7 @@ + PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib" + BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib" + BABEL_DATADIR "${CMAKE_SOURCE_DIR}/data" +- LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib" ++ LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" + ) + if(MSVC) + SET_SOURCE_FILES_PROPERTIES(test${pybindtest}.py PROPERTIES diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch new file mode 100644 index 0000000000..d91bb9910c --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch @@ -0,0 +1,11 @@ +--- a/test/CMakeLists.txt 2013-11-08 18:08:24.100958255 +0100 ++++ b/test/CMakeLists.txt 2013-11-08 18:08:56.853829903 +0100 +@@ -193,7 +193,7 @@ + + if (PYTHON_BINDINGS) + set(pybindtests +- bindings _pybel example) ++ bindings example) + foreach(pybindtest ${pybindtests}) + SET_SOURCE_FILES_PROPERTIES(test${pybindtest}.py PROPERTIES + PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib" diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch new file mode 100644 index 0000000000..6e1cd2e266 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch @@ -0,0 +1,15 @@ +--- CMakeLists.txt.orig 2013-11-08 16:18:59.000000000 +0100 ++++ CMakeLists.txt 2013-11-08 16:19:22.000000000 +0100 +@@ -343,12 +343,6 @@ + set(CMAKE_C_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -Wl,-s") + set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -Wl,-s") + +- # define WITH_SSE2 to enable the SSE2 instruction set. +- # Available on Pentium 4, Athlon 64, and newer CPUs. +- if(CMAKE_SIZEOF_VOID_P EQUAL 8 OR WITH_SSE2) +- message(STATUS "Enabling the SSE2 instruction set") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2") +- endif(CMAKE_SIZEOF_VOID_P EQUAL 8 OR WITH_SSE2) + endif(${CMAKE_CXX_COMPILER_ID} MATCHES Intel AND UNIX) + + #Find if OpenMP support is enabled diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb new file mode 100644 index 0000000000..058f6266d1 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb @@ -0,0 +1,39 @@ +name = 'OpenBabel' +version = '2.3.2' + +homepage = 'http://openbabel.org' +description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical +data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data +from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'OpenBabel-2.3.2-use-xHost.patch', + 'OpenBabel-2.3.2-fix-link-path-tests.patch', + 'OpenBabel-2.3.2-ignore-failed-test.patch', +] + +builddependencies = [('CMake', '2.8.12')] + +dependencies = [ + ('zlib', '1.2.8'), + ('libxml2', '2.9.1'), + ('Eigen', '3.1.4'), + ('Python', '2.7.5'), +] + +sanity_check_paths = { + 'files': ['bin/babel', 'lib/libopenbabel.so'], + 'dirs': ['share/openbabel'], +} + +runtest = 'test' + +moduleclass = 'chem' + +parallel = 2 -- GitLab From 39425c57fd07d0bca2831ad5fe93c6e50c85885b Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 22:33:55 +0100 Subject: [PATCH 204/811] OpenBabel: ajust easyconfig after feedback Added some comments to the patches and fix hardcoded version in the easyconfig. --- .../o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch | 2 ++ .../o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch | 2 ++ .../o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch | 3 +++ easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb | 8 +++----- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch index c18e0b45e0..b26b775ab1 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-fix-link-path-tests.patch @@ -1,3 +1,5 @@ +# This patch fixes the LD_LIBRARY_PATH for the tests. By default, it was overwritten. +# By Ward Poelmans --- a/test/CMakeLists.txt 2013-11-08 17:23:06.533668767 +0100 +++ b/test/CMakeLists.txt 2013-11-08 17:23:09.905655675 +0100 @@ -64,7 +64,7 @@ diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch index d91bb9910c..bd81ae6a2e 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-failed-test.patch @@ -1,3 +1,5 @@ +# The _pybel python tests fails but that's not a major problem, so we ignore +# By Ward Poelmans --- a/test/CMakeLists.txt 2013-11-08 18:08:24.100958255 +0100 +++ b/test/CMakeLists.txt 2013-11-08 18:08:56.853829903 +0100 @@ -193,7 +193,7 @@ diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch index 6e1cd2e266..fbc312a29c 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-use-xHost.patch @@ -1,3 +1,6 @@ +# For some reason, they enable -msse2 on some systems. I prefer to use -xHost +# We disables -msse2 because it overrides -xHost. +# By Ward Poelmans --- CMakeLists.txt.orig 2013-11-08 16:18:59.000000000 +0100 +++ CMakeLists.txt 2013-11-08 16:19:22.000000000 +0100 @@ -343,12 +343,6 @@ diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb index 058f6266d1..e6cf2ca9a2 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb @@ -13,9 +13,9 @@ source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] patches = [ - 'OpenBabel-2.3.2-use-xHost.patch', - 'OpenBabel-2.3.2-fix-link-path-tests.patch', - 'OpenBabel-2.3.2-ignore-failed-test.patch', + 'OpenBabel-%(version)s-use-xHost.patch', + 'OpenBabel-%(version)s-fix-link-path-tests.patch', + 'OpenBabel-%(version)s-ignore-failed-test.patch', ] builddependencies = [('CMake', '2.8.12')] @@ -35,5 +35,3 @@ sanity_check_paths = { runtest = 'test' moduleclass = 'chem' - -parallel = 2 -- GitLab From 3ec249e559cd0da831d166a2be628f79e1dc03ae Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 22:36:05 +0100 Subject: [PATCH 205/811] libint2: fix hardcoded Easyblock in easyconfig. --- easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb index a30d2713b0..4a5fc5c6ce 100644 --- a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-5.5.0.eb @@ -1,5 +1,3 @@ -easyblock = "EB_libint2" - name = 'libint2' version = '2.0.3' -- GitLab From 77ab83afd37c9a33a1c87b7fd9ebfc52ab0d3aab Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 8 Nov 2013 22:47:04 +0100 Subject: [PATCH 206/811] add easyconfigs for Scalasca, Score-P, Cube and dependencies (OPARI2, OTF(2), PDT, PAPI, binutils) --- .../b/binutils/binutils-2.22-GCC-4.7.3.eb | 31 ++++++++ .../binutils-2.22-goalf-1.1.0-no-OFED.eb | 6 +- .../b/binutils/binutils-2.22-goolf-1.4.10.eb | 6 +- .../c/Cube/Cube-3.4.3-GCC-4.7.3.eb | 35 ++++++++++ .../easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb | 35 ++++++++++ .../o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb | 29 ++++++++ .../o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb | 29 ++++++++ .../easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb | 36 ++++++++++ .../o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb | 31 ++++++++ .../p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb | 16 ++--- .../p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb | 16 ++--- .../p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb | 16 ++--- .../p/PAPI/PAPI-5.0.1-ictce-5.3.0.eb | 16 ++--- .../p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb | 45 ++++++++++++ .../easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb | 50 +++++++++++++ .../Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb | 70 +++++++++++++++++++ .../Scalasca-2.0-gompi-1.5.12-no-OFED.eb | 49 +++++++++++++ .../Score-P-1.2.1-gompi-1.5.12-no-OFED.eb | 65 +++++++++++++++++ 18 files changed, 543 insertions(+), 38 deletions(-) create mode 100644 easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb create mode 100644 easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb new file mode 100644 index 0000000000..22b809f8f9 --- /dev/null +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb @@ -0,0 +1,31 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html +## + +name = 'binutils' +version = '2.22' + +homepage = 'http://directory.fsf.org/project/binutils/' +description = "binutils-2.22: GNU binary utilities" + +sources = ['binutils-%s.tar.bz2' % version] +source_urls = ['http://ftp.gnu.org/gnu/binutils'] + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', + 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] +sanity_check_paths = { + 'files': ['bin/%s' % x for x in binlist], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb index cdbab8b742..7b3fb64e52 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb @@ -24,8 +24,8 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] sanity_check_paths = { - 'files': ['bin/%s' % x for x in binlist], - 'dirs': [] - } + 'files': ['bin/%s' % x for x in binlist], + 'dirs': [], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb index aa4cc4cdb0..7a4dbcf5c7 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb @@ -24,8 +24,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] sanity_check_paths = { - 'files': ['bin/%s' % x for x in binlist], - 'dirs': [] - } + 'files': ['bin/%s' % x for x in binlist], + 'dirs': [], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb new file mode 100644 index 0000000000..8619c836b0 --- /dev/null +++ b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb @@ -0,0 +1,35 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "Cube" +version = "3.4.3" + +homepage = 'http://www.scalasca.org/software/cube-3.x/download.html' +description = """Cube, which is used as performance report explorer for Scalasca-1.X + is a generic tool for displaying a multi-dimensional performance space + consisting of the dimensions (i) performance metric, (ii) call path, and (iii) system + resource. Each dimension can be represented as a tree, where non-leaf nodes of the tree + can be collapsed or expanded to achieve the desired level of granularity.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# --- BM EXTENSIONS --- +# +# Implement dependency on Qt as EasyBuild dependency. Needs Qt 4.3 or later +osdependencies = ['libqt4-devel'] + +# http://apps.fz-juelich.de/scalasca/releases/cube/3.4/dist/cube-3.4.3.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/3.4/dist'] + +sanity_check_paths = { + 'files': ["bin/cube3", "include/cube3/Cube.h", "lib/libcube3.a"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb new file mode 100644 index 0000000000..68ee33088c --- /dev/null +++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb @@ -0,0 +1,35 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "Cube" +version = "4.2" + +homepage = 'http://www.scalasca.org/software/cube-4.x/download.html' +description = """Cube, which is used as performance report explorer for Scalasca and + Score-P, is a generic tool for displaying a multi-dimensional performance space + consisting of the dimensions (i) performance metric, (ii) call path, and (iii) system + resource. Each dimension can be represented as a tree, where non-leaf nodes of the tree + can be collapsed or expanded to achieve the desired level of granularity.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# --- BM EXTENSIONS --- +# +# Implement dependency on Qt as EasyBuild dependency. Needs Qt 4.2 or later +osdependencies = ['libqt4-devel'] + +# http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-4.2.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist'] + +sanity_check_paths = { + 'files': ["bin/cube", "include/cube/Cube.h", "lib/libcube4.a"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb new file mode 100644 index 0000000000..105de7912d --- /dev/null +++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb @@ -0,0 +1,29 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "OPARI2" +version = "1.0.7" + +homepage = 'http://www.score-p.org' +description = """OPARI2, the successor of Forschungszentrum Juelich's OPARI, + is a source-to-source instrumentation tool for OpenMP and hybrid codes. + It surrounds OpenMP directives and runtime library calls with calls to + the POMP2 measurement interface.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# http://www.vi-hps.org/upload/packages/opari2/opari2-1.0.7.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.vi-hps.org/upload/packages/opari2/'] + +sanity_check_paths = { + 'files': ["bin/opari2", "include/opari2/pomp2_lib.h"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb new file mode 100644 index 0000000000..b0e93326fd --- /dev/null +++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb @@ -0,0 +1,29 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "OPARI2" +version = "1.1.1" + +homepage = 'http://www.score-p.org' +description = """OPARI2, the successor of Forschungszentrum Juelich's OPARI, + is a source-to-source instrumentation tool for OpenMP and hybrid codes. + It surrounds OpenMP directives and runtime library calls with calls to + the POMP2 measurement interface.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.1.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.vi-hps.org/upload/packages/opari2/'] + +sanity_check_paths = { + 'files': ["bin/opari2", "include/opari2/pomp2_lib.h"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb new file mode 100644 index 0000000000..4455622048 --- /dev/null +++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb @@ -0,0 +1,36 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "OTF" +version = "1.12.4" +majorsuffix = 'salmon' + +homepage = 'http://www.tu-dresden.de/zih/otf/' +description = """The Open Trace Format is a highly scalable, memory efficient event + trace data format plus support library. It is the standard trace format + for Vampir, and is open for other tools. [NOW OBSOLETE: use OTF2]""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz +sources = ['%(name)s-%(version)s' + majorsuffix + '.tar.gz'] +source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get='] + +# --- BM LIB64 --- +# +# On some systems libraries end up in lib/ +# +# --- BM ISSUE --- +# +# Name change in version 1.12.3: "open-trace-format" was "otf" in older versions +sanity_check_paths = { + 'files': ["bin/otfconfig", "include/open-trace-format/otf.h", "lib64/libopen-trace-format.a"], # "open-trace-format" => "otf" for versions until 1.12.2 + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb new file mode 100644 index 0000000000..05cdc4bb41 --- /dev/null +++ b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb @@ -0,0 +1,31 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "OTF2" +version = "1.2.1" + +homepage = 'http://www.score-p.org' +description = """The Open Trace Format 2 is a highly scalable, memory efficient event + trace data format plus support library. It will become the new standard trace format + for Scalasca, Vampir, and Tau and is open for other tools.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# http://www.vi-hps.org/upload/packages/otf2/otf2-1.2.1.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.vi-hps.org/upload/packages/otf2/'] + +# --- BM LIB64 --- +# +# On some systems libraries end up in lib/ +sanity_check_paths = { + 'files': ["bin/otf2-config", "include/otf2/otf2.h", "lib64/libotf2.a"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb index 267d90b168..d5c57bf57e 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb @@ -26,19 +26,19 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] sources = [SOURCELOWER_TAR_GZ] +start_dir = 'src' + # parallel build doesn't always work parallel = 1 runtest = 'fulltest' sanity_check_paths = { - 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", - "cost", "decode", "error_codes", "event_chooser", - "mem_info", "multiplex_cost", "native_avail", "version", - "xml_event_info"]], - 'dirs': [] - } - -start_dir = 'src' + 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", + "cost", "decode", "error_codes", "event_chooser", + "mem_info", "multiplex_cost", "native_avail", "version", + "xml_event_info"]], + 'dirs': [], +} moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb index 5e6dea6397..d635242b37 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb @@ -27,19 +27,19 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] sources = [SOURCELOWER_TAR_GZ] +start_dir = 'src' + # parallel build doesn't always work parallel = 1 runtest = 'fulltest' sanity_check_paths = { - 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", - "cost", "decode", "error_codes", "event_chooser", - "mem_info", "multiplex_cost", "native_avail", "version", - "xml_event_info"]], - 'dirs': [] - } - -start_dir = 'src' + 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", + "cost", "decode", "error_codes", "event_chooser", + "mem_info", "multiplex_cost", "native_avail", "version", + "xml_event_info"]], + 'dirs': [], +} moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb index e060fe564c..74cebd43c8 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb @@ -26,19 +26,19 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] sources = [SOURCELOWER_TAR_GZ] +start_dir = 'src' + # parallel build doesn't always work parallel = 1 runtest = 'fulltest' sanity_check_paths = { - 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", - "cost", "decode", "error_codes", "event_chooser", - "mem_info", "multiplex_cost", "native_avail", "version", - "xml_event_info"]], - 'dirs': [] - } - -start_dir = 'src' + 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", + "cost", "decode", "error_codes", "event_chooser", + "mem_info", "multiplex_cost", "native_avail", "version", + "xml_event_info"]], + 'dirs': [], +} moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-5.3.0.eb index 8036caa01a..1a6f03a8e0 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-5.3.0.eb @@ -27,19 +27,19 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] sources = [SOURCELOWER_TAR_GZ] +start_dir = 'src' + # parallel build doesn't always work parallel = 1 runtest = 'fulltest' sanity_check_paths = { - 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", - "cost", "decode", "error_codes", "event_chooser", - "mem_info", "multiplex_cost", "native_avail", "version", - "xml_event_info"]], - 'dirs': [] - } - -start_dir = 'src' + 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", + "cost", "decode", "error_codes", "event_chooser", + "mem_info", "multiplex_cost", "native_avail", "version", + "xml_event_info"]], + 'dirs': [], +} moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb new file mode 100644 index 0000000000..7b6092154d --- /dev/null +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb @@ -0,0 +1,45 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html +## + +name = 'PAPI' +version = '5.2.0' + +homepage = 'http://icl.cs.utk.edu/projects/papi/' +description = """PAPI provides the tool designer and application engineer with a consistent interface and +methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables +software engineers to see, in near real time, the relation between software performance and processor events. + +In addition Component PAPI provides access to a collection of components +that expose performance measurement opportunites across the hardware and software stack.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# Example download URL, for reference: http://icl.cs.utk.edu/projects/papi/downloads/papi-5.0.0.tar.gz +source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] +sources = [SOURCELOWER_TAR_GZ] + +start_dir = 'src' + +# parallel build doesn't always work +parallel = 1 + +runtest = 'fulltest' + +sanity_check_paths = { + 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", + "cost", "decode", "error_codes", "event_chooser", + "mem_info", "multiplex_cost", "native_avail", "version", + "xml_event_info"]], + 'dirs': [], +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb b/easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb new file mode 100644 index 0000000000..0c45d93fcb --- /dev/null +++ b/easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb @@ -0,0 +1,50 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "PDT" +version = "3.19" + +homepage = 'http://www.cs.uoregon.edu/research/pdt/' +description = """Program Database Toolkit (PDT) is a framework for analyzing source + code written in several programming languages and for making rich program knowledge + accessible to developers of static and dynamic analysis tools. PDT implements a standard + program representation, the program database (PDB), that can be accessed in a uniform way + through a class library supporting common PDB operations.""" + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +# http://tau.uoregon.edu/pdt_releases/pdtoolkit-3.19.tar.gz +sources = ['pdtoolkit-%(version)s.tar.gz'] +source_urls = ['http://tau.uoregon.edu/pdt_releases/'] + +prefix_opt = '-prefix=' + +# --- BM CONFIGOPTS --- +# +# Compiler suite should always be specified -- MUCH quicker and SAVER than autodetect +# -KAI|-KCC|-GNU|-CC|-c++|-cxx|-xlC|-pgCC|-icpc|-ecpc +configopts = '-GNU' + +keeppreviousinstall = True + +# --- BM ISSUE --- +# +# Use hardcoded x86_64 or "import platform; machine = platform.machine()" here? +sanity_check_paths = { + 'files': ["x86_64/bin/cparse", "x86_64/include/pdb.h", "x86_64/lib/libpdb.a"], + 'dirs': [] +} + +skipsteps = ['build'] + +modextrapaths = { + 'PATH': "x86_64/bin", + 'LD_LIBRARY_PATH': "x86_64/lib", +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..0d1b94e1bb --- /dev/null +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,70 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "Scalasca" +version = "1.4.3" + +homepage = 'http://www.scalasca.org/' +description = """Scalasca is a software tool that supports the performance optimization of + parallel programs by measuring and analyzing their runtime behavior. The analysis identifies + potential performance bottlenecks -- in particular those concerning communication and + synchronization -- and offers guidance in exploring their causes.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +compname = 'GCC' +compver = '4.7.3' + +# compiler toolchain depencies +dependencies = [ + ('binutils', '2.22', "", (compname, compver)), + ('Cube', '3.4.3', "", (compname, compver)), + ('OPARI2', '1.0.7', "", (compname, compver)), + ('OTF', '1.12.4', "", (compname, compver)), + ('PAPI', '5.2.0', "", (compname, compver)), + ('PDT', '3.19', "", (compname, compver)), +] + +# http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist/scalasca-1.4.3.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist'] + +# --- BM CONFIGOPTS --- +# +# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect +# --compiler=(gnu|pgi|intel|path|ibm|sun|clang)--compiler=(gnu|pgi|intel|path|ibm|sun|clang) +# --mpi=(mpich|mpich2|lam|openmpi|intel|intel2|hp|scali|mpibull2|bullxmpi|sun|ibmpoe|intelpoe) +configopts = ' --compiler=gnu' # otherwise Scalasca would potentially pick system Intel compiler +configopts += ' --mpi=openmpi' # quicker and saver than autodetect +configopts += ' --enable-all-mpi-wrappers' +configopts += ' --with-binutils=${EBROOTBINUTILS}' +configopts += ' --with-papi=${EBROOTPAPI}' +configopts += ' --disable-gui' # use external Cube 3.4.3 +configopts += ' --with-pdt=${EBROOTPDT}' +configopts += ' --with-opari2=${EBROOTOPARI2}' + +# --- BM ISSUE --- +# +# Scalasca cannot handle name changes yet introduced with OTF-1.12.3 +#configopts += ' --with-otf=${EBROOTOTF}' + +# --- BM ISSUE --- +# +# Needs to be adjusted for other toolchains +premakeopts = 'cd build-linux-gomp-openmpi; ' +preinstallopts = 'cd build-linux-gomp-openmpi; ' + +parallel = 1 + +sanity_check_paths = { + 'files': ["bin/scalasca", "include/epik_user.h", "lib/libelg.mpi.a"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..63a61a881d --- /dev/null +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,49 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "Scalasca" +version = "2.0" + +homepage = 'http://www.scalasca.org/' +description = """Scalasca is a software tool that supports the performance optimization of + parallel programs by measuring and analyzing their runtime behavior. The analysis identifies + potential performance bottlenecks -- in particular those concerning communication and + synchronization -- and offers guidance in exploring their causes.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +compname = 'GCC' +compver = '4.7.3' + +# compiler toolchain depencies +dependencies = [ + ('Cube', '4.2', "", (compname, compver)), + ('OTF2', '1.2.1', "", (compname, compver)), +] + +# http://apps.fz-juelich.de/scalasca/releases/scalasca/2.0/dist/scalasca-2.0.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://apps.fz-juelich.de/scalasca/releases/scalasca/2.0/dist'] + +# --- BM CONFIGOPTS --- +# +# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect +# --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) +# --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) +configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' + +# --- BM LIB64 --- +# +# On some systems libraries end up in lib/ +sanity_check_paths = { + 'files': ["bin/scalasca", "lib64/libpearl.replay.a"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..24966699fa --- /dev/null +++ b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,65 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "Score-P" +version = "1.2.1" + +homepage = 'http://www.score-p.org' +description = """The Score-P measurement infrastructure is a highly scalable and + easy-to-use tool suite for profiling, event tracing, and online analysis of HPC + applications.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +compname = 'GCC' +compver = '4.7.3' + +# compiler toolchain depencies +dependencies = [ + ('binutils', '2.22', "", (compname, compver)), + ('Cube', '4.2', "", (compname, compver)), + ('OPARI2', '1.1.1', "", (compname, compver)), + ('OTF2', '1.2.1', "", (compname, compver)), + ('PAPI', '5.2.0', "", (compname, compver)), + ('PDT', '3.19', "", (compname, compver)), +] + +# http://www.vi-hps.org/upload/packages/scorep/scorep-1.2.1.tar.gz +sources = ["scorep-%(version)s.tar.gz"] +source_urls = ['http://www.vi-hps.org/upload/packages/scorep/'] + +# --- BM CONFIGOPTS --- +# +# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect +# --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) +# --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) +# +# OTF2, OPARI2, Cube, PDT autodetection worked fine under EasyBuild, so only if needed use +# --with-otf2[=] # Provide path to otf2-config. Auto-detected if already in $PATH. +# --with-opari2[=] # Provide path to opari2-config. Auto-detected if already in $PATH. +# --with-cube[=] # Provide path to cube-config. Auto-detected if already in $PATH. +# --with-pdt= # Specifies the path to the program database toolkit (PDT) binaries, e.g., cparse. +configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' +configopts += ' --with-papi-header=${EBROOTPAPI}/include --with-papi-lib=${EBROOTPAPI}/lib64' +configopts += ' --with-libbfd=${EBROOTBINUTILS}' + +# --- BM EXTENSIONS --- +# +# Score-P does also support CUDA measurements - not yet tested in EasyBuild +# configopts += ' --with-libcudart=(yes|no|)' + +# --- BM LIB64 --- +# +# On some systems libraries end up in lib/ +sanity_check_paths = { + 'files': ["bin/scorep", "include/scorep/SCOREP_User.h", "lib64/libscorep_adapter_mpi_event.a"], + 'dirs': [] +} + +moduleclass = 'perf' -- GitLab From 9d9b7f0bfc09c9410bd444aa239dc0ccaf6d04db Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 8 Nov 2013 22:57:19 +0100 Subject: [PATCH 207/811] minor style fixes in PAPI easyconfigs --- easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb | 9 ++++----- easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb index d635242b37..d2e670ccbd 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goolf-1.4.10.eb @@ -15,11 +15,10 @@ version = '5.0.1' homepage = 'http://icl.cs.utk.edu/projects/papi/' description = """PAPI provides the tool designer and application engineer with a consistent interface and -methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables -software engineers to see, in near real time, the relation between software performance and processor events. - -In addition Component PAPI provides access to a collection of components -that expose performance measurement opportunites across the hardware and software stack.""" + methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables + software engineers to see, in near real time, the relation between software performance and processor events. + In addition Component PAPI provides access to a collection of components + that expose performance measurement opportunites across the hardware and software stack.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb index 7b6092154d..9c3b11629e 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb @@ -15,11 +15,10 @@ version = '5.2.0' homepage = 'http://icl.cs.utk.edu/projects/papi/' description = """PAPI provides the tool designer and application engineer with a consistent interface and -methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables -software engineers to see, in near real time, the relation between software performance and processor events. - -In addition Component PAPI provides access to a collection of components -that expose performance measurement opportunites across the hardware and software stack.""" + methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables + software engineers to see, in near real time, the relation between software performance and processor events. + In addition Component PAPI provides access to a collection of components + that expose performance measurement opportunites across the hardware and software stack.""" toolchain = {'name': 'GCC', 'version': '4.7.3'} -- GitLab From 8358228e0e36273bacc9cd667f9676c7a073a10f Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 8 Nov 2013 23:03:04 +0100 Subject: [PATCH 208/811] libint2: updated easyblock: changed version, sanity checks --- ...-goolf-1.4.10.eb => libint2-2.0.3-goolf-1.4.10.eb} | 11 +++++++---- ...-ictce-4.1.13.eb => libint2-2.0.3-ictce-4.1.13.eb} | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) rename easybuild/easyconfigs/l/libint2/{libint2-2.0.3-stable-goolf-1.4.10.eb => libint2-2.0.3-goolf-1.4.10.eb} (74%) rename easybuild/easyconfigs/l/libint2/{libint2-2.0.3-stable-ictce-4.1.13.eb => libint2-2.0.3-ictce-4.1.13.eb} (74%) diff --git a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-stable-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb similarity index 74% rename from easybuild/easyconfigs/l/libint2/libint2-2.0.3-stable-goolf-1.4.10.eb rename to easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb index ac141ce1da..c0fdf544da 100644 --- a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-stable-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb @@ -1,7 +1,5 @@ -easyblock = "EB_libint2" - name = 'libint2' -version = '2.0.3-stable' +version = '2.0.3' homepage = 'http://www.files.chem.vt.edu/chem-dept/valeev/software/libint/libint.html' description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body @@ -10,7 +8,12 @@ description = """Libint library is used to evaluate the traditional (electron re toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} -sources = ['libint-%(version)s.tgz'] +sources = ['libint-%(version)s-stable.tgz'] source_urls = ['http://downloads.sourceforge.net/project/libint/libint-for-mpqc'] +sanity_check_paths = { + 'files': ['lib/libint2.a', 'lib/libint2.so', 'include/libint2/libint2.h'], + 'dirs': [], +} + moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-stable-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb similarity index 74% rename from easybuild/easyconfigs/l/libint2/libint2-2.0.3-stable-ictce-4.1.13.eb rename to easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb index da5f65a50a..c17ff0d326 100644 --- a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-stable-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb @@ -1,7 +1,5 @@ -easyblock = "EB_libint2" - name = 'libint2' -version = '2.0.3-stable' +version = '2.0.3' homepage = 'http://www.files.chem.vt.edu/chem-dept/valeev/software/libint/libint.html' description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body @@ -10,7 +8,12 @@ description = """Libint library is used to evaluate the traditional (electron re toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True} -sources = ['libint-%(version)s.tgz'] +sources = ['libint-%(version)s-stable.tgz'] source_urls = ['http://downloads.sourceforge.net/project/libint/libint-for-mpqc'] +sanity_check_paths = { + 'files': ['lib/libint2.a', 'lib/libint2.so', 'include/libint2/libint2.h'], + 'dirs': [], +} + moduleclass = 'chem' -- GitLab From 637d350d95155279149551b0890fc023cd1679af Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 8 Nov 2013 23:36:47 +0100 Subject: [PATCH 209/811] add easyconfig file for LWM2 --- .../l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..376a698417 --- /dev/null +++ b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,58 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "LWM2" +version = "1.1" + +homepage = 'http://www.vi-hps.org/Tools/LWM2.html' +description = """The lightweight measurement module (LWM2) is a low overhead profiler developed + during the course of the HOPSA project. It can profile applications without any modification by + a user. The lightweight measurement module uses a hybrid approach to profile an application. It + samples the profiled application at regular intervals to keep track of application activity. To + keep the overhead low, LWM2 avoids stack unwinding at each application sample. Instead, it utilizes + direct instrumentation to earmark regions of interest in an application. When an application is + sampled, the earmarks are checked to identify the region of application execution. As a result, + LWM2 is able to profile application with reasonable knowledge of application activity while + maintaining low overhead. This hybrid approach also allows LWM2 to keep track of the time spent + by an application in different regions of execution without directly measuring the time in these + regions. The hybrid profiling approach is also used to collect additional dat a of interest for + some specific application activities. This includes the MPI communication calls and the amount of + data transfer, the POSIX file I/O calls and associated data transfers, etc.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +compname = 'GCC' +compver = '4.7.3' + +# compiler toolchain depencies +dependencies = [ + ('PAPI', '5.2.0', "", (compname, compver)), +] + +# http://www.vi-hps.org/upload/projects/hopsa/lwm2-1.1.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.vi-hps.org/upload/projects/hopsa/'] + +# --- BM CONFIGOPTS --- +# +# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect +# --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) +# --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) +configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' +configopts += ' --with-papi-header=${EBROOTPAPI}/include --with-papi-lib=${EBROOTPAPI}/lib64' + +# --- BM LIB64 --- +# +# On some systems libraries end up in lib/ +sanity_check_paths = { + 'files': ["bin/l2freader", "lib64/liblwm2.a"], + 'dirs': [] +} + +moduleclass = 'perf' -- GitLab From 3457119293c0811e00700c7b291271700757e7a5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 8 Nov 2013 23:40:47 +0100 Subject: [PATCH 210/811] add easyconfig file for GTI, MUST, PnMPI --- .../g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb | 39 ++++++++++++++++++ .../m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb | 40 +++++++++++++++++++ .../PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb | 32 +++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..be80bae9fb --- /dev/null +++ b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,39 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +easyblock = 'CMakeMake' + +name = "GTI" +version = "1.2.0" +specialversion = "release" + +homepage = 'http://www.tu-dresden.de/zih/must/' +description = """A Generic Tools Infrastructure for Event-Based Tools in Parallel Systems.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +dependencies = [ + ('PnMPI', '1.2.0'), +] + +# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/gti-release-1.2.0.tar.gz +sources = ['%(namelower)s-'+ specialversion +'-%(version)s.tar.gz'] +source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] + +patches = ['GTI-1.2.0-missing-unistd.patch'] + +configopts = ' -DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}' +makeopts = 'CXXFLAGS="$CXXFLAGS -fpermissive"' + +sanity_check_paths = { + 'files': ["bin/weaver", "include/I_Profiler.h"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..ae65d6e727 --- /dev/null +++ b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,40 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +easyblock = 'CMakeMake' + +name = "MUST" +version = "1.2.0" +specialversion = "release" + +homepage = 'http://www.tu-dresden.de/zih/must/' +description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them + to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful + for application developers that want to develop correct MPI applications. This includes errors that + already manifest --segmentation faults or incorrect results -- as well as many errors that are not + visible to the application developer or do not manifest on a certain system or MPI implementation.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +dependencies = [ + ('GTI', '1.2.0'), +] + +# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/must-release-1.2.0.tar.gz +sources = ['%(namelower)s-'+ specialversion +'-%(version)s.tar.gz'] +source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] + +configopts = ' -DCMAKE_BUILD_TYPE=Release -DGTI_INSTALL_PREFIX=${EBROOTGTI}' + +sanity_check_paths = { + 'files': ["bin/mustrun", "include/mustConfig.h"], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..4e63e4ca1d --- /dev/null +++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb @@ -0,0 +1,32 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +easyblock = 'CMakeMake' + +name = "PnMPI" +version = "1.2.0" +specialversion = "for-gti" + +homepage = 'https://scalability.llnl.gov/pnmpi/' +description = """MPI Tool Virtualization and Interoperability library.""" + +toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchainopts = {"usempi": True} + +# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/pnmpi-for-gti-1.2.0.tar.gz +sources = ['%(namelower)s-'+ specialversion +'-%(version)s.tar.gz'] +source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] + +configopts = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False' + +sanity_check_paths = { + 'files': ["bin/pnmpi-patch", "include/pnmpi.h", "lib/libpnmpi.a"], + 'dirs': [] +} + +moduleclass = 'perf' -- GitLab From 8cca43ce05383f4273d46b18f6b3082e9313f265 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 8 Nov 2013 23:43:41 +0100 Subject: [PATCH 211/811] add GTI patch file --- .../g/GTI/GTI-1.2.0-missing-unistd.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/g/GTI/GTI-1.2.0-missing-unistd.patch diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-missing-unistd.patch b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-missing-unistd.patch new file mode 100644 index 0000000000..a76f09a177 --- /dev/null +++ b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-missing-unistd.patch @@ -0,0 +1,20 @@ +--- gti-release-1.2.0/modules/utility/ModuleBase.h.orig 2013-10-29 23:29:41.556136540 +0100 ++++ gti-release-1.2.0/modules/utility/ModuleBase.h 2013-10-29 23:27:34.196570926 +0100 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- gti-release-1.2.0/modules/utility/SimpleTcpServer.h.orig 2013-10-29 23:30:48.060953274 +0100 ++++ gti-release-1.2.0/modules/utility/SimpleTcpServer.h 2013-10-29 23:27:27.418488944 +0100 +@@ -18,6 +18,7 @@ + #ifndef SIMPLE_TCP_SERVER_H + #define SIMPLE_TCP_SERVER_H + ++#include + #include + #include + -- GitLab From 8a251586c1004700395fcb4bd924538fd8bbbbba Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 01:22:50 +0100 Subject: [PATCH 212/811] use new gompi/1.4.12-no-OFED toolchain for Scalasca easyconfigs and dependencies --- ... => binutils-2.22-gompi-1.4.12-no-OFED.eb} | 2 +- ....eb => Cube-3.4.3-gompi-1.4.12-no-OFED.eb} | 2 +- ....3.eb => Cube-4.2-gompi-1.4.12-no-OFED.eb} | 2 +- .../g/gompi/gompi-1.4.12-no-OFED.eb | 25 ++++++++++++++++ ...b => OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb} | 2 +- ...b => OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb} | 2 +- ....eb => OTF-1.12.4-gompi-1.4.12-no-OFED.eb} | 2 +- ....eb => OTF2-1.2.1-gompi-1.4.12-no-OFED.eb} | 2 +- .../OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 30 +++++++++++++++++++ ....eb => PAPI-5.2.0-gompi-1.4.12-no-OFED.eb} | 2 +- ....3.eb => PDT-3.19-gompi-1.4.12-no-OFED.eb} | 2 +- ...=> Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb} | 17 +++++------ ...b => Scalasca-2.0-gompi-1.4.12-no-OFED.eb} | 9 ++---- ... => Score-P-1.2.1-gompi-1.4.12-no-OFED.eb} | 17 +++++------ 14 files changed, 81 insertions(+), 35 deletions(-) rename easybuild/easyconfigs/b/binutils/{binutils-2.22-GCC-4.7.3.eb => binutils-2.22-gompi-1.4.12-no-OFED.eb} (94%) rename easybuild/easyconfigs/c/Cube/{Cube-3.4.3-GCC-4.7.3.eb => Cube-3.4.3-gompi-1.4.12-no-OFED.eb} (95%) rename easybuild/easyconfigs/c/Cube/{Cube-4.2-GCC-4.7.3.eb => Cube-4.2-gompi-1.4.12-no-OFED.eb} (95%) create mode 100644 easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb rename easybuild/easyconfigs/o/OPARI2/{OPARI2-1.0.7-GCC-4.7.3.eb => OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb} (94%) rename easybuild/easyconfigs/o/OPARI2/{OPARI2-1.1.1-GCC-4.7.3.eb => OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb} (94%) rename easybuild/easyconfigs/o/OTF/{OTF-1.12.4-GCC-4.7.3.eb => OTF-1.12.4-gompi-1.4.12-no-OFED.eb} (95%) rename easybuild/easyconfigs/o/OTF2/{OTF2-1.2.1-GCC-4.7.3.eb => OTF2-1.2.1-gompi-1.4.12-no-OFED.eb} (94%) create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb rename easybuild/easyconfigs/p/PAPI/{PAPI-5.2.0-GCC-4.7.3.eb => PAPI-5.2.0-gompi-1.4.12-no-OFED.eb} (96%) rename easybuild/easyconfigs/p/PDT/{PDT-3.19-GCC-4.7.3.eb => PDT-3.19-gompi-1.4.12-no-OFED.eb} (96%) rename easybuild/easyconfigs/s/Scalasca/{Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb => Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb} (85%) rename easybuild/easyconfigs/s/Scalasca/{Scalasca-2.0-gompi-1.5.12-no-OFED.eb => Scalasca-2.0-gompi-1.4.12-no-OFED.eb} (89%) rename easybuild/easyconfigs/s/Score-P/{Score-P-1.2.1-gompi-1.5.12-no-OFED.eb => Score-P-1.2.1-gompi-1.4.12-no-OFED.eb} (85%) diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb similarity index 94% rename from easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb rename to easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb index 22b809f8f9..5483614323 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb @@ -19,7 +19,7 @@ description = "binutils-2.22: GNU binary utilities" sources = ['binutils-%s.tar.bz2' % version] source_urls = ['http://ftp.gnu.org/gnu/binutils'] -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb similarity index 95% rename from easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb rename to easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb index 8619c836b0..a0b4057c78 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb @@ -16,7 +16,7 @@ description = """Cube, which is used as performance report explorer for Scalasca resource. Each dimension can be represented as a tree, where non-leaf nodes of the tree can be collapsed or expanded to achieve the desired level of granularity.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # --- BM EXTENSIONS --- # diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb similarity index 95% rename from easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb rename to easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb index 68ee33088c..ed4f7fb4bb 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-4.2-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb @@ -16,7 +16,7 @@ description = """Cube, which is used as performance report explorer for Scalasca resource. Each dimension can be represented as a tree, where non-leaf nodes of the tree can be collapsed or expanded to achieve the desired level of granularity.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # --- BM EXTENSIONS --- # diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..6a3e082b59 --- /dev/null +++ b/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb @@ -0,0 +1,25 @@ +easyblock = "Toolchain" + +name = 'gompi' +version = '1.4.12' +versionsuffix = '-no-OFED' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, + including OpenMPI for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.7.3' + +mpilib = 'OpenMPI' +mpiver = '1.6.5' + +# compiler toolchain depencies +dependencies = [ + (compname, compver), + (mpilib, mpiver, versionsuffix, (compname, compver)), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb similarity index 94% rename from easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb rename to easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb index 105de7912d..18c9ee4536 100644 --- a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb @@ -15,7 +15,7 @@ description = """OPARI2, the successor of Forschungszentrum Juelich's OPARI, It surrounds OpenMP directives and runtime library calls with calls to the POMP2 measurement interface.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://www.vi-hps.org/upload/packages/opari2/opari2-1.0.7.tar.gz sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb similarity index 94% rename from easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb rename to easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb index b0e93326fd..2b1af13012 100644 --- a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb @@ -15,7 +15,7 @@ description = """OPARI2, the successor of Forschungszentrum Juelich's OPARI, It surrounds OpenMP directives and runtime library calls with calls to the POMP2 measurement interface.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.1.tar.gz sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb similarity index 95% rename from easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb rename to easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb index 4455622048..b0ac0911b2 100644 --- a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb @@ -15,7 +15,7 @@ description = """The Open Trace Format is a highly scalable, memory efficient ev trace data format plus support library. It is the standard trace format for Vampir, and is open for other tools. [NOW OBSOLETE: use OTF2]""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz sources = ['%(name)s-%(version)s' + majorsuffix + '.tar.gz'] diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb similarity index 94% rename from easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb rename to easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb index 05cdc4bb41..c6340d10f5 100644 --- a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb @@ -14,7 +14,7 @@ description = """The Open Trace Format 2 is a highly scalable, memory efficient trace data format plus support library. It will become the new standard trace format for Scalasca, Vampir, and Tau and is open for other tools.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://www.vi-hps.org/upload/packages/otf2/otf2-1.2.1.tar.gz sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb new file mode 100644 index 0000000000..5fc801a2be --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -0,0 +1,30 @@ +name = 'OpenMPI' +version = '1.6.5' +versionsuffix = "-no-OFED" + +homepage = 'http://www.open-mpi.org/' +description = "The Open MPI Project is an open source MPI-2 implementation." + +toolchain = {'name': 'GCC', 'version': '4.7.3'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] + +patches = ['OpenMPI-1.6.5-vt_cupti_events.patch'] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb similarity index 96% rename from easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb rename to easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb index 9c3b11629e..b4a46c4852 100644 --- a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb @@ -20,7 +20,7 @@ description = """PAPI provides the tool designer and application engineer with a In addition Component PAPI provides access to a collection of components that expose performance measurement opportunites across the hardware and software stack.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # Example download URL, for reference: http://icl.cs.utk.edu/projects/papi/downloads/papi-5.0.0.tar.gz source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb b/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb similarity index 96% rename from easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb rename to easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb index 0c45d93fcb..314f8d323d 100644 --- a/easybuild/easyconfigs/p/PDT/PDT-3.19-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb @@ -16,7 +16,7 @@ description = """Program Database Toolkit (PDT) is a framework for analyzing sou program representation, the program database (PDB), that can be accessed in a uniform way through a class library supporting common PDB operations.""" -toolchain = {'name': 'GCC', 'version': '4.7.3'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://tau.uoregon.edu/pdt_releases/pdtoolkit-3.19.tar.gz sources = ['pdtoolkit-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb similarity index 85% rename from easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb index 0d1b94e1bb..0921ac982e 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb @@ -15,20 +15,17 @@ description = """Scalasca is a software tool that supports the performance optim potential performance bottlenecks -- in particular those concerning communication and synchronization -- and offers guidance in exploring their causes.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} -compname = 'GCC' -compver = '4.7.3' - # compiler toolchain depencies dependencies = [ - ('binutils', '2.22', "", (compname, compver)), - ('Cube', '3.4.3', "", (compname, compver)), - ('OPARI2', '1.0.7', "", (compname, compver)), - ('OTF', '1.12.4', "", (compname, compver)), - ('PAPI', '5.2.0', "", (compname, compver)), - ('PDT', '3.19', "", (compname, compver)), + ('binutils', '2.22'), + ('Cube', '3.4.3'), + ('OPARI2', '1.0.7'), + ('OTF', '1.12.4'), + ('PAPI', '5.2.0'), + ('PDT', '3.19'), ] # http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist/scalasca-1.4.3.tar.gz diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb similarity index 89% rename from easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb index 63a61a881d..814b95427d 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb @@ -15,16 +15,13 @@ description = """Scalasca is a software tool that supports the performance optim potential performance bottlenecks -- in particular those concerning communication and synchronization -- and offers guidance in exploring their causes.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} -compname = 'GCC' -compver = '4.7.3' - # compiler toolchain depencies dependencies = [ - ('Cube', '4.2', "", (compname, compver)), - ('OTF2', '1.2.1', "", (compname, compver)), + ('Cube', '4.2'), + ('OTF2', '1.2.1'), ] # http://apps.fz-juelich.de/scalasca/releases/scalasca/2.0/dist/scalasca-2.0.tar.gz diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb similarity index 85% rename from easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb index 24966699fa..061f763dd3 100644 --- a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb @@ -14,20 +14,17 @@ description = """The Score-P measurement infrastructure is a highly scalable and easy-to-use tool suite for profiling, event tracing, and online analysis of HPC applications.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} -compname = 'GCC' -compver = '4.7.3' - # compiler toolchain depencies dependencies = [ - ('binutils', '2.22', "", (compname, compver)), - ('Cube', '4.2', "", (compname, compver)), - ('OPARI2', '1.1.1', "", (compname, compver)), - ('OTF2', '1.2.1', "", (compname, compver)), - ('PAPI', '5.2.0', "", (compname, compver)), - ('PDT', '3.19', "", (compname, compver)), + ('binutils', '2.22'), + ('Cube', '4.2'), + ('OPARI2', '1.1.1'), + ('OTF2', '1.2.1'), + ('PAPI', '5.2.0'), + ('PDT', '3.19'), ] # http://www.vi-hps.org/upload/packages/scorep/scorep-1.2.1.tar.gz -- GitLab From 7276e5a993bddb38ccc3cfc41379fd5073db6cda Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 01:38:20 +0100 Subject: [PATCH 213/811] add Qt as dependency for Cube --- .../bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb | 15 ++++++++++++ .../c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb | 7 ++---- .../c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb | 7 ++---- .../GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb | 19 +++++++++++++++ .../gettext-0.18.2-gompi-1.4.12-no-OFED.eb | 16 +++++++++++++ .../libffi-3.0.13-gompi-1.4.12-no-OFED.eb | 18 ++++++++++++++ .../libreadline-6.2-gompi-1.4.12-no-OFED.eb | 24 +++++++++++++++++++ .../ncurses-5.9-gompi-1.4.12-no-OFED.eb | 15 ++++++++++++ .../Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb | 23 ++++++++++++++++++ .../q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb | 14 +++++++++++ .../z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb | 20 ++++++++++++++++ 11 files changed, 168 insertions(+), 10 deletions(-) create mode 100644 easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..63a48229a2 --- /dev/null +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,15 @@ +name = 'bzip2' +version = '1.0.6' + +homepage = 'http://www.bzip.org/' +description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically +compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical +compressors), whilst being around twice as fast at compression and six times faster at decompression.""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'pic': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.bzip.org/%(version)s/'] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb index a0b4057c78..f4a0af1059 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb @@ -18,15 +18,12 @@ description = """Cube, which is used as performance report explorer for Scalasca toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} -# --- BM EXTENSIONS --- -# -# Implement dependency on Qt as EasyBuild dependency. Needs Qt 4.3 or later -osdependencies = ['libqt4-devel'] - # http://apps.fz-juelich.de/scalasca/releases/cube/3.4/dist/cube-3.4.3.tar.gz sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/3.4/dist'] +dependencies = [('Qt', '4.8.4')] + sanity_check_paths = { 'files': ["bin/cube3", "include/cube3/Cube.h", "lib/libcube3.a"], 'dirs': [] diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb index ed4f7fb4bb..6546ee942b 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb @@ -18,15 +18,12 @@ description = """Cube, which is used as performance report explorer for Scalasca toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} -# --- BM EXTENSIONS --- -# -# Implement dependency on Qt as EasyBuild dependency. Needs Qt 4.2 or later -osdependencies = ['libqt4-devel'] - # http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-4.2.tar.gz sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist'] +dependencies = [('Qt', '4.8.4')] + sanity_check_paths = { 'files': ["bin/cube", "include/cube/Cube.h", "lib/libcube4.a"], 'dirs': [] diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..5099cd7013 --- /dev/null +++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,19 @@ +name = 'GLib' +version = '2.34.3' + +homepage = 'http://www.gtk.org/' +description = """GLib is one of the base libraries of the GTK+ project""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/'] +sources = ['glib-%(version)s.tar.xz'] + +dependencies = [ + ('libffi', '3.0.13'), + ('gettext', '0.18.2'), +] +builddependencies = [('Python', '2.5.6', '-bare')] + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..f99a141fdb --- /dev/null +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,16 @@ +name = 'gettext' +version = '0.18.2' + +homepage = 'http://www.gnu.org/software/gettext/' +description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may +build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools +and documentation""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] + +configopts = '--without-emacs' + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..b765fbda7b --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,18 @@ +name = 'libffi' +version = '3.0.13' + +homepage = 'http://sourceware.org/libffi/' +description = """The libffi library provides a portable, high level programming interface to various calling +conventions. This allows a programmer to call any function specified by a call interface description at run-time.""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} + +source_urls = ['ftp://sourceware.org/pub/libffi/'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ['lib64/libffi.%s' % SHLIB_EXT, 'lib64/libffi.a'], + 'dirs': [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..30f278107c --- /dev/null +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,24 @@ +name = 'libreadline' +version = '6.2' + +homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html' +description = """The GNU Readline library provides a set of functions for use by applications that + allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. + The Readline library includes additional functions to maintain a list of previously-entered command lines, + to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} + +sources = ['readline-%(version)s.tar.gz'] +source_urls = ['http://ftpmirror.gnu.org/readline/'] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h', + 'rlstdc.h', 'rltypedefs.h', 'tilde.h']], + 'dirs' : [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..82a5ffa96a --- /dev/null +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,15 @@ +name = 'ncurses' +version = '5.9' + +homepage = 'http://www.gnu.org/software/ncurses/' +description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, +and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and +function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb new file mode 100644 index 0000000000..8831f1a81b --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb @@ -0,0 +1,23 @@ +name = 'Python' +version = '2.5.6' +versionsuffix = '-bare' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python_libffi_int128_icc.patch'] + +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..76d6056244 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,14 @@ +name = 'Qt' +version = '4.8.4' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} + +source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..c3b54c089b --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,20 @@ +name = 'zlib' +version = '1.2.7' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, +not covered by any patents -- lossless data-compression library for use on virtually any +computer hardware and operating system.""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 5093164ac4c4bc40ff8f8af51a71ede32d5f6358 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 14:02:48 +0100 Subject: [PATCH 214/811] specify alternative lib paths for OTF libraries (lib, lib64) --- .../o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb | 17 +++++++---------- .../o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb | 8 +++----- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb index b0ac0911b2..e2416b4554 100644 --- a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb @@ -18,19 +18,16 @@ description = """The Open Trace Format is a highly scalable, memory efficient ev toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz -sources = ['%(name)s-%(version)s' + majorsuffix + '.tar.gz'] +sources = ['%%(name)s-%%(version)s%s.tar.gz' % majorsuffix] source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get='] -# --- BM LIB64 --- -# -# On some systems libraries end up in lib/ -# -# --- BM ISSUE --- -# -# Name change in version 1.12.3: "open-trace-format" was "otf" in older versions +# name change in version 1.12.3: "open-trace-format" was "otf" in older versions +# "open-trace-format" => "otf" for versions until 1.12.2 sanity_check_paths = { - 'files': ["bin/otfconfig", "include/open-trace-format/otf.h", "lib64/libopen-trace-format.a"], # "open-trace-format" => "otf" for versions until 1.12.2 - 'dirs': [] + 'files': ["bin/otfconfig", "include/open-trace-format/otf.h", + # note by Bernd Mohr: on some systems libraries end up in lib/ + ("lib64/libopen-trace-format.a", "lib/libopen-trace-format.a")], + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb index c6340d10f5..ad32c9dc6a 100644 --- a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb @@ -20,12 +20,10 @@ toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.vi-hps.org/upload/packages/otf2/'] -# --- BM LIB64 --- -# -# On some systems libraries end up in lib/ sanity_check_paths = { - 'files': ["bin/otf2-config", "include/otf2/otf2.h", "lib64/libotf2.a"], - 'dirs': [] + # note by Bernd Mohr: on some systems libraries end up in lib/ + 'files': ["bin/otf2-config", "include/otf2/otf2.h", ("lib64/libotf2.a", "lib/libotf2.a")], + 'dirs': [], } moduleclass = 'perf' -- GitLab From 403f7d4a8c83b6d30cc7753210c7d2adf4c4c6ab Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 14:05:20 +0100 Subject: [PATCH 215/811] fix (example) license file spec in Allinea easyconfigs --- .../a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb | 2 +- .../a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb index 83146cb739..d4565683b6 100644 --- a/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb +++ b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-5.7-x86_64.eb @@ -12,6 +12,6 @@ sources = ['%(namelower)s-tools-%(version)s.tar'] # license file import os -license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") +license_file = os.path.join(os.getenv('HOME'), "licenses", "allinea", "license.lic") moduleclass = 'tools' diff --git a/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb index bcfffae599..90466a2643 100644 --- a/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb +++ b/easybuild/easyconfigs/a/Allinea/Allinea-4.1-32834-Redhat-6.0-x86_64.eb @@ -12,6 +12,6 @@ sources = ['%(namelower)s-tools-%(version)s.tar'] # license file import os -license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") +license_file = os.path.join(os.getenv('HOME'), "licenses", "allinea", "license.lic") moduleclass = 'tools' -- GitLab From 8da05c241699b95d9f835c4e193ef0f8fa687cbf Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 18:06:09 +0100 Subject: [PATCH 216/811] add missing easyconfigs for zlib/Szip deps --- .../easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb | 21 +++++++++++++++++++ .../z/zlib/zlib-1.2.7-GCC-4.8.1.eb | 20 ++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb new file mode 100644 index 0000000000..091eab829e --- /dev/null +++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb @@ -0,0 +1,21 @@ +name = 'Szip' +version = '2.1' + +homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/' +description = "Szip compression software, providing lossless compression of scientific data" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +sanity_check_paths = { + 'files': ["lib/libsz.a", "lib/libsz.so"] + + ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb new file mode 100644 index 0000000000..a4fd2202ff --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-GCC-4.8.1.eb @@ -0,0 +1,20 @@ +name = 'zlib' +version = '1.2.7' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, +not covered by any patents -- lossless data-compression library for use on virtually any +computer hardware and operating system.""" + +toolchain = {'name': 'GCC', 'version': '4.8.1'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From f62f091fe012767c113b0670ac50284c0ad6537e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 20:42:40 +0100 Subject: [PATCH 217/811] add missing easyconfig for ncurses with gmpolf --- .../n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..edda66f1dc --- /dev/null +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb @@ -0,0 +1,15 @@ +name = 'ncurses' +version = '5.9' + +homepage = 'http://www.gnu.org/software/ncurses/' +description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, +and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and +function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'devel' -- GitLab From 034526d2de7a1f4d3eb4fc034174569bb6009382 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 22:09:06 +0100 Subject: [PATCH 218/811] rework Paraview easyconfigs to use CMakeMake easyblock --- .../p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb index 9fa5a685d6..0f2accf3aa 100644 --- a/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Paraview/Paraview-4.0.1-gmpolf-1.4.8.eb @@ -1,21 +1,22 @@ -easyblock = 'Paraview' -name = "Paraview" -version = "4.0.1" -versionsuffix ='' +easyblock = 'CMakeMake' -homepage = 'http://www.paraview.org' -description = 'Paraview is a scientific parallel visualizer' +name = 'Paraview' +version = '4.0.1' + +homepage = "http://www.paraview.org" +description = "Paraview is a scientific parallel visualizer" toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'usempi': True, 'pic': True} -source_urls = ['http://www.paraview.org/paraview-downloads/'] -sources = [("download.php?submit=Download&version=v4.0&type=source&os=all&downloadFile=ParaView-v4.0.1-source.tgz",'tar xzf "%s"')] +download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile=' +source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix] +sources = ["ParaView-v%(version)s-source.tgz"] dependencies = [('Qt','4.8.5')] -preconfigopts = "mkdir obj && cd obj && " -preinstallopts="cd obj &&" -premakeopts ="cd obj &&" -srcdir="/home/bver018" + builddependencies = [('CMake', '2.8.10.2')] + +separate_build_dir = True + moduleclass = 'vis' -- GitLab From 4531d017ec1722104a805915c956cba68db644c4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 22:36:07 +0100 Subject: [PATCH 219/811] add --with-qmake configure options, fix homepage and sanity check paths (no bin/cube3?) --- .../c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb index f4a0af1059..b12a0ad83e 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb @@ -9,7 +9,7 @@ name = "Cube" version = "3.4.3" -homepage = 'http://www.scalasca.org/software/cube-3.x/download.html' +homepage = 'http://www.scalasca.org/software/cube-3.x' description = """Cube, which is used as performance report explorer for Scalasca-1.X is a generic tool for displaying a multi-dimensional performance space consisting of the dimensions (i) performance metric, (ii) call path, and (iii) system @@ -24,9 +24,14 @@ source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/3.4/dist'] dependencies = [('Qt', '4.8.4')] +configopts = "--with-qmake=$EBROOTQMAKE/bin/qmake" + sanity_check_paths = { - 'files': ["bin/cube3", "include/cube3/Cube.h", "lib/libcube3.a"], - 'dirs': [] + 'files': ["bin/cube3_%s" % x for x in ["clean", "cmp", "cut", "diff", "mean", "merge", "part", + "remap", "score", "stat", "topoassist"]] + + ["bin/cube-config", "bin/tau2cube3", "include/cube3/Cube.h", "include/cube3/cube_error.h", + "include/stats/P2Statistic.h", "lib/libcube3.a", "lib/libcubew3.a", "lib/libstats.a"], + 'dirs': ["include/cubew3"], } moduleclass = 'perf' -- GitLab From db986bed57829b197dda761f564e17a2461cf9d8 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 22:40:56 +0100 Subject: [PATCH 220/811] correct specification of Qt install path provided to --with-qmake --- easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb index b12a0ad83e..9029ce3da1 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb @@ -24,7 +24,7 @@ source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/3.4/dist'] dependencies = [('Qt', '4.8.4')] -configopts = "--with-qmake=$EBROOTQMAKE/bin/qmake" +configopts = "--with-qmake=$EBROOTQT/bin/qmake" sanity_check_paths = { 'files': ["bin/cube3_%s" % x for x in ["clean", "cmp", "cut", "diff", "mean", "merge", "part", -- GitLab From 4a0c1656a665833b3bba406876369df6031cf9a3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Nov 2013 23:13:50 +0100 Subject: [PATCH 221/811] Cube 4.2: add patch file to fix Qt version check, add required configure options to specify path for Qt tools, tweak sanity check paths --- .../c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb | 8 ++++++-- .../c/Cube/Cube-4.2_fix-Qt-version-check.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/c/Cube/Cube-4.2_fix-Qt-version-check.patch diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb index 6546ee942b..0c307b4f19 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb @@ -22,11 +22,15 @@ toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist'] +patches = ['Cube-4.2_fix-Qt-version-check.patch'] + dependencies = [('Qt', '4.8.4')] +configopts = "QMAKE=$EBROOTQT/bin/qmake MOC=$EBROOTQT/bin/moc UIC=$EBROOTQT/bin/uic" + sanity_check_paths = { - 'files': ["bin/cube", "include/cube/Cube.h", "lib/libcube4.a"], - 'dirs': [] + 'files': ["bin/cube", "lib/libcube4.a", "lib/libcube4.so"], + 'dirs': ["include/cube", "include/cubew"], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2_fix-Qt-version-check.patch b/easybuild/easyconfigs/c/Cube/Cube-4.2_fix-Qt-version-check.patch new file mode 100644 index 0000000000..75fc2fed1b --- /dev/null +++ b/easybuild/easyconfigs/c/Cube/Cube-4.2_fix-Qt-version-check.patch @@ -0,0 +1,11 @@ +--- build-backend/configure.orig 2013-11-09 22:55:07.707702200 +0100 ++++ build-backend/configure 2013-11-09 22:56:59.949861730 +0100 +@@ -19889,7 +19889,7 @@ + else + echo "$as_me:$LINENO: Running $QMAKE --version:" >&5 + $QMAKE --version >&5 2>&1 +- qmake_version_sed='/^.*\([0-9]\.[0-9]\.[0-9]\).*$/!d;s//\1/' ++ qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\.[0-9]\).in.*$/!d;s//\1/' + at_cv_QT_VERSION=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $at_cv_QT_VERSION" >&5 -- GitLab From 84a03efbde3a6d78ce0cf52397d5a561d8db4a2d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 10 Nov 2013 00:01:43 +0100 Subject: [PATCH 222/811] get rid of faulty LAPACK easyconfig, correct version is already available --- .../l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb deleted file mode 100644 index c68bfa3e9c..0000000000 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-3.0.4.eb +++ /dev/null @@ -1,15 +0,0 @@ -name = 'LAPACK' -version = "3.4.2" - -homepage = 'http://www.netlib.org/lapack/' -description = """LAPACK is written in Fortran90 and provides routines for solving systems of - simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue - problems, and singular value problems.""" - -toolchain = {'name': 'gmpich2', 'version': '1.4.8'} -toolchainopts = {'pic': True} - -sources = ['%(namelower)s-%(version)s.tgz'] -source_urls = [homepage] - -moduleclass = 'numlib' -- GitLab From f9b4b1fff30ab15159a42e7d1a0cdf9e5a23c07f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 10 Nov 2013 00:03:50 +0100 Subject: [PATCH 223/811] add lib alternative in Scalasca 2.0 sanity check paths --- .../easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb index 814b95427d..c21b8de34c 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb @@ -39,7 +39,7 @@ configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' # # On some systems libraries end up in lib/ sanity_check_paths = { - 'files': ["bin/scalasca", "lib64/libpearl.replay.a"], + 'files': ["bin/scalasca", ("lib64/libpearl.replay.a", "lib/libpearl.replay.a")], 'dirs': [] } -- GitLab From 0dc68fcd3ceeb8019395002306e657c92f2196ee Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 10 Nov 2013 00:26:16 +0100 Subject: [PATCH 224/811] minor style fixes --- .../easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb | 11 ++++++----- .../easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb | 8 ++++---- .../b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb | 8 ++++---- .../b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb | 8 ++++---- .../easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb | 8 ++++---- .../easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb | 3 ++- .../easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb | 3 ++- .../c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb | 5 +++-- .../easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb | 3 ++- .../g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb | 3 ++- .../l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb | 9 +++++---- .../l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb | 6 +++--- .../l/libffi/libffi-3.0.11-goolf-1.4.10.eb | 6 +++--- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb | 6 +++--- .../l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb | 3 ++- .../l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb | 3 ++- .../easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb | 3 ++- .../easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb | 3 ++- .../m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb | 3 ++- .../o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb | 3 ++- .../p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb | 3 ++- .../p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb | 3 ++- .../easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 3 ++- .../s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb | 3 ++- .../ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb | 3 ++- .../SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb | 3 ++- .../XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb | 3 ++- .../XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb | 3 ++- .../easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb | 3 ++- 29 files changed, 77 insertions(+), 55 deletions(-) diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb index e116d77620..2bba083133 100644 --- a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb @@ -5,14 +5,15 @@ homepage = 'http://www.netlib.org/blacs/' description = """The BLACS (Basic Linear Algebra Communication Subprograms) project is an ongoing investigation whose purpose is to create a linear algebra oriented message passing interface that may be implemented efficiently and uniformly across a large range of distributed memory platforms.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'gompi', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'pic': True} -sources = [ - 'mpiblacs.tgz', - 'mpiblacs-patch03.tgz' - ] source_urls = [homepage] +sources = [ + 'mpiblacs.tgz', + 'mpiblacs-patch03.tgz', +] patches = ['bmake.mpi.patch'] diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb index 8574f1c7a3..4cd9a32ae0 100644 --- a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb @@ -9,11 +9,11 @@ description = """The BLACS (Basic Linear Algebra Communication Subprograms) proj toolchain = {'name': 'gmvapich2', 'version': '1.6.7'} toolchainopts = {'pic': True} -sources = [ - 'mpiblacs.tgz', - 'mpiblacs-patch03.tgz' - ] source_urls = [homepage] +sources = [ + 'mpiblacs.tgz', + 'mpiblacs-patch03.tgz', +] patches = ['bmake.mpi.patch'] diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb index b8efc69e4a..d2873654d9 100644 --- a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb @@ -9,11 +9,11 @@ description = """The BLACS (Basic Linear Algebra Communication Subprograms) proj toolchain = {'name': 'gmvapich2', 'version': '1.7.9a2'} toolchainopts = {'pic': True} -sources = [ - 'mpiblacs.tgz', - 'mpiblacs-patch03.tgz', - ] source_urls = [homepage] +sources = [ + 'mpiblacs.tgz', + 'mpiblacs-patch03.tgz', +] patches = ['bmake.mpi.patch'] diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb index 45858f438a..dfd7fe4377 100644 --- a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb @@ -9,11 +9,11 @@ description = """The BLACS (Basic Linear Algebra Communication Subprograms) proj toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = [ - 'mpiblacs.tgz', - 'mpiblacs-patch03.tgz' - ] source_urls = [homepage] +sources = [ + 'mpiblacs.tgz', + 'mpiblacs-patch03.tgz', +] patches = ['bmake.mpi.patch'] diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb index b66d1dad90..f27da0bae7 100644 --- a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb @@ -9,11 +9,11 @@ description = """The BLACS (Basic Linear Algebra Communication Subprograms) proj toolchain = {'name': 'iiqmpi', 'version': '3.3.0'} toolchainopts = {'pic': True} -sources = [ - 'mpiblacs.tgz', - 'mpiblacs-patch03.tgz' - ] source_urls = [homepage] +sources = [ + 'mpiblacs.tgz', + 'mpiblacs-patch03.tgz', +] patches = ['bmake.mpi.patch'] diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb index 729f070cf0..262bf6c271 100644 --- a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb @@ -5,7 +5,8 @@ homepage = 'http://www.bzip.org/' description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'pic': True} sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb index e2f7ff685c..3afaf4cf84 100644 --- a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb @@ -5,7 +5,8 @@ homepage = 'http://www.bzip.org/' description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.""" -toolchain = {'name': 'iqacml', 'version': '3.7.3'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'pic': True} sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb index 4112103015..6a82a35581 100644 --- a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb @@ -3,8 +3,9 @@ version = "2.8.10.2" homepage = 'http://www.cmake.org' description = """CMake, the cross-platform, open-source build system. - CMake is a family of tools designed to build, test and package software.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb index b4c491760f..bb61485bd7 100644 --- a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb @@ -4,7 +4,8 @@ version = '2.8.4' homepage = 'http://www.cmake.org' description = """CMake, the cross-platform, open-source build system. CMake is a family of tools designed to build, test and package software.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb index 9b1102a364..93247f5f1a 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb @@ -5,7 +5,8 @@ homepage = 'http://www.gnu.org/software/gettext/' description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools and documentation""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = [SOURCE_TAR_GZ] source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb index eab90dde3c..de6fb450b3 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb @@ -7,14 +7,15 @@ description = """The libffi library provides a portable, high level programming FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] sanity_check_paths = { - 'files': ['lib/libffi.a'], - 'dirs': [] - } + 'files': ['lib/libffi.a'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb index 1bd77cc83f..9988537e78 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb @@ -14,8 +14,8 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] sanity_check_paths = { - 'files': ['lib/libffi.a'], - 'dirs': [] - } + 'files': ['lib/libffi.a'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb index a89e4122d7..bb250cc5bb 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb @@ -13,8 +13,8 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] sanity_check_paths = { - 'files': ['lib/libffi.a'], - 'dirs': [] - } + 'files': ['lib/libffi.a'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb index bf80a2e854..f504cc61ca 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb @@ -16,8 +16,8 @@ source_urls = ['ftp://sourceware.org/pub/libffi/'] patches = ['libffi-3.0.11_icc_UINT128.patch'] sanity_check_paths = { - 'files': ['lib/libffi.a'], - 'dirs': [] - } + 'files': ['lib/libffi.a'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb index b42c0e2586..438ed0863f 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb @@ -4,7 +4,8 @@ version = '3.0.13' homepage = 'http://sourceware.org/libffi/' description = """The libffi library provides a portable, high level programming interface to various calling conventions. This allows a programmer to call any function specified by a call interface description at run-time.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} source_urls = ['ftp://sourceware.org/pub/libffi/'] sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb index 7ee323fa94..d664c36f04 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb @@ -6,7 +6,8 @@ description = """The GNU Readline library provides a set of functions for use by allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftpmirror.gnu.org/readline/'] diff --git a/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb index 4e5decf1c2..df745e21ed 100644 --- a/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb @@ -5,7 +5,8 @@ homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview' description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes, and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb index 299d995c99..bbdebb5bc7 100644 --- a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb @@ -5,7 +5,8 @@ homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview' description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes, and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb b/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb index 7ab8745e78..24983fd5fd 100644 --- a/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb +++ b/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb @@ -4,7 +4,8 @@ versionsuffix = '-metis' homepage = 'http://graal.ens-lyon.fr/MUMPS/' description = "A parallel sparse direct solver" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'pic': True, 'usempi': True} source_urls = ['http://mumps.enseeiht.fr/'] diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb index 32c195a23a..a8b1a5e7a9 100644 --- a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb @@ -5,7 +5,8 @@ homepage = 'http://www.openssl.org/' description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library. """ -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb index e7c1d8ba57..8d40e333fb 100644 --- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb @@ -7,7 +7,8 @@ description = """ParMETIS is an MPI-based parallel library that implements a var routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} source_urls = [ diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb index ce6d6c382e..a0d6b8d1ed 100644 --- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb @@ -7,7 +7,8 @@ description = """ParMETIS is an MPI-based parallel library that implements a var routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index 7e5fa064a5..f097672302 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -3,7 +3,8 @@ version = '2.7.3' homepage = 'http://python.org/' description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} numpyversion = '1.6.1' diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb index 2965588b4c..fbe9ad703d 100644 --- a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb @@ -4,7 +4,8 @@ version = '6.0.0_esmumps' homepage = 'http://www.labri.fr/perso/pelegrin/scotch/' description = """Software package and libraries for sequential and parallel graph partitioning, static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'pic': True} source_urls = ['https://gforge.inria.fr/frs/download.php/31832/'] diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb index 57fd673afe..b783e38692 100644 --- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb @@ -7,7 +7,8 @@ homepage = 'https://sourcesup.cru.fr/projects/scientific-py/' description = """ScientificPython is a collection of Python modules for scientific computing. It contains support for geometry, mathematical functions, statistics, physical units, IO, visualization, and parallelization.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309'] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb index b785bb3bb7..2776109eda 100644 --- a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb +++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb @@ -4,7 +4,8 @@ versionsuffix = '-withparmetis' homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' description = """SuiteSparse is a collection of libraries manipulate sparse matrices.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goalf', 'version': '1.1.0-no-OFED'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True} source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/'] diff --git a/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb index 5685920b83..47da2272fc 100644 --- a/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb @@ -5,7 +5,8 @@ version = '2.0018' homepage = 'http://search.cpan.org/src/SHLOMIF/XML-LibXML-2.0018/' description = """Perl binding for libxml2""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://www.cpan.org/modules/by-module/XML/SHLOMIF/'] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb index 91bbb47976..3ef8ceb0fe 100644 --- a/easybuild/easyconfigs/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb @@ -5,7 +5,8 @@ version = '2.20' homepage = 'http://search.cpan.org/src/GRANTM/XML-Simple-2.20/' description = """Easily read/write XML in Perl""" -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://www.cpan.org/modules/by-module/XML/GRANTM/'] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb index 6c43ff62ba..92d4cdf564 100644 --- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb @@ -5,7 +5,8 @@ homepage = 'http://www.zlib.net/' description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system.""" -toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'}) + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] -- GitLab From 728d9e2a9adaab2a783f233b92cecc2c61ccb737 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 10 Nov 2013 14:01:05 +0100 Subject: [PATCH 225/811] make sure also cube3 and cube3-qt binaries are checked --- .../easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb index 9029ce3da1..71977159d4 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb @@ -27,8 +27,8 @@ dependencies = [('Qt', '4.8.4')] configopts = "--with-qmake=$EBROOTQT/bin/qmake" sanity_check_paths = { - 'files': ["bin/cube3_%s" % x for x in ["clean", "cmp", "cut", "diff", "mean", "merge", "part", - "remap", "score", "stat", "topoassist"]] + + 'files': ["bin/cube3%s" % x for x in ["", "-qt", "_clean", "_cmp", "_cut", "_diff", "_mean", "_merge", + "_part", "_remap", "_score", "_stat", "_topoassist"]] + ["bin/cube-config", "bin/tau2cube3", "include/cube3/Cube.h", "include/cube3/cube_error.h", "include/stats/P2Statistic.h", "lib/libcube3.a", "lib/libcubew3.a", "lib/libstats.a"], 'dirs': ["include/cubew3"], -- GitLab From d74328162cd10e663b94a9e49ee5ac5d5540d82a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 10 Nov 2013 16:04:42 +0100 Subject: [PATCH 226/811] clean up Score-P easyconfig now we have a Score-P easyblock --- .../Score-P-1.2.1-gompi-1.4.12-no-OFED.eb | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb index 061f763dd3..7731f03121 100644 --- a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb @@ -17,6 +17,10 @@ description = """The Score-P measurement infrastructure is a highly scalable and toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} +# http://www.vi-hps.org/upload/packages/scorep/scorep-1.2.1.tar.gz +sources = ["scorep-%(version)s.tar.gz"] +source_urls = ['http://www.vi-hps.org/upload/packages/scorep/'] + # compiler toolchain depencies dependencies = [ ('binutils', '2.22'), @@ -27,35 +31,9 @@ dependencies = [ ('PDT', '3.19'), ] -# http://www.vi-hps.org/upload/packages/scorep/scorep-1.2.1.tar.gz -sources = ["scorep-%(version)s.tar.gz"] -source_urls = ['http://www.vi-hps.org/upload/packages/scorep/'] - -# --- BM CONFIGOPTS --- -# -# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect -# --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) -# --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) -# -# OTF2, OPARI2, Cube, PDT autodetection worked fine under EasyBuild, so only if needed use -# --with-otf2[=] # Provide path to otf2-config. Auto-detected if already in $PATH. -# --with-opari2[=] # Provide path to opari2-config. Auto-detected if already in $PATH. -# --with-cube[=] # Provide path to cube-config. Auto-detected if already in $PATH. -# --with-pdt= # Specifies the path to the program database toolkit (PDT) binaries, e.g., cparse. -configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' -configopts += ' --with-papi-header=${EBROOTPAPI}/include --with-papi-lib=${EBROOTPAPI}/lib64' -configopts += ' --with-libbfd=${EBROOTBINUTILS}' - -# --- BM EXTENSIONS --- -# -# Score-P does also support CUDA measurements - not yet tested in EasyBuild -# configopts += ' --with-libcudart=(yes|no|)' - -# --- BM LIB64 --- -# -# On some systems libraries end up in lib/ sanity_check_paths = { - 'files': ["bin/scorep", "include/scorep/SCOREP_User.h", "lib64/libscorep_adapter_mpi_event.a"], + 'files': ["bin/scorep", "include/scorep/SCOREP_User.h", + ("lib64/libscorep_adapter_mpi_event.a", "lib/libscorep_adapter_mpi_event.a")], 'dirs': [] } -- GitLab From 0288beeb6468635f2a2a5cfeae9d2b02466fb814 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 10:32:26 +0100 Subject: [PATCH 227/811] OpenBabel: specify toolchain in filename --- .../{OpenBabel-2.3.2.eb => OpenBabel-2.3.2-ictce-5.5.0.eb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/o/OpenBabel/{OpenBabel-2.3.2.eb => OpenBabel-2.3.2-ictce-5.5.0.eb} (100%) diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb similarity index 100% rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2.eb rename to easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb -- GitLab From a056771366ce4708e4607bd7b17fa137c6c675be Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 11:01:45 +0100 Subject: [PATCH 228/811] libxml2: updated to goalf-1.5.12-no-OFED --- .../libxml2-2.9.1-goalf-1.5.12-no-OFED.eb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..2145f1ccf3 --- /dev/null +++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,22 @@ +easyblock = 'ConfigureMake' + +name = 'libxml2' +version = '2.9.1' + +homepage = 'http://xmlsoft.org/' +description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable +outside of the Gnome platform).""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} + +source_urls = [ + 'http://xmlsoft.org/sources/', + 'http://xmlsoft.org/sources/old/' +] +sources = [SOURCELOWER_TAR_GZ] + +configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python' + +dependencies = [('zlib', '1.2.8')] + +moduleclass = 'lib' -- GitLab From 2415f446851df923d9867d45d6ad1b4a96431e64 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 11:02:54 +0100 Subject: [PATCH 229/811] CMake: updated to goalf-1.5.12-no-OFED --- .../CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..d7c1932718 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,18 @@ +name = 'CMake' +version = "2.8.12" + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From 0ad56be4287bddd936ea40232041fecb54ca112a Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 11:04:36 +0100 Subject: [PATCH 230/811] Added Eigen for goalf-1.5.12-no-OFED --- .../Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..0dfffb0970 --- /dev/null +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'Eigen' +version = '3.1.4' + +homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' +description = """Eigen is a C++ template library for linear algebra: + matrices, vectors, numerical solvers, and related algorithms.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = ['%s.tar.bz2' % version] +source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] + +moduleclass = 'math' -- GitLab From a7c505bc1fa92f23e3f34f3f2d71411dc82f154a Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 11:05:44 +0100 Subject: [PATCH 231/811] Added OpenBabel for goalf-1.5.12-no-OFED --- .../OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..2b6f5d0a9b --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,37 @@ +name = 'OpenBabel' +version = '2.3.2' + +homepage = 'http://openbabel.org' +description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical +data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data +from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ +# 'OpenBabel-%(version)s-use-xHost.patch', + 'OpenBabel-%(version)s-fix-link-path-tests.patch', + 'OpenBabel-%(version)s-ignore-failed-test.patch', +] + +builddependencies = [('CMake', '2.8.12')] + +dependencies = [ + ('zlib', '1.2.8'), + ('libxml2', '2.9.1'), + ('Eigen', '3.1.4'), + ('Python', '2.7.5'), +] + +sanity_check_paths = { + 'files': ['bin/babel', 'lib/libopenbabel.so'], + 'dirs': ['share/openbabel'], +} + +runtest = 'test' + +moduleclass = 'chem' -- GitLab From b2f831474f780be2434c9a68f186ded6ad0dbf35 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 15:44:52 +0100 Subject: [PATCH 232/811] fix remark, get rid of useless line --- .../m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb index bf64592318..6c70a6433c 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -10,7 +10,6 @@ and ipython shell, web application servers, and six graphical user interface too """ toolchain = {'name': 'ictce', 'version': '4.1.13'} -majorversion = "%s.x" % ".".join(version.split('.')[:-1]) source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] sources = [SOURCELOWER_TAR_GZ] -- GitLab From cad0148310e697ddac1f878ef238aaa31b647106 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 15:55:49 +0100 Subject: [PATCH 233/811] remove commented out patch files --- easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb index 1bb629aaae..6d6b11f3d6 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb @@ -23,8 +23,6 @@ dependencies = [ patches = [ 'WRF_parallel_build_fix.patch', - #'WRF-%(version)s_netCDF-Fortran_separate_path.patch', - #'WRF-%(version)s_known_problems.patch', 'WRF-3.5_netCDF-Fortran_separate_path.patch', 'WRF_tests_limit-runtimes.patch', ] -- GitLab From 69f0872a8a56ab7f6765986d8e8da3be0ecf8b6d Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 16:15:12 +0100 Subject: [PATCH 234/811] OpenBabel: use seperate build directory option --- .../easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb index e6cf2ca9a2..faaf4b6fd2 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb @@ -32,6 +32,8 @@ sanity_check_paths = { 'dirs': ['share/openbabel'], } +separate_build_dir = True + runtest = 'test' moduleclass = 'chem' -- GitLab From 57b3f8790552250360eff00fa8bccec8a74dfd61 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 16:29:44 +0100 Subject: [PATCH 235/811] use templating for name/version in sources spec --- .../easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.3.1-goolf-1.4.10-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-5.3.0-dmpar.eb | 2 +- .../easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.4-goolf-1.4.10-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-5.3.0-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.5-goolf-1.4.10-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-5.3.0-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb | 2 +- easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb index 95a5040796..cbe8459962 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goolf-1.4.10-dmpar.eb index 952353203d..ed91ae6945 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goolf-1.4.10-dmpar.eb @@ -9,7 +9,7 @@ research needs.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb index fbf71dd749..c3795e834f 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-5.3.0-dmpar.eb index e0bc481823..7c8dcaae6f 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-5.3.0-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb index d53b10e1a3..1173c7f617 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] netcdf_version = '4.2' diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4-goolf-1.4.10-dmpar.eb index 58cbd08f08..f105c2bc7f 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.4-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.4-goolf-1.4.10-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb index eab23414a2..12ed056cc6 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-5.3.0-dmpar.eb index b70ec3b53a..84094255a4 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-5.3.0-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb index 45f5a1b240..458c18466a 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5-goolf-1.4.10-dmpar.eb index 419dc5619b..50f973fe2a 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.5-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5-goolf-1.4.10-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb index 28f01ba811..e7fbb9722a 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-5.3.0-dmpar.eb index f6cb533a3c..7dbefef99f 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-5.3.0-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb index 6d6b11f3d6..1449f6bc08 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.4.10-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb index 4a1027a710..52493be663 100644 --- a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb @@ -9,7 +9,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] # csh is used by WRF install scripts -- GitLab From c4f395028ce92f4bf6938d6ad93cab4c4c567406 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 16:43:20 +0100 Subject: [PATCH 236/811] use templating for name/version in sources spec --- .../easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb | 3 +-- easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb | 3 +-- easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb | 2 +- .../easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb | 2 +- easybuild/easyconfigs/w/WPS/WPS-3.4-goolf-1.4.10-dmpar.eb | 2 +- easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb | 2 +- easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb | 2 +- easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb | 2 +- easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb | 2 +- easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb index 4fd0070d9a..66840bc3fb 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb @@ -9,8 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] - +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] buildtype = "dmpar" diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb index b00b541032..d191598cb4 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb @@ -9,8 +9,7 @@ forecasting and atmospheric research needs.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] - +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] buildtype = "dmpar" diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb index 463ccf6659..16a3c57158 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb @@ -9,7 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] buildtype = "dmpar" diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb index 134bcbdbdb..df3c22e073 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb @@ -9,7 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-goolf-1.4.10-dmpar.eb index ceecd8bc90..38cbdd299d 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-goolf-1.4.10-dmpar.eb @@ -9,7 +9,7 @@ forecasting and atmospheric research needs.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb index ce979e6920..0f57f30f8f 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb @@ -9,7 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb index 5de6610d4d..d43822d6cd 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb @@ -10,7 +10,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb index 62b7bbb69c..a4441004d5 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb @@ -9,7 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name,version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb index 9eebf9dbb8..3819367697 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb @@ -9,7 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb index 0df4426d34..db34226522 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb @@ -9,7 +9,7 @@ description = """WRF Preprocessing System (WPS) for WRF. The Weather Research an toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True} -sources = ['%sV%s.TAR.gz' % (name, version)] +sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] patches = ['WPS_netCDF-Fortran_seperate_path.patch'] -- GitLab From 521c4b0224d0e46503db05c14fa91252db891eb4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 17:28:00 +0100 Subject: [PATCH 237/811] use include-xmmintrin patch in all libffi ictce easyconfigs --- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb | 2 +- .../l/libffi/libffi-3.0.11_include-xmmintrin.patch | 10 ++++++++++ .../easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb index f504cc61ca..0fd8cf3829 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-3.0.11_icc_UINT128.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb index 072d1d7f01..6928ee5dd2 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%s-%s.tar.gz' % (name.lower(), version)] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-3.0.11_icc_UINT128.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch new file mode 100644 index 0000000000..31c92f0258 --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch @@ -0,0 +1,10 @@ +--- src/x86/ffi64.c.orig 2012-04-12 04:46:06.000000000 +0200 ++++ src/x86/ffi64.c 2013-11-11 17:23:38.837428062 +0100 +@@ -38,6 +38,7 @@ + #define MAX_SSE_REGS 8 + + #ifdef __INTEL_COMPILER ++#include "xmmintrin.h" + #define UINT128 __m128 + #else + #define UINT128 __int128_t diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb index 63c1b4b7b9..8c7c963c25 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['ftp://sourceware.org/pub/libffi/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['libffi-3.0.13_include-xmmintrin.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.%s' % SHLIB_EXT, 'lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb index 0604aa1f88..0e0090cb84 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.2.0'} source_urls = ['ftp://sourceware.org/pub/libffi/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['libffi-3.0.13_include-xmmintrin.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.%s' % SHLIB_EXT, 'lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb index 9c5be5f998..06822ddc75 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['ftp://sourceware.org/pub/libffi/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['libffi-3.0.13_include-xmmintrin.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.%s' % SHLIB_EXT, 'lib/libffi.a'], -- GitLab From b19c96868a5a8180f760ccc647ae83da1fef826a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 17:37:33 +0100 Subject: [PATCH 238/811] remove binutils gompi easyconfig file, moved to #507 --- .../binutils-2.22-gompi-1.4.12-no-OFED.eb | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb deleted file mode 100644 index 5483614323..0000000000 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb +++ /dev/null @@ -1,31 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine -# Authors:: Fotis Georgatos -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html -## - -name = 'binutils' -version = '2.22' - -homepage = 'http://directory.fsf.org/project/binutils/' -description = "binutils-2.22: GNU binary utilities" - -sources = ['binutils-%s.tar.bz2' % version] -source_urls = ['http://ftp.gnu.org/gnu/binutils'] - -toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} - -binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', - 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] -sanity_check_paths = { - 'files': ['bin/%s' % x for x in binlist], - 'dirs': [], -} - -moduleclass = 'tools' -- GitLab From f885642867e155aca8499fe65ffb0d086724039d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 17:13:35 +0100 Subject: [PATCH 239/811] enable -fPIC for binutils, add gompi easyconfig for binutils as dependency for Extrae Conflicts: easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb --- .../binutils-2.22-goalf-1.1.0-no-OFED.eb | 4 ++- .../binutils-2.22-gompi-1.4.12-no-OFED.eb | 33 +++++++++++++++++++ .../b/binutils/binutils-2.22-goolf-1.4.10.eb | 3 +- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb index 7b3fb64e52..add5f24592 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb @@ -20,11 +20,13 @@ sources = ['binutils-%s.tar.bz2' % version] source_urls = ['http://ftp.gnu.org/gnu/binutils'] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'pic': True} binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] sanity_check_paths = { - 'files': ['bin/%s' % x for x in binlist], + 'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + + ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']], 'dirs': [], } diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..17866810c4 --- /dev/null +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,33 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html +## + +name = 'binutils' +version = '2.22' + +homepage = 'http://directory.fsf.org/project/binutils/' +description = "binutils-2.22: GNU binary utilities" + +sources = ['binutils-%s.tar.bz2' % version] +source_urls = ['http://ftp.gnu.org/gnu/binutils'] + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'pic': True} + +binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', + 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] +sanity_check_paths = { + 'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + + ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb index 7a4dbcf5c7..9ccfe20342 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb @@ -24,7 +24,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm', 'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ] sanity_check_paths = { - 'files': ['bin/%s' % x for x in binlist], + 'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + + ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']], 'dirs': [], } -- GitLab From 605c5f215f44d510f95756483cd46dc0121ca374 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 17:57:59 +0100 Subject: [PATCH 240/811] tweak icc_UINT128 patch for libffi 3.0.11, use it for ictce libffi 3.0.11 easyconfigs --- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb index 0fd8cf3829..83c290bfaf 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-%(version)s_include-xmmintrin.patch'] +patches = ['libffi-%(version)s_icc_UINT128.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb index 6928ee5dd2..79d03fb7a5 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%s-%s.tar.gz' % (name.lower(), version)] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-%(version)s_include-xmmintrin.patch'] +patches = ['libffi-%(version)s_icc_UINT128.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch index 423f9c1e53..750b0bcc83 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch @@ -1,18 +1,14 @@ -Only in libffi-3.0.11: Makefile -Only in libffi-3.0.11: makefile.sed~ -Only in libffi-3.0.11: makefiles.mk~ -Only in libffi-3.0.11: makefiles.out~ -Only in libffi-3.0.11: makefiles.sed~ diff -ru libffi-3.0.11.orig/src/x86/ffi64.c libffi-3.0.11/src/x86/ffi64.c --- libffi-3.0.11.orig/src/x86/ffi64.c 2012-04-12 04:46:06.000000000 +0200 +++ libffi-3.0.11/src/x86/ffi64.c 2012-08-29 11:06:28.311735374 +0200 -@@ -38,11 +38,11 @@ +@@ -38,11 +38,12 @@ #define MAX_SSE_REGS 8 #ifdef __INTEL_COMPILER -#define UINT128 __m128 -#else -#define UINT128 __int128_t ++#include "xmmintrin.h" +typedef struct { int64_t m[2]; } __int128_t; #endif @@ -42,4 +38,3 @@ diff -ru libffi-3.0.11.orig/src/x86/ffi64.c libffi-3.0.11/src/x86/ffi64.c break; default: abort(); -Only in libffi-3.0.11: x86_64-unknown-linux-gnu -- GitLab From 464f4d2d9a25d65307e09d4a90d9b9c541e2c9f2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 18:01:03 +0100 Subject: [PATCH 241/811] add easyconfig for EB v1.8.2 --- .../e/EasyBuild/EasyBuild-1.8.2.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb new file mode 100644 index 0000000000..13f2a0d294 --- /dev/null +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb @@ -0,0 +1,29 @@ +easyblock = 'EB_EasyBuildMeta' + +name = 'EasyBuild' +version = '1.8.2' + +homepage = 'http://hpcugent.github.com/easybuild/' +description = """EasyBuild is a software build and installation framework + written in Python that allows you to install software in a structured, +repeatable and robust way.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://pypi.python.org/packages/source/e/easybuild-framework/', + 'http://pypi.python.org/packages/source/e/easybuild-easyblocks/', + 'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/', +] +# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?) +sources = [ + 'easybuild-framework-%(version)s.tar.gz', + 'easybuild-easyblocks-%(version)s.tar.gz', + 'easybuild-easyconfigs-%(version)s.0.tar.gz', +] + +# EasyBuild is a (set of) Python packages, so it depends on Python +# usually, we want to use the system Python, so no actual Python dependency is listed +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] + +moduleclass = 'tools' -- GitLab From 5613b49d09300b7a9d36125303eaaa6036bbbc46 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 18:05:04 +0100 Subject: [PATCH 242/811] Revert "tweak icc_UINT128 patch for libffi 3.0.11, use it for ictce libffi 3.0.11 easyconfigs" This reverts commit 605c5f215f44d510f95756483cd46dc0121ca374. --- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb index 83c290bfaf..0fd8cf3829 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-%(version)s_icc_UINT128.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb index 79d03fb7a5..6928ee5dd2 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%s-%s.tar.gz' % (name.lower(), version)] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-%(version)s_icc_UINT128.patch'] +patches = ['libffi-%(version)s_include-xmmintrin.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch index 750b0bcc83..423f9c1e53 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_icc_UINT128.patch @@ -1,14 +1,18 @@ +Only in libffi-3.0.11: Makefile +Only in libffi-3.0.11: makefile.sed~ +Only in libffi-3.0.11: makefiles.mk~ +Only in libffi-3.0.11: makefiles.out~ +Only in libffi-3.0.11: makefiles.sed~ diff -ru libffi-3.0.11.orig/src/x86/ffi64.c libffi-3.0.11/src/x86/ffi64.c --- libffi-3.0.11.orig/src/x86/ffi64.c 2012-04-12 04:46:06.000000000 +0200 +++ libffi-3.0.11/src/x86/ffi64.c 2012-08-29 11:06:28.311735374 +0200 -@@ -38,11 +38,12 @@ +@@ -38,11 +38,11 @@ #define MAX_SSE_REGS 8 #ifdef __INTEL_COMPILER -#define UINT128 __m128 -#else -#define UINT128 __int128_t -+#include "xmmintrin.h" +typedef struct { int64_t m[2]; } __int128_t; #endif @@ -38,3 +42,4 @@ diff -ru libffi-3.0.11.orig/src/x86/ffi64.c libffi-3.0.11/src/x86/ffi64.c break; default: abort(); +Only in libffi-3.0.11: x86_64-unknown-linux-gnu -- GitLab From b58b7dea4dcb7d49177a54d3bbcfe2ed8e177456 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 18:07:50 +0100 Subject: [PATCH 243/811] git rid of libffi 3.0.11 ictce-5.3.0 easyconfig (and patch required for it), is obsolete now libffi 3.0.13 is available --- .../l/libffi/libffi-3.0.11-ictce-4.0.6.eb | 2 +- .../l/libffi/libffi-3.0.11-ictce-5.3.0.eb | 23 ------------------- .../libffi-3.0.11_include-xmmintrin.patch | 10 -------- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb delete mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb index 0fd8cf3829..83c290bfaf 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['ftp://sourceware.org/pub/libffi/'] -patches = ['libffi-%(version)s_include-xmmintrin.patch'] +patches = ['libffi-%(version)s_icc_UINT128.patch'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb deleted file mode 100644 index 6928ee5dd2..0000000000 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-5.3.0.eb +++ /dev/null @@ -1,23 +0,0 @@ -name = 'libffi' -version = '3.0.11' - -homepage = 'http://sourceware.org/libffi' -description = """The libffi library provides a portable, high level programming interface to various calling conventions. - This allows a programmer to call any function specified by a call interface description at run-time. - -FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the interface that -allows code written in one language to call code written in another language.""" - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - -sources = ['%s-%s.tar.gz' % (name.lower(), version)] -source_urls = ['ftp://sourceware.org/pub/libffi/'] - -patches = ['libffi-%(version)s_include-xmmintrin.patch'] - -sanity_check_paths = { - 'files': ['lib/libffi.a'], - 'dirs': [] - } - -moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch b/easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch deleted file mode 100644 index 31c92f0258..0000000000 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11_include-xmmintrin.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/x86/ffi64.c.orig 2012-04-12 04:46:06.000000000 +0200 -+++ src/x86/ffi64.c 2013-11-11 17:23:38.837428062 +0100 -@@ -38,6 +38,7 @@ - #define MAX_SSE_REGS 8 - - #ifdef __INTEL_COMPILER -+#include "xmmintrin.h" - #define UINT128 __m128 - #else - #define UINT128 __int128_t -- GitLab From 497cecd0ea865f795c0a2bd868503d9e7fb842ac Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 20:15:41 +0100 Subject: [PATCH 244/811] GSL: small style change --- easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb index cc919ac9fe..3279101aeb 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb @@ -5,7 +5,6 @@ homepage = 'http://www.gnu.org/software/gsl/' description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" - toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -- GitLab From a522b7b22edfa1dee48c2c069a80418ae561e1eb Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 11 Nov 2013 20:31:15 +0100 Subject: [PATCH 245/811] arpack-ng: correct sanity files list --- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb | 2 +- .../easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb index a881a858db..e562d6c9ba 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb @@ -20,7 +20,7 @@ patches = [ configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' sanity_check_paths = { - 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libarpack.a"], + 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libparpack.so"], 'dirs': [] } diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb index ca2cadff5f..29f2124f98 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb @@ -20,7 +20,7 @@ patches = [ configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"' sanity_check_paths = { - 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libarpack.a"], + 'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libparpack.so"], 'dirs': [] } -- GitLab From 35889c20816765243f13db958ec0c91255a0b10f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 20:41:43 +0100 Subject: [PATCH 246/811] fix arpack-ng patch file --- .../arpack-ng-3.1.3-configure-mpi.patch | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch index ba4143f262..c9884b5976 100644 --- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-configure-mpi.patch @@ -380,14 +380,6 @@ index 375d1a7..d9df277 100644 # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. -diff --git a/compile b/compile -new file mode 120000 -index 0000000..d3164c8 ---- /dev/null -+++ b/compile -@@ -0,0 +1 @@ -+/usr/share/automake-1.14/compile -\ No newline at end of file diff --git a/config.guess b/config.guess index 40eaed4..b79252d 100755 --- a/config.guess @@ -3860,14 +3852,6 @@ Subject: [PATCH 2/2] replace the symlink by a copy 1 file changed, 347 insertions(+), 1 deletion(-) mode change 120000 => 100755 compile -diff --git a/compile b/compile -deleted file mode 120000 -index d3164c8..0000000 ---- a/compile -+++ /dev/null -@@ -1 +0,0 @@ --/usr/share/automake-1.14/compile -\ No newline at end of file diff --git a/compile b/compile new file mode 100755 index 0000000..531136b -- GitLab From a113b118eb043d5fa9f4ad757e43db53c0e2b74e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 21:12:11 +0100 Subject: [PATCH 247/811] minor style fixes --- .../a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb | 6 ++--- .../libpciaccess-0.13.1-GCC-4.7.2.eb | 17 ++++++------ ...libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb | 16 +++++------ .../libpciaccess-0.13.1-goolf-1.4.10.eb | 17 ++++++------ .../libpciaccess-0.13.1-ictce-4.0.6.eb | 16 +++++------ .../libpciaccess-0.13.1-ictce-5.3.0.eb | 17 ++++++------ .../o/ORCA/ORCA-2_9_1-linux_x86-64.eb | 5 ++-- .../ORCA-3_0_0-linux_x86-64_openmpi_165.eb | 27 ++++++++++--------- .../OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb | 2 +- .../o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb | 2 +- .../OpenMPI-1.6.3-iccifort-2011.13.367.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 2 +- .../xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb | 14 +++++----- .../xorg-macros-1.17-goalf-1.1.0-no-OFED.eb | 14 +++++----- .../xorg-macros-1.17-goolf-1.4.10.eb | 8 +++--- .../xorg-macros-1.17-ictce-4.0.6.eb | 14 +++++----- .../xorg-macros-1.17-ictce-5.3.0.eb | 15 +++++------ 20 files changed, 100 insertions(+), 100 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb index e7f48d52a0..fcd7007494 100755 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb @@ -6,15 +6,15 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'GCC', 'version': '4.7.2'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] sanity_check_paths = { 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb index 57b19f2a34..354853cbff 100755 --- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb @@ -6,18 +6,19 @@ description = """Generic PCI access library.""" source_urls = ['http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot'] sources = [SOURCE_TAR_GZ] + toolchain = {'name': 'GCC', 'version': '4.7.2'} +builddependencies = [ + ('Autoconf', '2.69'), + ('xorg-macros', '1.17'), +] + preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && " sanity_check_paths = { - 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], - 'dirs': ['lib/pkgconfig'] - } - -builddependencies = [ - ('Autoconf', '2.69'), - ('xorg-macros', '1.17') - ] + 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], + 'dirs': ['lib/pkgconfig'], +} moduleclass = 'system' diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb index e151f4808c..0be9a759df 100644 --- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb @@ -9,16 +9,16 @@ sources = [SOURCE_TAR_GZ] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +builddependencies = [ + ('Autoconf', '2.69'), + ('xorg-macros', '1.17'), +] + preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && " sanity_check_paths = { - 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], - 'dirs': ['lib/pkgconfig'] - } - -dependencies = [ - ('Autoconf', '2.69'), - ('xorg-macros', '1.17') - ] + 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], + 'dirs': ['lib/pkgconfig'], +} moduleclass = 'system' diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb index 912f8799d3..66801ecc40 100644 --- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb @@ -6,18 +6,19 @@ description = """Generic PCI access library.""" source_urls = ['http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot'] sources = [SOURCE_TAR_GZ] + toolchain = {'name': 'goolf', 'version': '1.4.10'} +builddependencies = [ + ('Autoconf', '2.69'), + ('xorg-macros', '1.17'), +] + preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && " sanity_check_paths = { - 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], - 'dirs': ['lib/pkgconfig'] - } - -dependencies = [ - ('Autoconf', '2.69'), - ('xorg-macros', '1.17') - ] + 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], + 'dirs': ['lib/pkgconfig'], +} moduleclass = 'system' diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb index a9e10ec6b6..98be12dbee 100644 --- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb @@ -9,16 +9,16 @@ sources = [SOURCE_TAR_GZ] toolchain = {'name': 'ictce', 'version': '4.0.6'} +builddependencies = [ + ('Autoconf', '2.69'), + ('xorg-macros', '1.17'), +] + preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && " sanity_check_paths = { - 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], - 'dirs': ['lib/pkgconfig'] - } - -dependencies = [ - ('Autoconf', '2.69'), - ('xorg-macros', '1.17') - ] + 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], + 'dirs': ['lib/pkgconfig'], +} moduleclass = 'system' diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb index cb60a155ee..07f21c7dfb 100644 --- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb @@ -7,19 +7,18 @@ description = """Generic PCI access library.""" source_urls = ['http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot'] sources = [SOURCE_TAR_GZ] - toolchain = {'name': 'ictce', 'version': '5.3.0'} +builddependencies = [ + ('Autoconf', '2.69'), + ('xorg-macros', '1.17'), +] + preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && " sanity_check_paths = { - 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], - 'dirs': ['lib/pkgconfig'] - } - -dependencies = [ - ('Autoconf', '2.69'), - ('xorg-macros', '1.17') - ] + 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'], + 'dirs': ['lib/pkgconfig'], +} moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb b/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb index b4d348d9f1..76be1035a7 100644 --- a/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb +++ b/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb @@ -12,10 +12,9 @@ description = """ORCA is a flexible, efficient and easy-to-use general purpose t toolchain = {'name': 'dummy', 'version': 'dummy'} -sources = ['%s_%s_%s.tbz' % (name.lower(), version.split('-')[0], "-".join(version.split('-')[1:]))] +sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version.split('-')[1:]))] -comp = ('GCC', '4.6.3') -dependencies = [('OpenMPI', '1.4.5', '-no-OFED', comp)] +dependencies = [('OpenMPI', '1.4.5', '-no-OFED', ('GCC', '4.6.3'))] sanity_check_paths = { 'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf', diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb index 2045717dff..cab4bf21a6 100644 --- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb +++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb @@ -11,21 +11,22 @@ description = """ORCA is a flexible, efficient and easy-to-use general purpose t It can also treat environmental and relativistic effects.""" toolchain = {'name': 'dummy', 'version': 'dummy'} -dependencies = [('OpenMPI', '1.6.5', '-GCC-4.7.2')] -sources = ['%s_%s_%s.tbz' % (name.lower(), version.split('-')[0], "-".join(version.split('-')[1:]))] +sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version.split('-')[1:]))] + +dependencies = [('OpenMPI', '1.6.5', '-GCC-4.7.2')] sanity_check_paths = { - 'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf', - 'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc', - 'rocis', 'scf', 'scfgrad', 'soc'] - for y in ["", "_mpi"]] + \ - ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib', - 'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc', - 'md', 'mergefrag', 'ndoint', 'numfreq', 'plot', - 'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \ - ['orca', 'otool_cosmo'], - 'dirs': [] - } + 'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf', + 'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc', + 'rocis', 'scf', 'scfgrad', 'soc'] + for y in ["", "_mpi"]] + \ + ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib', + 'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc', + 'md', 'mergefrag', 'ndoint', 'numfreq', 'plot', + 'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \ + ['orca', 'otool_cosmo'], + 'dirs': [], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb index 368b930d23..1367d9607e 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb @@ -8,7 +8,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'GCC', 'version': '4.6.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] configopts = '--with-threads=posix --enable-shared --enable-mpi-threads --without-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb index 9e7974cf16..a35560d536 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb @@ -7,7 +7,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'GCC', 'version': '4.6.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] configopts = '--with-threads=posix --enable-shared --enable-mpi-threads --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb index 368fd7fbb9..91a35df405 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb @@ -7,7 +7,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'iccifort', 'version': '2011.13.367'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb index 1a944e1de6..398f18b92f 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb @@ -7,7 +7,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] dependencies = [ ('hwloc', '1.6.2') ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb index 663d94002f..7e234f5741 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb @@ -7,7 +7,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'GCC', 'version': '4.6.4'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] dependencies = [ ('hwloc', '1.6.2') ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb index e1428252d8..bf110b338b 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb @@ -7,7 +7,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] dependencies = [('hwloc', '1.6.2')] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb index 6f15d2ee54..64076b3027 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -7,7 +7,7 @@ description = "The Open MPI Project is an open source MPI-2 implementation." toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] dependencies = [ ('hwloc', '1.6.2'), diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb index 2f94a14774..13ac43c282 100755 --- a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-GCC-4.7.2.eb @@ -4,18 +4,18 @@ version = '1.17' homepage = 'http://cgit.freedesktop.org/xorg/util/macros' description = """X.org macros utilities.""" +toolchain = {'name': 'GCC', 'version': '4.7.2'} + source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! -sources = ['util-macros-%s.tar.gz' % version] +sources = ['util-macros-%(version)s.tar.gz'] -toolchain = {'name': 'GCC', 'version': '4.7.2'} +dependencies = [('Autoconf', '2.69')] preconfigopts = './autogen.sh && ' sanity_check_paths = { - 'files': ['share/pkgconfig/xorg-macros.pc'], - 'dirs': [] - } - -dependencies = [('Autoconf', '2.69')] + 'files': ['share/pkgconfig/xorg-macros.pc'], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb index 0907ab3e34..14ecec020e 100644 --- a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb @@ -4,18 +4,18 @@ version = '1.17' homepage = 'http://cgit.freedesktop.org/xorg/util/macros' description = """X.org macros utilities.""" +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} + source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! -sources = ['util-macros-%s.tar.gz' % version] +sources = ['util-macros-%(version)s.tar.gz'] -toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +dependencies = [('Autoconf', '2.69')] preconfigopts = './autogen.sh && ' sanity_check_paths = { - 'files': ['share/pkgconfig/xorg-macros.pc'], - 'dirs': [] - } - -dependencies = [('Autoconf', '2.69')] + 'files': ['share/pkgconfig/xorg-macros.pc'], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goolf-1.4.10.eb index c08dfa0268..2f86fc78e0 100644 --- a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goolf-1.4.10.eb @@ -4,10 +4,12 @@ version = '1.17' homepage = 'http://cgit.freedesktop.org/xorg/util/macros' description = """X.org macros utilities.""" +toolchain = {'name': 'goolf', 'version': '1.4.10'} + source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! -sources = ['util-macros-%s.tar.gz' % version] +sources = ['util-macros-%(version)s.tar.gz'] -toolchain = {'name': 'goolf', 'version': '1.4.10'} +dependencies = [('Autoconf', '2.69')] preconfigopts = './autogen.sh && ' @@ -16,6 +18,4 @@ sanity_check_paths = { 'dirs': [], } -dependencies = [('Autoconf', '2.69')] - moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb index 2c1fa91d89..50f4a1d8d0 100644 --- a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb @@ -4,18 +4,18 @@ version = '1.17' homepage = 'http://cgit.freedesktop.org/xorg/util/macros' description = """X.org macros utilities.""" +toolchain = {'name': 'ictce', 'version': '4.0.6'} + source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! -sources = ['util-macros-%s.tar.gz' % version] +sources = ['util-macros-%(version)s.tar.gz'] -toolchain = {'name': 'ictce', 'version': '4.0.6'} +dependencies = [('Autoconf', '2.69')] preconfigopts = './autogen.sh && ' sanity_check_paths = { - 'files': ['share/pkgconfig/xorg-macros.pc'], - 'dirs': [] - } - -dependencies = [('Autoconf', '2.69')] + 'files': ['share/pkgconfig/xorg-macros.pc'], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-5.3.0.eb index af954e6862..f78b600788 100644 --- a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-5.3.0.eb @@ -4,19 +4,18 @@ version = '1.17' homepage = 'http://cgit.freedesktop.org/xorg/util/macros' description = """X.org macros utilities.""" -source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! -sources = ['util-macros-%s.tar.gz' % version] +toolchain = {'name': 'ictce', 'version': '5.3.0'} +source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end! +sources = ['util-macros-%(version)s.tar.gz'] -toolchain = {'name': 'ictce', 'version': '5.3.0'} +dependencies = [('Autoconf', '2.69')] preconfigopts = './autogen.sh && ' sanity_check_paths = { - 'files': ['share/pkgconfig/xorg-macros.pc'], - 'dirs': [] - } - -dependencies = [('Autoconf', '2.69')] + 'files': ['share/pkgconfig/xorg-macros.pc'], + 'dirs': [], +} moduleclass = 'devel' -- GitLab From ebc5cc8ffada3041601582ca049eabadcfd9397a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 11 Nov 2013 21:29:15 +0100 Subject: [PATCH 248/811] minor style fixes --- .../s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb index 9d7071d5f3..d0822a60e9 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb @@ -9,11 +9,11 @@ description = """SciPy is a collection of mathematical algorithms and convenienc toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} -source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] dependencies = [ - ('numpy', '1.6.2', versionsuffix), - ] + ('numpy', '1.6.2', versionsuffix), +] moduleclass = 'math' -- GitLab From 73a5cb144b55cc90e5857bb5995f5152f1ea6a0e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 01:54:29 +0100 Subject: [PATCH 249/811] add GCC/4.8.2 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb new file mode 100644 index 0000000000..cef0802601 --- /dev/null +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2.eb @@ -0,0 +1,28 @@ +name = "GCC" +version = '4.8.2' + +homepage = 'http://gcc.gnu.org/' +description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...).""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s', # GCC auto-resolving HTTP mirror + 'http://ftpmirror.gnu.org/gmp', # idem for GMP + 'http://ftpmirror.gnu.org/mpfr', # idem for MPFR + 'http://www.multiprecision.org/mpc/download', # MPC official +] +sources = [ + SOURCELOWER_TAR_GZ, + 'gmp-5.1.3.tar.bz2', + 'mpfr-3.1.2.tar.gz', + 'mpc-1.0.1.tar.gz', +] + +languages = ['c', 'c++', 'fortran', 'lto'] + +# building GCC sometimes fails if make parallelism is too high, so let's limit it +maxparallel = 4 + +moduleclass = 'compiler' -- GitLab From 60cb028a01b0abf597ef2b99171cfad7cc313b48 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 10:50:44 +0100 Subject: [PATCH 250/811] add pysqlite dependency in IPython easyconfig, update Tcl and SQLite easyconfigs, consistent style fixes --- ...IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb | 26 +++++--------- ...ysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb | 32 +++++++++++++++++ .../s/SQLite/SQLite-3.7.17-goolf-1.4.10.eb | 2 +- .../s/SQLite/SQLite-3.7.17-ictce-5.3.0.eb | 2 +- .../s/SQLite/SQLite-3.8.1-goolf-1.4.10.eb | 35 +++++++++++++++++++ .../t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb | 2 +- .../t/Tcl/Tcl-8.5.12-goolf-1.4.10.eb | 2 +- .../t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb | 2 +- .../t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb | 2 +- .../t/Tcl/Tcl-8.5.12-ictce-5.3.0.eb | 3 +- .../t/Tcl/Tcl-8.5.14-goolf-1.4.10.eb | 2 +- .../t/Tcl/Tcl-8.5.14-ictce-5.3.0.eb | 2 +- .../t/Tcl/Tcl-8.6.1-goolf-1.4.10.eb | 19 ++++++++++ 13 files changed, 103 insertions(+), 28 deletions(-) create mode 100644 easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb index 4ca51fd8a5..1047af4bc2 100644 --- a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb @@ -5,34 +5,28 @@ version = '1.1.0' homepage = 'http://ipython.org/index.html' description = """IPython provides a rich architecture for interactive computing with: -Powerful interactive shells (terminal and Qt-based). -A browser-based notebook with support for code, text, mathematical expressions, inline plots and other rich media. -Support for interactive data visualization and use of GUI toolkits. -Flexible, embeddable interpreters to load into your own projects. -Easy to use, high performance tools for parallel computing.""" + Powerful interactive shells (terminal and Qt-based). + A browser-based notebook with support for code, text, mathematical expressions, inline plots and other rich media. + Support for interactive data visualization and use of GUI toolkits. + Flexible, embeddable interpreters to load into your own projects. + Easy to use, high performance tools for parallel computing.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -#source_urls = [('http://archive.ipython.org/release/%s' % version, 'download')] -#sources = [SOURCE_TAR_GZ] - -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://archive.ipython.org/release/%s/' %(version)] - python = 'Python' pyver = '2.7.3' pyshortver = '2.7' versionsuffix = '-%s-%s' % (python, pyver) - dependencies = [ (python, pyver), + ('pysqlite', '2.6.3', versionsuffix), ] -# we're giving the sanity check just a method to replace the EXTS_FILTER_PYTHON_PACKAGES default value (mentioned below) with something that will tell use that i[ython exists but not a test, and will work -# EXTS_FILTER_PYTHON_PACKAGES = ('python -c "import %(ext_name)s"', "") - +# override extensions sanity check, default filter that imports a Python module doesn't work here exts_filter = ('ipython -h', "") sanity_check_paths = { @@ -40,10 +34,6 @@ sanity_check_paths = { 'dirs': ['lib/python%s/site-packages/IPython' % pyshortver], } -#sanity_check_commands = [('/bin/touch', ' /tmp/run_yossi')] sanity_check_commands = [('iptest','')] -# IPython is tested using iptest -#tests = [iptest]# - moduleclass = 'tools' diff --git a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..92edc2ef94 --- /dev/null +++ b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,32 @@ +easyblock = "PythonPackage" + +name = 'pysqlite' +version = '2.6.3' + +homepage = 'https://pypi.python.org/pypi/pysqlite' +description = """pysqlite is an interface to the SQLite 3.x embedded relational database engine. + It is almost fully compliant with the Python database API version 2.0 also exposes the unique features of SQLite.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['https://pypi.python.org/packages/source/p/pysqlite/'] +sources = [SOURCELOWER_TAR_GZ] + +python = 'Python' +pyver = '2.7.3' +pyshortver = '2.7' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), + ('SQLite', '3.8.1'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(name)s%%(version_major)s' % pyshortver], +} + +options = {'modulename': '%(name)s%(version_major)s'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-goolf-1.4.10.eb index 505e609f07..0383c6ec88 100644 --- a/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-goolf-1.4.10.eb @@ -29,7 +29,7 @@ dependencies = [ sanity_check_paths = { 'files': ['bin/sqlite3'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-ictce-5.3.0.eb index 325c0a66ec..05f97c62b3 100644 --- a/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.7.17-ictce-5.3.0.eb @@ -30,7 +30,7 @@ dependencies = [ sanity_check_paths = { 'files': ['bin/sqlite3'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..97f7c6bd76 --- /dev/null +++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-goolf-1.4.10.eb @@ -0,0 +1,35 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'SQLite' +version = '3.8.1' + +homepage = 'http://www.hwaci.com/sw/sqlite/' +description = "SQLite: SQL Database Engine in a C Library" + +# eg. http://www.hwaci.com/sw/sqlite/2013/sqlite-autoconf-3080100.tar.gz +source_urls = ['http://www.hwaci.com/sw/sqlite/2013'] +sources = ['sqlite-autoconf-%s0%s0%s00.tar.gz' % tuple(version.split('.'))] # very weird way to calculate your filename + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +dependencies = [ + ('libreadline', '6.2'), + ('Tcl', '8.6.1'), +] + +sanity_check_paths = { + 'files': ['bin/sqlite3'], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb index 8ecd4408e5..a6501f1b5e 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """Tcl (Tool Command Language) is a very powerful but easy to lear toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goolf-1.4.10.eb index 058dccc234..27a3950e2a 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goolf-1.4.10.eb @@ -8,7 +8,7 @@ suitable for a very wide range of uses, including web and desktop applications, toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb index 97a3dcaa97..f668d7842d 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb @@ -8,7 +8,7 @@ description = """Tcl (Tool Command Language) is a very powerful but easy to lear toolchain = {'name': 'ictce', 'version': '4.0.10'} source_urls = [SOURCEFORGE_SOURCE] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb index f121d1fd9d..4d9a18f5eb 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """Tcl (Tool Command Language) is a very powerful but easy to lear toolchain = {'name': 'ictce', 'version': '4.0.6'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-5.3.0.eb index 9c7b4bc005..8bb041cf6a 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-5.3.0.eb @@ -5,11 +5,10 @@ homepage = 'http://www.tcl.tk/' description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-goolf-1.4.10.eb index d533050ec6..7cb14f7787 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-goolf-1.4.10.eb @@ -8,7 +8,7 @@ suitable for a very wide range of uses, including web and desktop applications, toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-ictce-5.3.0.eb index 2569b65046..301ffc1343 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.14-ictce-5.3.0.eb @@ -8,7 +8,7 @@ suitable for a very wide range of uses, including web and desktop applications, toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..0b20131cf1 --- /dev/null +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = 'Tcl' +version = '8.6.1' + +homepage = 'http://www.tcl.tk/' +description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, +suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ["http://prdownloads.sourceforge.net/tcl"] +sources = ['%(namelower)s%(version)s-src.tar.gz'] + +configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' + +runtest = 'test' + +start_dir = 'unix' + +moduleclass = 'lang' -- GitLab From 583cc40ce5fb56e83b51c5edd4e6ac6ab4859d1a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 11:22:51 +0100 Subject: [PATCH 251/811] fix remark --- .../i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb index 1047af4bc2..3c52ea836c 100644 --- a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb @@ -14,7 +14,7 @@ description = """IPython provides a rich architecture for interactive computing toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://archive.ipython.org/release/%s/' %(version)] +source_urls = ['http://archive.ipython.org/release/%(version)s/'] python = 'Python' pyver = '2.7.3' -- GitLab From 06d917ef62e9366fbcc2e762b2343bca4b50fc25 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 14:13:22 +0100 Subject: [PATCH 252/811] style cleanup for Silo and ParFlow easyconfigs + removing of system level library dirs in ParFlow makeopts --- .../p/ParFlow/ParFlow-605-goolf-1.4.10.eb | 44 ++++++++++--------- .../s/Silo/Silo-4.9.1-goolf-1.4.10.eb | 17 ++++--- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb index 40d777c0a5..74416354df 100644 --- a/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb @@ -1,13 +1,14 @@ name = 'ParFlow' version = '605' -homepage = 'http://computation.llnl.gov/casc/parflow/parflow_home.html' -description = """ParFlow is an integrated, parallel watershed model that makes use of high-performance computing to simulate surface and subsurface fluid flow.""" +homepage = 'http://computation.llnl.gov/casc/parflow/' +description = """ParFlow is an integrated, parallel watershed model that makes use of high-performance computing +to simulate surface and subsurface fluid flow.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'pic': True, 'usempi': True} -sources = ['%s.r%s.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s.r%(version)s.tar.gz'] source_urls = ['http://inside.mines.edu/~rmaxwell/'] dependencies = [ @@ -16,30 +17,31 @@ dependencies = [ ('Tcl', '8.5.14'), ] -preconfigopts = [ 'cd pfsimulator &&', - 'cd pftools &&', +preconfigopts = [ + 'cd pfsimulator &&', + 'cd pftools &&', ] +# copies of preconfigopts are required, not references, hence the [:] +premakeopts = preconfigopts[:] +preinstallopts = preconfigopts[:] -configopts = [ ' --with-amps=mpi1 --enable-timing --with-clm --with-silo=$EBROOTSILO --with-hypre=$EBROOTHYPRE', - ' --with-amps=mpi1 --enable-timing --with-clm --with-silo=$EBROOTSILO --with-tcl=$EBROOTTCL', +configopts = [ + ' --with-amps=mpi1 --enable-timing --with-clm --with-silo=$EBROOTSILO --with-hypre=$EBROOTHYPRE', + ' --with-amps=mpi1 --enable-timing --with-clm --with-silo=$EBROOTSILO --with-tcl=$EBROOTTCL', ] -premakeopts = [ 'cd pfsimulator &&', - 'cd pftools &&', -] - -makeopts = [ 'LDLIBS="$LDLIBS_EXTRA -lHYPRE -lsilo -lmpi -lgfortran -lm -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../.. -L/usr/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/lib/../lib -L/lib/x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6 -lgcc_s -lgcc -lquadmath"', - 'LDLIBS="$(LDLIBS_EXTRA) $(PARFLOW_TOOLS_LIBS) -lsilo -ltcl8.5 -lgfortran -lm -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../.. -L/usr/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/lib/../lib -L/lib/x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4. -lgcc_s -lgcc -lquadmath"', - ] - -preinstallopts = [ 'cd pfsimulator &&', - 'cd pftools &&', +makeopts = [ + 'LDLIBS="$(LDLIBS_EXTRA) -lHYPRE -lsilo -lmpi -lgfortran -lm -lgcc_s -lgcc -lquadmath"', + 'LDLIBS="$(LDLIBS_EXTRA) $(PARFLOW_TOOLS_LIBS) -lsilo -ltcl8.5 -lgfortran -lm -lgcc_s -lgcc -lquadmath"', ] +binaries = ['batchmc', 'bgmsfem2pfsol', 'bootmc', 'freemc', 'getmc', 'gmssol2pfsol', 'gmstinvertices', + 'gmstriangulate', 'killmc', 'parflow', 'peekmc', 'pfhelp', 'pfwell_cat', 'pfsbtosa', 'pfbtosa', + 'pfstrip', 'pfbtovis', 'projecttin', 'run'] +libraries = ['libamps.a', 'libamps_common.a', 'libclm.a', 'libkinsol.a', 'libparflow.a'] sanity_check_paths = { - 'files': ["lib/libamps.a", "lib/libamps_common.a", "lib/libclm.a", "lib/libkinsol.a", "lib/libparflow.a", "bin/batchmc", "bin/bgmsfem2pfsol", "bin/bootmc", "bin/freemc", "bin/getmc", "bin/gmssol2pfsol", "bin/gmstinvertices", "bin/gmstriangulate", "bin/killmc", "bin/parflow", "bin/peekmc", "bin/pfhelp", "bin/pfwell_cat", "bin/pfsbtosa", "bin/pfbtosa", "bin/pfstrip", "bin/pfbtovis", "bin/projecttin", "bin/run"], - 'dirs': [], + 'files': ["bin/%s" % x for x in binaries] + ["lib/%s" % x for x in libraries], + 'dirs': [], } -moduleclass = 'data' - +moduleclass = 'cae' diff --git a/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb index 46ca32ccbb..428b3a85f6 100644 --- a/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-goolf-1.4.10.eb @@ -1,21 +1,20 @@ name = 'Silo' version = '4.9.1' -homepage = 'https://wci.llnl.gov/codes/silo/index.html' +homepage = 'https://wci.llnl.gov/codes/silo/' description = """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'pic': True, 'usempi': True} -sources = ['%s-%s.tar.gz' % (name.lower(), version)] -source_urls = ['https://wci.llnl.gov/codes/silo/silo-4.9.1'] +sources = ['%(namelower)s-%(version)s.tar.gz'] +source_urls = ['https://wci.llnl.gov/codes/silo/silo-%(version)s'] -configopts = ' --disable-silex ' +configopts = '--disable-silex' sanity_check_paths = { - 'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a'], - 'dirs': [] - } - -moduleclass = 'lib' + 'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a'], + 'dirs': [], +} +moduleclass = 'data' -- GitLab From ee5685f4869f7a0d6e15ea5a266f2a5a8f18949e Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 12 Nov 2013 14:28:04 +0100 Subject: [PATCH 253/811] Eigen: use namelower in source_urls --- .../easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb index 0dfffb0970..e49357addb 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb @@ -21,6 +21,6 @@ toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] +source_urls = ['http://bitbucket.org/%(namelower)s)/%(namelower)s/get'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb index b2a72e5cf0..5fdb7c35e1 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb @@ -22,6 +22,6 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True, 'pic': True} sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] +source_urls = ['http://bitbucket.org/%(namelower)s)/%(namelower)s/get'] moduleclass = 'math' -- GitLab From 6cde9800b96b2126f16a5581d8bd29d61e3094d3 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 12 Nov 2013 14:36:28 +0100 Subject: [PATCH 254/811] OpenBabel: clean up goalf easyconfig --- .../o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb index 2b6f5d0a9b..f62d8abef6 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb @@ -13,7 +13,6 @@ source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] patches = [ -# 'OpenBabel-%(version)s-use-xHost.patch', 'OpenBabel-%(version)s-fix-link-path-tests.patch', 'OpenBabel-%(version)s-ignore-failed-test.patch', ] @@ -32,6 +31,8 @@ sanity_check_paths = { 'dirs': ['share/openbabel'], } +separate_build_dir = True + runtest = 'test' moduleclass = 'chem' -- GitLab From 50dbdce5b843ac8213e01a4f3d8a93db31c7327e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 14:47:46 +0100 Subject: [PATCH 255/811] minor style fixes in CDO easyconfig --- easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb index 6a6d8a0172..0362af4aee 100644 --- a/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/CDO/CDO-1.6.0-goolf-1.4.10.eb @@ -7,11 +7,9 @@ description = """CDO is a collection of command line Operators to manipulate and toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'pic': True, 'usempi': True} -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] source_urls = ['https://code.zmaw.de/attachments/download/5287/'] - - dependencies = [ ('HDF5', '1.8.10-patch1'), ('netCDF', '4.2.1.1'), @@ -25,4 +23,3 @@ sanity_check_paths = { } moduleclass = 'data' - -- GitLab From 0a1978db05560271b5668bd95c7fe2be7ada92d0 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 15:13:39 +0100 Subject: [PATCH 256/811] fix indentation on Autoconf Signed-off-by: Fotis Georgatos --- .../easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb index 8a01ba648a..939684e46b 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb @@ -16,9 +16,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.17')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] - } + 'files': ["bin/%s" % x for x in + ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan", "autoupdate", "ifnames"]], + 'dirs': [] +} moduleclass = 'devel' -- GitLab From 0c3bf23017064a933e12550abcfdfdf7e54c2748 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 15:38:15 +0100 Subject: [PATCH 257/811] cleaned up sanity checks Signed-off-by: Fotis Georgatos --- .../o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index 97fcbbfb99..9e15ab4d67 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -22,21 +22,13 @@ configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading sanity_check_paths = { - 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", -#"mpi_f77" , -#"mpi_f90", - "mpi", "ompitrace", "open-pal", - "open-rte", "vt", "vt-hyb", - "vt-mpi", "vt-mpi-unify"]] + - ["include/%s.h" % x for x in ["mpi-ext", -#mpif-common", "mpif-config", "mpif", - "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"] - } + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"] +} moduleclass = 'mpi' - - -# added by EasyBuild as dictated by command line options -patches = ['openmpi-mca-params.conf-1.6.4-local.patch', 'pax_disable.patch'] # added by EasyBuild -- GitLab From e892a7453c7fa56cc07f57c14233e348ad80994a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 15:47:42 +0100 Subject: [PATCH 258/811] fix indentation for M4/1.4.17 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb index ef386fcf48..2016ba0f5b 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb @@ -15,8 +15,8 @@ source_urls = ['http://ftpmirror.gnu.org/m4'] configopts = "--enable-cxx" sanity_check_paths = { - 'files': ["bin/m4"], - 'dirs': [] - } + 'files': ["bin/m4"], + 'dirs': [] +} moduleclass = 'devel' -- GitLab From 27791824accedd7dbd251ca916023fddbe27501a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 15:50:33 +0100 Subject: [PATCH 259/811] gzip/1.6 for goolf/1.6.10 added Signed-off-by: Fotis Georgatos --- .../g/gzip/gzip-1.6-goolf-1.6.10.eb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb new file mode 100644 index 0000000000..bb3ec5eed9 --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC +# Authors:: Thekla Loizou +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html +## + +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'goolf', 'version': '1.6.10'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = ['http://ftpmirror.gnu.org/gzip'] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' -- GitLab From cc8290bdc042b164a1845f17bf3e0eaa7403906e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 16:08:58 +0100 Subject: [PATCH 260/811] add bison & flex to both PCC & SDCC Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/p/PCC/PCC-20131024.eb | 5 +++++ easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb index ba11dcf6fd..7041e7506b 100644 --- a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb +++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb @@ -20,6 +20,11 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['pcc-%(version)s.tgz'] source_urls = ['http://pcc.ludd.ltu.se/ftp/pub/pcc/'] +osdependencies = [ + ('flex', '2.5.35'), + ('bison', '2.4.1'), +] + sanity_check_paths = { 'files': ["bin/pcc"], 'dirs': ["lib"] diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb index 046c5af90a..3d4f59b076 100644 --- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb +++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb @@ -23,6 +23,11 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['sdcc-src-%s.tar.bz2' % version] source_urls = ['http://sourceforge.net/projects/sdcc/files/sdcc/%s/' % version, 'download'] +osdependencies = [ + ('flex', '2.5.35'), + ('bison', '2.4.1'), +] + # similar build style like https://svn.redports.org/tijl/lang/sdcc/Makefile configopts = "--disable-pic14-port --disable-pic16-port" -- GitLab From 54279765468c51d5539c43083f284fed4bb660c6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 16:12:24 +0100 Subject: [PATCH 261/811] tiny fixes on SDCC Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/s/SDCC/{SDCC-3.3-0.eb => SDCC-3.3.0.eb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename easybuild/easyconfigs/s/SDCC/{SDCC-3.3-0.eb => SDCC-3.3.0.eb} (97%) diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb similarity index 97% rename from easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb rename to easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb index 3d4f59b076..c200686c59 100644 --- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3-0.eb +++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb @@ -20,7 +20,7 @@ description = """SDCC is a retargettable, optimizing ANSI - C compiler suite tha toolchain = {'name': 'dummy', 'version': 'dummy'} # eg. http://sourceforge.net/projects/sdcc/files/sdcc/3.3.0/sdcc-src-3.3.0.tar.bz2/download -sources = ['sdcc-src-%s.tar.bz2' % version] +sources = ['sdcc-src-%(version)s.tar.bz2'] source_urls = ['http://sourceforge.net/projects/sdcc/files/sdcc/%s/' % version, 'download'] osdependencies = [ -- GitLab From 1d30f3fd839b5e0a707e7e1636d32a44e18989ba Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 16:20:56 +0100 Subject: [PATCH 262/811] minor style fixes --- .../g/gompi/gompi-1.4.12-no-OFED.eb | 5 +++-- .../OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb | 2 +- .../OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb | 2 +- .../p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb | 8 +++---- .../Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb | 22 +++++++------------ .../Scalasca-2.0-gompi-1.4.12-no-OFED.eb | 8 ++----- .../Score-P-1.2.1-gompi-1.4.12-no-OFED.eb | 2 +- 7 files changed, 19 insertions(+), 30 deletions(-) diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb index 6a3e082b59..742475624b 100644 --- a/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb @@ -12,14 +12,15 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} compname = 'GCC' compver = '4.7.3' +comp = (compname, compver) mpilib = 'OpenMPI' mpiver = '1.6.5' # compiler toolchain depencies dependencies = [ - (compname, compver), - (mpilib, mpiver, versionsuffix, (compname, compver)), + comp, + (mpilib, mpiver, versionsuffix, comp), ] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb index 18c9ee4536..f2754f6da9 100644 --- a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb @@ -23,7 +23,7 @@ source_urls = ['http://www.vi-hps.org/upload/packages/opari2/'] sanity_check_paths = { 'files': ["bin/opari2", "include/opari2/pomp2_lib.h"], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb index 2b1af13012..10937cf227 100644 --- a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb @@ -23,7 +23,7 @@ source_urls = ['http://www.vi-hps.org/upload/packages/opari2/'] sanity_check_paths = { 'files': ["bin/opari2", "include/opari2/pomp2_lib.h"], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb index 314f8d323d..fae4a7ac19 100644 --- a/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb @@ -24,20 +24,18 @@ source_urls = ['http://tau.uoregon.edu/pdt_releases/'] prefix_opt = '-prefix=' -# --- BM CONFIGOPTS --- -# +# notes by Bernd Mohr # Compiler suite should always be specified -- MUCH quicker and SAVER than autodetect # -KAI|-KCC|-GNU|-CC|-c++|-cxx|-xlC|-pgCC|-icpc|-ecpc configopts = '-GNU' keeppreviousinstall = True -# --- BM ISSUE --- -# +# notes by Bernd Mohr # Use hardcoded x86_64 or "import platform; machine = platform.machine()" here? sanity_check_paths = { 'files': ["x86_64/bin/cparse", "x86_64/include/pdb.h", "x86_64/lib/libpdb.a"], - 'dirs': [] + 'dirs': [], } skipsteps = ['build'] diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb index 0921ac982e..5b5fc85619 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb @@ -32,36 +32,30 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist'] -# --- BM CONFIGOPTS --- -# +# notes by Bernd Mohr # Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect # --compiler=(gnu|pgi|intel|path|ibm|sun|clang)--compiler=(gnu|pgi|intel|path|ibm|sun|clang) # --mpi=(mpich|mpich2|lam|openmpi|intel|intel2|hp|scali|mpibull2|bullxmpi|sun|ibmpoe|intelpoe) -configopts = ' --compiler=gnu' # otherwise Scalasca would potentially pick system Intel compiler -configopts += ' --mpi=openmpi' # quicker and saver than autodetect +configopts = ' --compiler=gnu' # otherwise Scalasca would potentially pick system Intel compiler +configopts += ' --mpi=openmpi' # quicker and saver than autodetect configopts += ' --enable-all-mpi-wrappers' configopts += ' --with-binutils=${EBROOTBINUTILS}' configopts += ' --with-papi=${EBROOTPAPI}' -configopts += ' --disable-gui' # use external Cube 3.4.3 +configopts += ' --disable-gui' # use external Cube 3.4.3 configopts += ' --with-pdt=${EBROOTPDT}' configopts += ' --with-opari2=${EBROOTOPARI2}' - -# --- BM ISSUE --- -# # Scalasca cannot handle name changes yet introduced with OTF-1.12.3 #configopts += ' --with-otf=${EBROOTOTF}' -# --- BM ISSUE --- -# -# Needs to be adjusted for other toolchains -premakeopts = 'cd build-linux-gomp-openmpi; ' -preinstallopts = 'cd build-linux-gomp-openmpi; ' +# note: needs to be adjusted for other toolchains +premakeopts = 'cd build-linux-gomp-openmpi && ' +preinstallopts = premakeopts parallel = 1 sanity_check_paths = { 'files': ["bin/scalasca", "include/epik_user.h", "lib/libelg.mpi.a"], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb index c21b8de34c..06a6bcbf45 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb @@ -28,19 +28,15 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/scalasca/2.0/dist'] -# --- BM CONFIGOPTS --- -# +# notes by Bernd Mohr # Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect # --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) # --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' -# --- BM LIB64 --- -# -# On some systems libraries end up in lib/ sanity_check_paths = { 'files': ["bin/scalasca", ("lib64/libpearl.replay.a", "lib/libpearl.replay.a")], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb index 7731f03121..fed999ee60 100644 --- a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb @@ -34,7 +34,7 @@ dependencies = [ sanity_check_paths = { 'files': ["bin/scorep", "include/scorep/SCOREP_User.h", ("lib64/libscorep_adapter_mpi_event.a", "lib/libscorep_adapter_mpi_event.a")], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' -- GitLab From c3ebd39dd63ce7a119b94ca8e1246a61144776ed Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 16:21:10 +0100 Subject: [PATCH 263/811] addressed OpenMPI-1.7.3-GCC-4.8.2.eb and gompi-1.6.10.eb remarks Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb | 10 +++++----- .../easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb b/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb index 988f987ac6..3ce317ed74 100644 --- a/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb +++ b/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb @@ -11,14 +11,14 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} compname = 'GCC' compver = '4.8.2' +comp = (compname, compver) mpilib = 'OpenMPI' mpiver = '1.7.3' +mpi = (mpilib, mpiver, '', comp) +#mpi = (mpilib, mpiver, '-%s-%s' % (compname, compver)), -# compiler toolchain depencies -dependencies = [ - (compname, compver), - (mpilib, mpiver, '-%s-%s' % (compname, compver)), -] +# compiler toolchain dependencies +dependencies = [comp, mpi] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index 9e15ab4d67..044d2e5a31 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -23,7 +23,8 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh", + "mpi", "ompitrace", "open-pal", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + -- GitLab From 270963150a838c1fc85f649f65e0e45cc9ebbe48 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 16:36:24 +0100 Subject: [PATCH 264/811] bump version of libpng to 1.6.6 to avoid conflicts, bump Java version to keep things in sync with bare easyconfig, update all R packages to latest version --- .../easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb index 114cfd812f..8729cb56a8 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb @@ -17,8 +17,8 @@ configopts += " --with-recommended-packages=no" dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), - ('libpng', '1.6.2'), # for plotting in R - ('Java', '1.7.0_15', '', True), # Java bindings are built if Java is found, might as well provide it + ('libpng', '1.6.6'), # for plotting in R + ('Java', '1.7.0_21', '', True), # Java bindings are built if Java is found, might as well provide it ] sanity_check_paths = { @@ -41,7 +41,7 @@ ext_options = { } # Bioconductor packages have a different download url bioconductor_options = { - 'source_urls': ['http://www.bioconductor.org/packages/2.12/bioc/src/contrib/'], + 'source_urls': ['http://www.bioconductor.org/packages/2.13/bioc/src/contrib/'], 'source_tmpl': name_tmpl, } # !! order of packages is important !! @@ -59,79 +59,79 @@ exts_list = [ 'tools', 'utils', # non-standard libraries, should be specified with fixed versions! - ('irace', '1.03', ext_options), + ('irace', '1.04', ext_options), ('rJava', '0.9-4', ext_options), - ('lattice', '0.20-15', ext_options), + ('lattice', '0.20-24', ext_options), ('RColorBrewer', '1.0-5', ext_options), - ('latticeExtra', '0.6-24', ext_options), - ('Matrix', '1.0-12', ext_options), - ('png', '0.1-4', ext_options), - ('Rcpp', '0.10.3', ext_options), + ('latticeExtra', '0.6-26', ext_options), + ('Matrix', '1.1-0', ext_options), + ('png', '0.1-6', ext_options), + ('Rcpp', '0.10.6', ext_options), ('quadprog', '1.5-5', ext_options), ('BB', '2013.4-1', ext_options), ('rlecuyer', '0.3-3', ext_options), - ('snow', '0.3-12', ext_options), - ('MASS', '7.3-23', ext_options), - ('class', '7.3-5', ext_options), + ('snow', '0.3-13', ext_options), + ('MASS', '7.3-29', ext_options), + ('class', '7.3-9', ext_options), ('e1071', '1.6-1', ext_options), - ('nnet', '7.3-6', ext_options), - ('car', '2.0-17', ext_options), - ('colorspace', '1.2-2', ext_options), - ('robustbase', '0.9-7', ext_options), - ('sp', '0.9-91', ext_options), - ('vcd', '1.2-13', ext_options), + ('nnet', '7.3-7', ext_options), + ('car', '2.0-19', ext_options), + ('colorspace', '1.2-4', ext_options), + ('robustbase', '0.9-10', ext_options), + ('sp', '1.0-14', ext_options), + ('vcd', '1.3-1', ext_options), ('snowfall', '1.84-4', ext_options), - ('logistf', '1.10', ext_options), - ('akima', '0.5-10', ext_options), - ('bitops', '1.0-5', ext_options), - ('boot', '1.3-7', ext_options), + ('logistf', '1.21', ext_options), + ('akima', '0.5-11', ext_options), + ('bitops', '1.0-6', ext_options), + ('boot', '1.3-9', ext_options), ('cluster', '1.14.4', ext_options), ('coda', '0.16-1', ext_options), ('codetools', '0.2-8', ext_options), ('DBI', '0.2-7', ext_options), - ('foreign', '0.8-54', ext_options), + ('foreign', '0.8-57', ext_options), ('survival', '2.37-4', ext_options), - ('gam', '1.08', ext_options), - ('gamlss.data', '4.2-0', ext_options), + ('gam', '1.09', ext_options), + ('gamlss.data', '4.2-6', ext_options), ('gamlss.dist', '4.2-0', ext_options), ('hwriter', '1.3', ext_options), ('KernSmooth', '2.23-10', ext_options), - ('zoo', '1.7-9', ext_options), - ('lmtest', '0.9-31', ext_options), + ('zoo', '1.7-10', ext_options), + ('lmtest', '0.9-32', ext_options), ('mnormt', '1.4-5', ext_options), - ('mvtnorm', '0.9-9994', ext_options), + ('mvtnorm', '0.9-9996', ext_options), ('numDeriv', '2012.9-1', ext_options), ('pscl', '1.04.4', ext_options), - ('rpart', '4.1-1', ext_options), - ('RSQLite', '0.11.3', ext_options), - ('sandwich', '2.2-10', ext_options), - ('sfsmisc', '1.0-23', ext_options), - ('spatial', '7.3-5', ext_options), - ('VGAM', '0.9-1', ext_options), + ('rpart', '4.1-3', ext_options), + ('RSQLite', '0.11.4', ext_options), + ('sandwich', '2.3-0', ext_options), + ('sfsmisc', '1.0-24', ext_options), + ('spatial', '7.3-7', ext_options), + ('VGAM', '0.9-3', ext_options), ('waveslim', '1.7.1', ext_options), ('xtable', '1.7-1', ext_options), - ('profileModel', '0.5-8', ext_options), - ('brglm', '0.5-7', ext_options), - ('deSolve', '1.10-6', ext_options), + ('profileModel', '0.5-9', ext_options), + ('brglm', '0.5-9', ext_options), + ('deSolve', '1.10-8', ext_options), ('odesolve', '0.9-9', ext_options), - ('tseriesChaos', '0.1-11', ext_options), + ('tseriesChaos', '0.1-13', ext_options), ('tseries', '0.10-32', ext_options), ('neuRosim', '0.2-10', ext_options), - ('fastICA', '1.1-16', ext_options), - ('R.methodsS3', '1.4.2', ext_options), - ('R.oo', '1.13.0', ext_options), - ('R.matlab', '1.7.0', ext_options), + ('fastICA', '1.2-0', ext_options), + ('R.methodsS3', '1.5.2', ext_options), + ('R.oo', '1.15.8', ext_options), + ('R.matlab', '2.0.5', ext_options), ('Rniftilib', '0.0-32', ext_options), - ('BiocGenerics', '0.6.0', bioconductor_options), - ('Biobase', '2.20.0', bioconductor_options), - ('IRanges', '1.18.3', bioconductor_options), - ('AnnotationDbi', '1.22.6', bioconductor_options), - ('Biostrings', '2.28.0', bioconductor_options), - ('GenomicRanges', '1.12.5', bioconductor_options), - ('BSgenome', '1.28.0', bioconductor_options), - ('zlibbioc', '1.6.0', bioconductor_options), - ('Rsamtools', '1.12.4', bioconductor_options), - ('ShortRead', '1.18.0', bioconductor_options), + ('BiocGenerics', '0.8.0', bioconductor_options), + ('Biobase', '2.22.0', bioconductor_options), + ('IRanges', '1.20.5', bioconductor_options), + ('AnnotationDbi', '1.24.0', bioconductor_options), + ('Biostrings', '2.30.0', bioconductor_options), + ('GenomicRanges', '1.14.3', bioconductor_options), + ('BSgenome', '1.30.0', bioconductor_options), + ('zlibbioc', '1.8.0', bioconductor_options), + ('Rsamtools', '1.14.1', bioconductor_options), + ('ShortRead', '1.20.0', bioconductor_options), ('graph', '1.40.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), ] -- GitLab From b079abcd3eccef878bea9f62e74ebcc62e2655ae Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 16:36:37 +0100 Subject: [PATCH 265/811] minor style fixes --- .../l/libpng/libpng-1.6.6-ictce-5.3.0.eb | 1 - .../ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb | 26 +++++++++++-------- .../ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb | 22 +++++++++------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb index acdc9a2af6..150ca35db4 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb @@ -12,7 +12,6 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('zlib', '1.2.7')] - configopts = "--with-pic" moduleclass = 'lib' diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb index 43b83a3dbf..491a03c606 100644 --- a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb +++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2-bare.eb @@ -4,23 +4,27 @@ name = 'ncdf4' version = '1.6.1' homepage = 'http://cran.r-project.org/web/packages/ncdf4' -description = """This package provides a high-level R interface to data files written using Unidata's netCDF library (version 4 or earlier), which are binary data files that are portable across platforms and include metadata information in addition to the data sets.""" +description = """This package provides a high-level R interface to data files written using Unidata's netCDF library + (version 4 or earlier), which are binary data files that are portable across platforms and include metadata + information in addition to the data sets.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://cran.r-project.org/src/contrib/Archive/ncdf4'] -sources = ['%s_%s.tar.gz' % (name, version)] +source_urls = [ + 'http://cran.freestatistics.org/src/contrib', + 'http://cran.r-project.org/src/contrib/Archive/ncdf4', +] +sources = ['%(name)s_%(version)s.tar.gz'] -r='R' -rver='3.0.2' -rversuf='-bare' +r = 'R' +rver = '3.0.2' +rversuf = '-bare' versionsuffix = '-%s-%s%s' % (r, rver,rversuf) - dependencies = [ - ( r, rver, rversuf), - ('netCDF', '4.2.1.1'), - ] + (r, rver, rversuf), + ('netCDF', '4.2.1.1'), +] -moduleclass = 'math' +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb index 75f2fa4a74..17bf529b5e 100644 --- a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb +++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.5-ictce-5.3.0-R-3.0.2.eb @@ -4,22 +4,26 @@ name = 'ncdf4' version = '1.6.1' homepage = 'http://cran.r-project.org/web/packages/ncdf4' -description = """This package provides a high-level R interface to data files written using Unidata's netCDF library (version 4 or earlier), which are binary data files that are portable across platforms and include metadata information in addition to the data sets.""" +description = """This package provides a high-level R interface to data files written using Unidata's netCDF library + (version 4 or earlier), which are binary data files that are portable across platforms and include metadata + information in addition to the data sets.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://cran.r-project.org/src/contrib/Archive/ncdf4'] -sources = ['%s_%s.tar.gz' % (name, version)] +source_urls = [ + 'http://cran.freestatistics.org/src/contrib', + 'http://cran.r-project.org/src/contrib/Archive/ncdf4', +] +sources = ['%(name)s_%(version)s.tar.gz'] -r='R' -rver='3.0.2' +r = 'R' +rver = '3.0.2' versionsuffix = '-%s-%s' % (r, rver) - dependencies = [ - ( r, rver), - ('netCDF', '4.2.1.1'), - ] + (r, rver), + ('netCDF', '4.2.1.1'), +] moduleclass = 'math' -- GitLab From 730f4095c5262abef554950a723a88bbc6d70974 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 16:36:51 +0100 Subject: [PATCH 266/811] add easyconfigs for ncdf R package v1.10 --- .../ncdf4-1.10-ictce-5.3.0-R-3.0.2-bare.eb | 30 +++++++++++++++++++ .../n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2.eb | 29 ++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2-bare.eb create mode 100644 easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2.eb diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2-bare.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2-bare.eb new file mode 100644 index 0000000000..0f47ffdcef --- /dev/null +++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2-bare.eb @@ -0,0 +1,30 @@ +easyblock = 'RPackage' + +name = 'ncdf4' +version = '1.10' + +homepage = 'http://cran.r-project.org/web/packages/ncdf4' +description = """This package provides a high-level R interface to data files written using Unidata's netCDF library + (version 4 or earlier), which are binary data files that are portable across platforms and include metadata + information in addition to the data sets.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = [ + 'http://cran.freestatistics.org/src/contrib', + 'http://cran.r-project.org/src/contrib/Archive/ncdf4', +] +sources = ['%(name)s_%(version)s.tar.gz'] + +r = 'R' +rver = '3.0.2' +rversuf = '-bare' + +versionsuffix = '-%s-%s%s' % (r, rver, rversuf) + +dependencies = [ + (r, rver, rversuf), + ('netCDF', '4.2.1.1'), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2.eb new file mode 100644 index 0000000000..20417f1a1f --- /dev/null +++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.10-ictce-5.3.0-R-3.0.2.eb @@ -0,0 +1,29 @@ +easyblock = 'RPackage' + +name = 'ncdf4' +version = '1.10' + +homepage = 'http://cran.r-project.org/web/packages/ncdf4' +description = """This package provides a high-level R interface to data files written using Unidata's netCDF library + (version 4 or earlier), which are binary data files that are portable across platforms and include metadata + information in addition to the data sets.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = [ + 'http://cran.freestatistics.org/src/contrib', + 'http://cran.r-project.org/src/contrib/Archive/ncdf4', +] +sources = ['%(name)s_%(version)s.tar.gz'] + +r = 'R' +rver = '3.0.2' + +versionsuffix = '-%s-%s' % (r, rver) + +dependencies = [ + (r, rver), + ('netCDF', '4.2.1.1'), +] + +moduleclass = 'math' -- GitLab From 1452015f002660ef883fa4849dd93834723d23f5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 16:43:33 +0100 Subject: [PATCH 267/811] add missing deps for logistf, move rpart up --- easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb index 8729cb56a8..4aa86b2c81 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb @@ -81,6 +81,10 @@ exts_list = [ ('sp', '1.0-14', ext_options), ('vcd', '1.3-1', ext_options), ('snowfall', '1.84-4', ext_options), + ('rpart', '4.1-3', ext_options), + ('mice', '2.18', ext_options), + ('nlme', '3.1-111', ext_options), + ('mgcv', '1.7-27', ext_options), ('logistf', '1.21', ext_options), ('akima', '0.5-11', ext_options), ('bitops', '1.0-6', ext_options), @@ -102,7 +106,6 @@ exts_list = [ ('mvtnorm', '0.9-9996', ext_options), ('numDeriv', '2012.9-1', ext_options), ('pscl', '1.04.4', ext_options), - ('rpart', '4.1-3', ext_options), ('RSQLite', '0.11.4', ext_options), ('sandwich', '2.3-0', ext_options), ('sfsmisc', '1.0-24', ext_options), -- GitLab From 1ed294c4acf977f2720ab4f53859ae5481b43694 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 16:54:01 +0100 Subject: [PATCH 268/811] minor style fixes --- .../easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb | 10 +++++----- .../l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb | 10 +++++----- .../easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb | 10 +++++----- .../l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb | 10 +++++----- .../easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb | 10 +++++----- .../easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb | 10 +++++----- .../n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb | 1 - .../PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb | 2 +- 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb index 920ab1c182..9d92c7b151 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb @@ -14,10 +14,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs': [] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb index 4e91fa4fb9..17407ad7b5 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb @@ -14,10 +14,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs': [] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb index 4ff6484741..2771e5e1cc 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb @@ -13,10 +13,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs': [] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb index 8bda5aceae..19243bd56d 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb @@ -14,10 +14,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs':[] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb index 9e0a9210c4..8cc0275ce4 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb @@ -15,10 +15,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs':[] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb index ea3ad71100..da01cdde8f 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb @@ -15,10 +15,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-shared --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs':[] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb index b251741e43..bf88581a31 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.5.0-Python-2.7.5.eb @@ -8,7 +8,6 @@ description = """NumPy is the fundamental package for scientific computing with NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" - toolchain = {'name': 'ictce', 'version': '5.5.0'} source_urls = [SOURCEFORGE_SOURCE] diff --git a/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb index 35dc9bd2dd..a42bb5b4d8 100644 --- a/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/p/PyQuante/PyQuante-1.6.4-ictce-5.5.0-Python-2.7.5.eb @@ -28,6 +28,6 @@ dependencies = [ ('Libint', '1.1.4'), ] -options = {'modulename': 'PyQuante'} +options = {'modulename': name} moduleclass = 'chem' -- GitLab From 37033b2f4bca8d818b21d2fb44ffc4752991f314 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 12 Nov 2013 17:08:27 +0100 Subject: [PATCH 269/811] OpenBabel: move separate_build_dir to the easyblock --- .../o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb | 2 -- .../easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb | 2 -- 2 files changed, 4 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb index f62d8abef6..d46d781f4e 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb @@ -31,8 +31,6 @@ sanity_check_paths = { 'dirs': ['share/openbabel'], } -separate_build_dir = True - runtest = 'test' moduleclass = 'chem' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb index faaf4b6fd2..e6cf2ca9a2 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb @@ -32,8 +32,6 @@ sanity_check_paths = { 'dirs': ['share/openbabel'], } -separate_build_dir = True - runtest = 'test' moduleclass = 'chem' -- GitLab From b8d6f3145e297a7f87bd5aa42508df274fc6f37f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 17:19:32 +0100 Subject: [PATCH 270/811] add XVector dep for Biostrings --- easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb index 4aa86b2c81..1f762f49eb 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb @@ -129,6 +129,7 @@ exts_list = [ ('Biobase', '2.22.0', bioconductor_options), ('IRanges', '1.20.5', bioconductor_options), ('AnnotationDbi', '1.24.0', bioconductor_options), + ('XVector', '0.2.0', bioconductor_options), ('Biostrings', '2.30.0', bioconductor_options), ('GenomicRanges', '1.14.3', bioconductor_options), ('BSgenome', '1.30.0', bioconductor_options), -- GitLab From 96cafc90190f7cf2d72eb58d2ed96b35c2c177dc Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 12 Nov 2013 17:26:37 +0100 Subject: [PATCH 271/811] Eigen: small cosmetic change --- easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb index 5fdb7c35e1..23f6e5c779 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb @@ -17,11 +17,10 @@ homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' description = """Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.""" - toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] source_urls = ['http://bitbucket.org/%(namelower)s)/%(namelower)s/get'] moduleclass = 'math' -- GitLab From e9aa2351328fe2cc2d65dff152153e22da38858c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 17:39:36 +0100 Subject: [PATCH 272/811] tune indentation of goolf-1.6.10.eb Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb index 552cef69cb..bc828b0371 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb @@ -27,11 +27,11 @@ comp_mpi_tc = "%s-%s" % (comp_mpi_tc_name, comp_mpi_tc_ver) # we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain # because of toolchain preperation functions dependencies = [ - ('GCC', '4.8.2'), - ('OpenMPI', '1.7.3-%s' % comp), # part of gompi-1.1.0 - (blaslib, blasver, '-%s-%s' % (comp_mpi_tc, blassuff)), - ('FFTW', '3.3.3', "-%s" % comp_mpi_tc), - ('ScaLAPACK', '2.0.2', '-%s-%s-%s' % (comp_mpi_tc, blas, blassuff)) - ] + ('GCC', '4.8.2'), + ('OpenMPI', '1.7.3-%s' % comp), # part of gompi-1.1.0 + (blaslib, blasver, '-%s-%s' % (comp_mpi_tc, blassuff)), + ('FFTW', '3.3.3', "-%s" % comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s-%s-%s' % (comp_mpi_tc, blas, blassuff)), +] moduleclass = 'toolchain' -- GitLab From 0d8b3538ac4852280bbd33db6b72027ede056f5e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 12 Nov 2013 17:41:40 +0100 Subject: [PATCH 273/811] source_url of hwloc based on version_major_minor Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb index 10a37d2dbb..e766a8df7f 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb @@ -11,8 +11,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide toolchain = {'name': 'GCC', 'version': '4.8.2'} -versionpath = '.'.join(version.split('.')[:-1]) -source_urls = ['http://www.open-mpi.org/software/hwloc/v%s/downloads/' % versionpath] +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' -- GitLab From 70824f44f78fc4e6656451b637b5de2286e2e281 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 18:35:49 +0100 Subject: [PATCH 274/811] fix source_urls for Eigen, apply style fix consistently --- .../easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb | 2 +- .../easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb index f64f101f4d..13621d0cd0 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb @@ -20,7 +20,7 @@ description = """Eigen is a C++ template library for linear algebra: toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb index fafccfa169..3d05ff2d7e 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb @@ -20,7 +20,7 @@ matrices, vectors, numerical solvers, and related algorithms.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb index 89ff69a32f..9722706459 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb @@ -20,7 +20,7 @@ description = """Eigen is a C++ template library for linear algebra: toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'optarch': True, 'pic': True} +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb index 1c30a91174..8827e2e91a 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb @@ -21,7 +21,7 @@ description = """Eigen is a C++ template library for linear algebra: toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'pic': True} +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%s/%s/get' % (name.lower(), name.lower())] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb index e49357addb..fae87489f0 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb @@ -20,7 +20,7 @@ description = """Eigen is a C++ template library for linear algebra: toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] sources = ['%s.tar.bz2' % version] -source_urls = ['http://bitbucket.org/%(namelower)s)/%(namelower)s/get'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb index 23f6e5c779..5a9c5c11ad 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb @@ -20,7 +20,7 @@ description = """Eigen is a C++ template library for linear algebra: toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True, 'pic': True} +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] sources = ['%(version)s.tar.bz2'] -source_urls = ['http://bitbucket.org/%(namelower)s)/%(namelower)s/get'] moduleclass = 'math' -- GitLab From 871abde0c02515f19ae63aaac8fbc08db4927efa Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 20:10:41 +0100 Subject: [PATCH 275/811] remove sanity check path from OpenBabel easyconfigs --- .../o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb | 5 ----- .../easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb | 5 ----- 2 files changed, 10 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb index d46d781f4e..41317da7be 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb @@ -26,11 +26,6 @@ dependencies = [ ('Python', '2.7.5'), ] -sanity_check_paths = { - 'files': ['bin/babel', 'lib/libopenbabel.so'], - 'dirs': ['share/openbabel'], -} - runtest = 'test' moduleclass = 'chem' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb index e6cf2ca9a2..54fdc7e734 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb @@ -27,11 +27,6 @@ dependencies = [ ('Python', '2.7.5'), ] -sanity_check_paths = { - 'files': ['bin/babel', 'lib/libopenbabel.so'], - 'dirs': ['share/openbabel'], -} - runtest = 'test' moduleclass = 'chem' -- GitLab From c5e0df7f33b6d52b163bdd69378c0eacdbb850dc Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 12 Nov 2013 20:47:32 +0100 Subject: [PATCH 276/811] libint2: moved sanity path to the easyblock --- .../easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb | 5 ----- .../easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb | 5 ----- 2 files changed, 10 deletions(-) diff --git a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb index c0fdf544da..6216ca78da 100644 --- a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-goolf-1.4.10.eb @@ -11,9 +11,4 @@ toolchainopts = {'pic': True} sources = ['libint-%(version)s-stable.tgz'] source_urls = ['http://downloads.sourceforge.net/project/libint/libint-for-mpqc'] -sanity_check_paths = { - 'files': ['lib/libint2.a', 'lib/libint2.so', 'include/libint2/libint2.h'], - 'dirs': [], -} - moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb index c17ff0d326..d3406da67e 100644 --- a/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libint2/libint2-2.0.3-ictce-4.1.13.eb @@ -11,9 +11,4 @@ toolchainopts = {'pic': True} sources = ['libint-%(version)s-stable.tgz'] source_urls = ['http://downloads.sourceforge.net/project/libint/libint-for-mpqc'] -sanity_check_paths = { - 'files': ['lib/libint2.a', 'lib/libint2.so', 'include/libint2/libint2.h'], - 'dirs': [], -} - moduleclass = 'chem' -- GitLab From 2ff16446629f2dbdd8311a4ccaa6f9d641160309 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Nov 2013 20:53:10 +0100 Subject: [PATCH 277/811] minor style fixes --- .../a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb | 6 +++--- easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb | 7 ++++--- easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb | 14 +++++++------- .../easyconfigs/h/hwloc/hwloc-1.5.1-GCC-4.6.3.eb | 2 +- .../h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb | 2 +- .../h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb | 2 +- .../easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb | 2 +- .../easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb | 2 +- .../o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 2 +- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb index 939684e46b..f93f3b881e 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb @@ -16,9 +16,9 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.17')] sanity_check_paths = { - 'files': ["bin/%s" % x for x in - ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan", "autoupdate", "ifnames"]], - 'dirs': [] + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan", + "autoupdate", "ifnames"]], + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb b/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb index 3ce317ed74..ca478ac45c 100644 --- a/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb +++ b/easybuild/easyconfigs/g/gompi/gompi-1.6.10.eb @@ -15,10 +15,11 @@ comp = (compname, compver) mpilib = 'OpenMPI' mpiver = '1.7.3' -mpi = (mpilib, mpiver, '', comp) -#mpi = (mpilib, mpiver, '-%s-%s' % (compname, compver)), # compiler toolchain dependencies -dependencies = [comp, mpi] +dependencies = [ + comp, + (mpilib, mpiver, '', comp), +] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb index bc828b0371..2091a4c8eb 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.10.eb @@ -11,27 +11,27 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} comp_name = 'GCC' comp_version = '4.8.2' -comp = "%s-%s" % (comp_name, comp_version) +comp = (comp_name, comp_version) blaslib = 'OpenBLAS' blasver = '0.2.8' blas = '%s-%s' % (blaslib, blasver) -blassuff = 'LAPACK-3.4.2' +blassuff = '-LAPACK-3.4.2' # toolchain used to build goolf dependencies comp_mpi_tc_name = 'gompi' comp_mpi_tc_ver = "%s" % version -comp_mpi_tc = "%s-%s" % (comp_mpi_tc_name, comp_mpi_tc_ver) +comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) # compiler toolchain depencies # we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain # because of toolchain preperation functions dependencies = [ ('GCC', '4.8.2'), - ('OpenMPI', '1.7.3-%s' % comp), # part of gompi-1.1.0 - (blaslib, blasver, '-%s-%s' % (comp_mpi_tc, blassuff)), - ('FFTW', '3.3.3', "-%s" % comp_mpi_tc), - ('ScaLAPACK', '2.0.2', '-%s-%s-%s' % (comp_mpi_tc, blas, blassuff)), + ('OpenMPI', '1.7.3', '', comp), # part of gompi-1.1.0 + (blaslib, blasver, blassuff, comp_mpi_tc), + ('FFTW', '3.3.3', '', comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), ] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-GCC-4.6.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-GCC-4.6.3.eb index a088d274cd..2589f07d49 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-GCC-4.6.3.eb @@ -11,7 +11,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide toolchain = {'name': 'GCC', 'version': '4.6.3'} -source_urls = ['http://www.open-mpi.org/software/hwloc/v1.5/downloads/'] +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb index 54fa77ae51..389707f4a2 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb @@ -11,7 +11,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide toolchain = {'name': 'iccifort', 'version': '2011.13.367'} -source_urls = ['http://www.open-mpi.org/software/hwloc/v%s/downloads/' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb index 53e171ade9..9c8a7edb31 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb @@ -11,7 +11,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} -source_urls = ['http://www.open-mpi.org/software/hwloc/v1.6/downloads/'] +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb index 82b0b34124..116ee4cb8c 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb @@ -11,7 +11,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide toolchain = {'name': 'GCC', 'version': '4.6.4'} -source_urls = ['http://www.open-mpi.org/software/hwloc/v1.6/downloads/'] +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb index 86d26b6b93..00a3ce7444 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb @@ -11,7 +11,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide toolchain = {'name': 'GCC', 'version': '4.7.2'} -source_urls = ['http://www.open-mpi.org/software/hwloc/v1.6/downloads/'] +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index 044d2e5a31..f608c64f7f 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -14,7 +14,7 @@ builddependencies = [ ('Autoconf', '2.69') ] -dependencies = [ ('hwloc', '1.7.2') ] +dependencies = [('hwloc', '1.7.2')] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path -- GitLab From d36969b654d54e44092489008b1ef12c5f55c9fe Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 12 Nov 2013 21:07:06 +0100 Subject: [PATCH 278/811] horton: change libint2 version --- .../h/horton/horton-1.0.2-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../h/horton/horton-1.1.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../h/horton/horton-1.2.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/h/horton/horton-1.0.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/horton/horton-1.0.2-goolf-1.4.10-Python-2.7.3.eb index 3336144053..681e2b2371 100644 --- a/easybuild/easyconfigs/h/horton/horton-1.0.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/horton/horton-1.0.2-goolf-1.4.10-Python-2.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('h5py', '2.1.3', versionsuffix), ('matplotlib', '1.2.1', versionsuffix), ('sympy', '0.7.2', versionsuffix), - ('libint2', '2.0.3-stable'), + ('libint2', '2.0.3'), ('libxc', '2.0.1'), ] diff --git a/easybuild/easyconfigs/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb index 32b3aa2ac8..5a976445f4 100644 --- a/easybuild/easyconfigs/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('h5py', '2.1.3', versionsuffix), ('matplotlib', '1.2.1', versionsuffix), ('sympy', '0.7.2', versionsuffix), - ('libint2', '2.0.3-stable'), + ('libint2', '2.0.3'), ('libxc', '2.0.1'), ] diff --git a/easybuild/easyconfigs/h/horton/horton-1.1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/horton/horton-1.1.0-goolf-1.4.10-Python-2.7.3.eb index 54f87a0119..626c3d8f37 100644 --- a/easybuild/easyconfigs/h/horton/horton-1.1.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/horton/horton-1.1.0-goolf-1.4.10-Python-2.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('h5py', '2.1.3', versionsuffix), ('matplotlib', '1.2.1', versionsuffix), ('sympy', '0.7.2', versionsuffix), - ('libint2', '2.0.3-stable'), + ('libint2', '2.0.3'), ('libxc', '2.0.2'), ] diff --git a/easybuild/easyconfigs/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb index 37748b21e1..7ddb3a0d2d 100644 --- a/easybuild/easyconfigs/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('h5py', '2.1.3', versionsuffix), ('matplotlib', '1.2.1', versionsuffix), ('sympy', '0.7.2', versionsuffix), - ('libint2', '2.0.3-stable'), + ('libint2', '2.0.3'), ('libxc', '2.0.2'), ] diff --git a/easybuild/easyconfigs/h/horton/horton-1.2.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/horton/horton-1.2.0-goolf-1.4.10-Python-2.7.3.eb index 0e0420d98d..09b7559075 100644 --- a/easybuild/easyconfigs/h/horton/horton-1.2.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/horton/horton-1.2.0-goolf-1.4.10-Python-2.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('h5py', '2.1.3', versionsuffix), ('matplotlib', '1.2.1', versionsuffix), ('sympy', '0.7.2', versionsuffix), - ('libint2', '2.0.3-stable'), + ('libint2', '2.0.3'), ('libxc', '2.0.2'), ] diff --git a/easybuild/easyconfigs/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb index 8f8f46c66b..73a3298222 100644 --- a/easybuild/easyconfigs/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('h5py', '2.1.3', versionsuffix), ('matplotlib', '1.2.1', versionsuffix), ('sympy', '0.7.2', versionsuffix), - ('libint2', '2.0.3-stable'), + ('libint2', '2.0.3'), ('libxc', '2.0.2'), ] -- GitLab From c06b051dd2a30eafc547637b7a11906fcc852287 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 09:05:52 +0100 Subject: [PATCH 279/811] minor style fixes --- .../c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb | 10 +++++----- .../easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb | 10 +++++----- .../easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb | 10 +++++----- .../easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb | 9 +++------ .../easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb | 9 +++------ 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb index 09b072cd85..74971c2b92 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb @@ -12,11 +12,11 @@ version = '1.6.0' homepage = 'http://chapel.cray.com' description = """ Chapel is an emerging parallel programming language whose design and development - is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users - while also serving as a portable parallel programming model that can be used on commodity clusters - or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale - parallel computers while matching or beating the performance and portability of current programming - models like MPI.""" + is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users + while also serving as a portable parallel programming model that can be used on commodity clusters + or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale + parallel computers while matching or beating the performance and portability of current programming + models like MPI.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb index d0b2dd2a28..8699640db2 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb @@ -12,11 +12,11 @@ version = '1.6.0' homepage = 'http://chapel.cray.com' description = """ Chapel is an emerging parallel programming language whose design and development -is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users -while also serving as a portable parallel programming model that can be used on commodity clusters -or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale -parallel computers while matching or beating the performance and portability of current programming -models like MPI.""" + is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users + while also serving as a portable parallel programming model that can be used on commodity clusters + or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale + parallel computers while matching or beating the performance and portability of current programming + models like MPI.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb index 1a4794358b..a7621be492 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb @@ -12,11 +12,11 @@ version = '1.7.0' homepage = 'http://chapel.cray.com' description = """ Chapel is an emerging parallel programming language whose design and development -is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users -while also serving as a portable parallel programming model that can be used on commodity clusters -or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale -parallel computers while matching or beating the performance and portability of current programming -models like MPI.""" + is being led by Cray Inc. Chapel is designed to improve the productivity of high-end computer users + while also serving as a portable parallel programming model that can be used on commodity clusters + or desktop multicore systems. Chapel strives to vastly improve the programmability of large-scale + parallel computers while matching or beating the performance and portability of current programming + models like MPI.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb index d996fd401b..e1b2b7b42c 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb @@ -29,14 +29,11 @@ unpack_options = '--strip-components=1' # parallel build fails parallel = 1 -import os - -libpath = os.path.join('lib', - 'linux64.gnu.loc-flat.tasks-fifo.pthreads.tmr-generic.mem-default.atomics-intrinsics.gmp-none.re-none.wide-struct.fs-none') +libpath = 'lib/linux64.gnu.loc-flat.tasks-fifo.pthreads.tmr-generic.mem-default.atomics-intrinsics.' +libpath += 'gmp-none.re-none.wide-struct.fs-none' sanity_check_paths = { - 'files': ['bin/linux64/chpl', 'bin/linux64/chpldoc', - os.path.join(libpath, 'libchpl.a'), os.path.join(libpath, 'main.o')], + 'files': ['bin/linux64/chpl', 'bin/linux64/chpldoc', '%s/libchpl.a' % libpath, '%s/main.o' % libpath], 'dirs': [], } diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb index 94e4cf582f..388ed0d1a5 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb @@ -29,14 +29,11 @@ unpack_options = '--strip-components=1' # parallel build fails parallel = 1 -import os - -libpath = os.path.join('lib', - 'linux64.gnu.loc-flat.tasks-fifo.pthreads.tmr-generic.mem-default.atomics-intrinsics.gmp-none.re-none.wide-struct.fs-none') +libpath = 'lib/linux64.gnu.loc-flat.tasks-fifo.pthreads.tmr-generic.mem-default.atomics-intrinsics.' +libpath += 'gmp-none.re-none.wide-struct.fs-none' sanity_check_paths = { - 'files': ['bin/linux64/chpl', 'bin/linux64/chpldoc', - os.path.join(libpath, 'libchpl.a'), os.path.join(libpath, 'main.o')], + 'files': ['bin/linux64/chpl', 'bin/linux64/chpldoc', '%s/libchpl.a' % libpath, '%s/main.o' % libpath], 'dirs': [], } -- GitLab From 93fe7c0750bc87f4bdb54ce61af34d7e125c6905 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 10:45:15 +0100 Subject: [PATCH 280/811] minor style fixes --- .../g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb | 17 +++++--- .../g/GIMPS/GIMPS-p95v279.linux64.eb | 2 +- .../GIMPS-p95v279_linux64-makefile.patch | 20 ++++++++++ .../easyconfigs/g/GIMPS/gimps-linux64.patch | 39 ------------------- 4 files changed, 32 insertions(+), 46 deletions(-) create mode 100644 easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279_linux64-makefile.patch delete mode 100644 easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb index 0cbc86e733..9a2ad9d9d2 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb @@ -6,6 +6,7 @@ # License:: MIT/GPL # $Id$ ## +easyblock = 'MakeCp' name = 'GIMPS' version = 'p95v279' @@ -18,16 +19,20 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'} builddependencies = [('cURL', '7.33.0')] -# eg. http://www.mersenne.info/gimps/p95v279.source.zip -sources = [('%s.source.zip' % version, 'unzip -qq %s || /bin/true')] # workaround, since unzip IS effectively buggy -source_urls = ['http://www.mersenne.info/%s' % name.lower()] +# make sure unzip works, zipped sources may contain some 'corruption', +# e.g. "linux64/: ucsize 306 <> csize 0 for STORED entry" +sources = [('%(version)s.source.zip', 'unzip -qq %s || /bin/true')] +# e.g. http://www.mersenne.info/gimps/p95v279.source.zip +source_urls = ['http://www.mersenne.info/%(namelower)s'] # ref. https://bbs.archlinux.org/viewtopic.php?id=114996 & http://pastebin.com/PEFUUxHq -patches = ['gimps-linux64.patch'] +patches = ['GIMPS-p95v279_linux64-makefile.patch'] -skipsteps = ['configure'] start_dir = 'linux64' -preinstallopts = ["PREFIX=%(installdir)s "] + +makeopts = "-C ../gwnum -f make64 && make" + +files_to_copy = [(['mprime'], 'bin')] sanity_check_paths = { 'files': ["bin/mprime"], diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb index d8b83dfb03..4226f86422 100644 --- a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279.linux64.eb @@ -19,7 +19,7 @@ description = """GIMPS: Great Internet Mersenne Prime Search; toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['%(version)s.tar.gz'] -source_urls = ['ftp://mersenne.org/%s/' % name.lower()] +source_urls = ['http://www.mersenne.info/%(namelower)s'] sanity_check_paths = { 'files': ["mprime"], diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279_linux64-makefile.patch b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279_linux64-makefile.patch new file mode 100644 index 0000000000..b02c1f70f3 --- /dev/null +++ b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279_linux64-makefile.patch @@ -0,0 +1,20 @@ +--- linux64/makefile.orig 2013-11-13 10:20:19.196147162 +0100 ++++ linux64/makefile 2013-11-13 10:20:48.486687987 +0100 +@@ -8,7 +8,7 @@ + CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2 + + LFLAGS = -Wl,-M +-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl ++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread $(shell pkg-config --static --libs libcurl) -lstdc++ -ldl + + FACTOROBJ = factor64.o + LINUXOBJS = prime.o menu.o +@@ -25,7 +25,7 @@ + [ ! -e ../secure5.c ] && touch ../secure5.c || true + + clean: +- rm -f $(EXE) $(EXE2) $(LINUXOBJS) $(FACTOROBJ) ++ rm -f $(EXE) $(EXE2) $(LINUXOBJS) + + .c.o: + $(CC) $(CFLAGS) -c $< diff --git a/easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch b/easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch deleted file mode 100644 index c0b098a046..0000000000 --- a/easybuild/easyconfigs/g/GIMPS/gimps-linux64.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- linux64/makefile.orig 2012-12-12 13:31:54.000000000 +0100 -+++ linux64/makefile 2013-04-28 16:29:40.547843966 +0200 -@@ -8,7 +8,7 @@ CPP = g++ - CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2 - - LFLAGS = -Wl,-M --LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl -+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ - - FACTOROBJ = factor64.o - LINUXOBJS = prime.o menu.o -@@ -16,19 +16,25 @@ EXE = mprime - - ######################################################################### - --$(EXE): security $(LINUXOBJS) $(FACTOROBJ) -+$(EXE): build_gwnum64 security $(LINUXOBJS) $(FACTOROBJ) - $(CC) $(LFLAGS) -o $(EXE) $(LINUXOBJS) $(FACTOROBJ) $(LIBS) - -+build_gwnum64: -+ make -C ../gwnum -f make64 -+ - security: - [ ! -e ../security.h ] && touch ../security.h || true - [ ! -e ../security.c ] && touch ../security.c || true - [ ! -e ../secure5.c ] && touch ../secure5.c || true - - clean: -- rm -f $(EXE) $(EXE2) $(LINUXOBJS) $(FACTOROBJ) -+ rm -f $(EXE) $(EXE2) $(LINUXOBJS) - - .c.o: - $(CC) $(CFLAGS) -c $< - - .cpp.o: - $(CPP) $(CPPFLAGS) -c $< -+ -+install: -+ install -Dm755 mprime ${PREFIX}/bin/mprime -- GitLab From 65bae49c8782be32187b682971b8e6111cb1dd60 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 11:32:08 +0100 Subject: [PATCH 281/811] add flex/Bison as proper build deps for PCC, SDCC --- easybuild/easyconfigs/b/Bison/Bison-2.7.eb | 20 +++++++++++++++++ easybuild/easyconfigs/f/flex/flex-2.5.35.eb | 14 ++++++++++++ easybuild/easyconfigs/m/M4/M4-1.4.16.eb | 25 +++++++++++++++++++++ easybuild/easyconfigs/p/PCC/PCC-20131024.eb | 4 ++-- easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb | 4 ++-- 5 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7.eb create mode 100644 easybuild/easyconfigs/f/flex/flex-2.5.35.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.16.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7.eb new file mode 100644 index 0000000000..e6eb380e33 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.7' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar +into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'dummy', 'version': ''} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35.eb new file mode 100644 index 0000000000..6831986cc0 --- /dev/null +++ b/easybuild/easyconfigs/f/flex/flex-2.5.35.eb @@ -0,0 +1,14 @@ +name = 'flex' +version = '2.5.35' + +homepage = 'http://flex.sourceforge.net/' +description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, +sometimes called a tokenizer, is a program which recognizes lexical patterns in text.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} +toolchainopts = {'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16.eb new file mode 100644 index 0000000000..97181f8563 --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16.eb @@ -0,0 +1,25 @@ +name = 'M4' +version = '1.4.16' + +homepage = 'http://www.gnu.org/software/m4/m4.html' +description = """GNU M4 is an implementation of the traditional Unix macro processor. +It is mostly SVR4 compatible although it has some extensions +(for example, handling more than 9 positional parameters to macros). +GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc. +""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/m4'] + +patches = ['M4-%(version)s-no-gets.patch'] + +configopts = "--enable-cxx" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb index 7041e7506b..c1b3c7d84b 100644 --- a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb +++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb @@ -14,13 +14,13 @@ homepage = 'http://pcc.ludd.ltu.se/' description = """The compiler is based on the original Portable C Compiler by S. C. Johnson, written in the late 70's. About 50% of the frontend code and 80% of the backend code has been modified.""" -toolchain = {'name': 'dummy', 'version': 'dummy'} +toolchain = {'name': 'dummy', 'version': ''} # eg. http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-20131024.tgz sources = ['pcc-%(version)s.tgz'] source_urls = ['http://pcc.ludd.ltu.se/ftp/pub/pcc/'] -osdependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('bison', '2.4.1'), ] diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb index c200686c59..1a9784adab 100644 --- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb +++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb @@ -17,13 +17,13 @@ description = """SDCC is a retargettable, optimizing ANSI - C compiler suite tha MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors.""" -toolchain = {'name': 'dummy', 'version': 'dummy'} +toolchain = {'name': 'dummy', 'version': ''} # eg. http://sourceforge.net/projects/sdcc/files/sdcc/3.3.0/sdcc-src-3.3.0.tar.bz2/download sources = ['sdcc-src-%(version)s.tar.bz2'] source_urls = ['http://sourceforge.net/projects/sdcc/files/sdcc/%s/' % version, 'download'] -osdependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('bison', '2.4.1'), ] -- GitLab From 93e086714a0f0b5a92bd24bdead6717c22171ea1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 13:12:35 +0100 Subject: [PATCH 282/811] correct Bison dep version, add Boost as dependency for SDCC --- easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb | 21 +++++++++++++++++++ easybuild/easyconfigs/b/bzip2/bzip2-1.0.6.eb | 19 +++++++++++++++++ easybuild/easyconfigs/p/PCC/PCC-20131024.eb | 2 +- easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb | 3 ++- 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb create mode 100644 easybuild/easyconfigs/b/bzip2/bzip2-1.0.6.eb diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb new file mode 100644 index 0000000000..1556a38d3c --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb @@ -0,0 +1,21 @@ +name = 'Boost' +version = '1.55.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'dummy', 'version': ''} +toolchainopts = {'pic': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +dependencies = [('bzip2', '1.0.6')] + +configopts = '--without-libraries=python' + +toolset = 'gcc' + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6.eb new file mode 100644 index 0000000000..4d95eeaef2 --- /dev/null +++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6.eb @@ -0,0 +1,19 @@ +name = 'bzip2' +version = '1.0.6' + +homepage = 'http://www.bzip.org/' +description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically +compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical +compressors), whilst being around twice as fast at compression and six times faster at decompression.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} +toolchainopts = {'pic': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.bzip.org/%(version)s/'] + +import os +os.environ['CC'] = 'gcc' +os.environ['CFLAGS'] = '-O3 -fPIC' + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb index c1b3c7d84b..4a0122d6ab 100644 --- a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb +++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb @@ -22,7 +22,7 @@ source_urls = ['http://pcc.ludd.ltu.se/ftp/pub/pcc/'] builddependencies = [ ('flex', '2.5.35'), - ('bison', '2.4.1'), + ('Bison', '2.7'), ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb index 1a9784adab..e7a3bbe47a 100644 --- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb +++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb @@ -25,7 +25,8 @@ source_urls = ['http://sourceforge.net/projects/sdcc/files/sdcc/%s/' % version, builddependencies = [ ('flex', '2.5.35'), - ('bison', '2.4.1'), + ('Bison', '2.7'), + ('Boost', '1.55.0'), ] # similar build style like https://svn.redports.org/tijl/lang/sdcc/Makefile -- GitLab From d5485650d365587dcd1ee3eaf9dbcb6237f5b61e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 16:11:55 +0100 Subject: [PATCH 283/811] downgrade M4 to 1.4.16 in goolf/1.6.10 --- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb | 2 +- .../m/M4/{M4-1.4.17-GCC-4.8.2.eb => M4-1.4.16-GCC-4.8.2.eb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/m/M4/{M4-1.4.17-GCC-4.8.2.eb => M4-1.4.16-GCC-4.8.2.eb} (97%) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb index f93f3b881e..5211af2bb2 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'} source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('M4', '1.4.17')] +dependencies = [('M4', '1.4.16')] sanity_check_paths = { 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan", diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb similarity index 97% rename from easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb rename to easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb index 2016ba0f5b..5f6973dba4 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb @@ -1,5 +1,5 @@ name = 'M4' -version = '1.4.17' +version = '1.4.16' homepage = 'http://www.gnu.org/software/m4/m4.html' description = """GNU M4 is an implementation of the traditional Unix macro processor. -- GitLab From 4a82b9bbeb8db19fde1cb4c15e6abf86a1a781ef Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 17:59:02 +0100 Subject: [PATCH 284/811] use Score-P easyblock for Cube v4.x, OTF2 and Scalasca 2.x --- .../easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb | 2 ++ .../easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb | 2 ++ .../s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb | 8 ++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb index 0c307b4f19..a097385484 100644 --- a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb @@ -6,6 +6,8 @@ # This work is based from experiences from the UNITE project # http://apps.fz-juelich.de/unite/ ## +easyblock = 'EB_Score_minus_P' + name = "Cube" version = "4.2" diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb index ad32c9dc6a..88c6562214 100644 --- a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb @@ -6,6 +6,8 @@ # This work is based from experiences from the UNITE project # http://apps.fz-juelich.de/unite/ ## +easyblock = 'EB_Score_minus_P' + name = "OTF2" version = "1.2.1" diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb index 06a6bcbf45..1f62732cc1 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb @@ -6,6 +6,8 @@ # This work is based from experiences from the UNITE project # http://apps.fz-juelich.de/unite/ ## +easyblock = 'EB_Score_minus_P' + name = "Scalasca" version = "2.0" @@ -28,12 +30,6 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/scalasca/2.0/dist'] -# notes by Bernd Mohr -# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect -# --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) -# --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) -configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' - sanity_check_paths = { 'files': ["bin/scalasca", ("lib64/libpearl.replay.a", "lib/libpearl.replay.a")], 'dirs': [], -- GitLab From 360e32d6ce2f80932981339fc58fa6fc97c539fa Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 18:12:24 +0100 Subject: [PATCH 285/811] downgrade Java dep version for compatibility with biodeps --- .../easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb | 2 +- .../easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb | 2 +- easybuild/easyconfigs/p/picard/picard-1.100.eb | 2 +- easybuild/easyconfigs/p/picard/picard-1.39.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb index 4c621fce8f..b0b8f69c3e 100644 --- a/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb +++ b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-1.0.5083.eb @@ -12,6 +12,6 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} # download via http://www.broadinstitute.org/gatk/download (requires registration) sources = [SOURCE_TAR_BZ2] -dependencies = [('Java', '1.7.0_40')] +dependencies = [('Java', '1.7.0_10')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb index 4e2b834782..6f476f6eff 100644 --- a/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb +++ b/easybuild/easyconfigs/g/GenomeAnalysisTK/GenomeAnalysisTK-2.7-4.eb @@ -12,6 +12,6 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} # download via http://www.broadinstitute.org/gatk/download (requires registration) sources = [SOURCE_TAR_BZ2] -dependencies = [('Java', '1.7.0_40')] +dependencies = [('Java', '1.7.0_10')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/p/picard/picard-1.100.eb b/easybuild/easyconfigs/p/picard/picard-1.100.eb index 290abd2ffb..d852bf4290 100644 --- a/easybuild/easyconfigs/p/picard/picard-1.100.eb +++ b/easybuild/easyconfigs/p/picard/picard-1.100.eb @@ -9,6 +9,6 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} source_urls = [SOURCEFORGE_SOURCE] sources = ['%(name)s-tools-%(version)s.zip'] -dependencies = [('Java', '1.7.0_40')] +dependencies = [('Java', '1.7.0_10')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/p/picard/picard-1.39.eb b/easybuild/easyconfigs/p/picard/picard-1.39.eb index 28de787dec..47c911c385 100644 --- a/easybuild/easyconfigs/p/picard/picard-1.39.eb +++ b/easybuild/easyconfigs/p/picard/picard-1.39.eb @@ -9,6 +9,6 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} source_urls = [SOURCEFORGE_SOURCE] sources = ['%(name)s-tools-%(version)s.zip'] -dependencies = [('Java', '1.7.0_40')] +dependencies = [('Java', '1.7.0_10')] moduleclass = 'bio' -- GitLab From 2684359f05f952e39d0bb2810b561702f8f59b21 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 18:17:01 +0100 Subject: [PATCH 286/811] change toolchain for GTI, MUST and PnMPI to gompi/1.4.12-no-OFED, minor style fixes --- ...FED.eb => GTI-1.2.0-gompi-1.4.12-no-OFED.eb} | 17 ++++++++--------- ...ED.eb => MUST-1.2.0-gompi-1.4.12-no-OFED.eb} | 13 ++++++------- ...D.eb => PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb} | 7 +++---- 3 files changed, 17 insertions(+), 20 deletions(-) rename easybuild/easyconfigs/g/GTI/{GTI-1.2.0-gompi-1.5.12-no-OFED.eb => GTI-1.2.0-gompi-1.4.12-no-OFED.eb} (80%) rename easybuild/easyconfigs/m/MUST/{MUST-1.2.0-gompi-1.5.12-no-OFED.eb => MUST-1.2.0-gompi-1.4.12-no-OFED.eb} (89%) rename easybuild/easyconfigs/p/PnMPI/{PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb => PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb} (85%) diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb similarity index 80% rename from easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb index be80bae9fb..f5a52bfdc9 100644 --- a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb @@ -10,30 +10,29 @@ easyblock = 'CMakeMake' name = "GTI" version = "1.2.0" -specialversion = "release" homepage = 'http://www.tu-dresden.de/zih/must/' description = """A Generic Tools Infrastructure for Event-Based Tools in Parallel Systems.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} -dependencies = [ - ('PnMPI', '1.2.0'), -] - # http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/gti-release-1.2.0.tar.gz -sources = ['%(namelower)s-'+ specialversion +'-%(version)s.tar.gz'] source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] +sources = ['%(namelower)s-release-%(version)s.tar.gz'] patches = ['GTI-1.2.0-missing-unistd.patch'] -configopts = ' -DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}' +dependencies = [ + ('PnMPI', '1.2.0'), +] + +configopts = '-DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}' makeopts = 'CXXFLAGS="$CXXFLAGS -fpermissive"' sanity_check_paths = { 'files': ["bin/weaver", "include/I_Profiler.h"], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb similarity index 89% rename from easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb index ae65d6e727..a5c13ba8db 100644 --- a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb @@ -10,7 +10,6 @@ easyblock = 'CMakeMake' name = "MUST" version = "1.2.0" -specialversion = "release" homepage = 'http://www.tu-dresden.de/zih/must/' description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them @@ -19,22 +18,22 @@ description = """MUST detects usage errors of the Message Passing Interface (MPI already manifest --segmentation faults or incorrect results -- as well as many errors that are not visible to the application developer or do not manifest on a certain system or MPI implementation.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} +# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/must-release-1.2.0.tar.gz +source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] +sources = ['%(namelower)s-release-%(version)s.tar.gz'] + dependencies = [ ('GTI', '1.2.0'), ] -# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/must-release-1.2.0.tar.gz -sources = ['%(namelower)s-'+ specialversion +'-%(version)s.tar.gz'] -source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] - configopts = ' -DCMAKE_BUILD_TYPE=Release -DGTI_INSTALL_PREFIX=${EBROOTGTI}' sanity_check_paths = { 'files': ["bin/mustrun", "include/mustConfig.h"], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb similarity index 85% rename from easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb index 4e63e4ca1d..e63b090109 100644 --- a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb @@ -10,23 +10,22 @@ easyblock = 'CMakeMake' name = "PnMPI" version = "1.2.0" -specialversion = "for-gti" homepage = 'https://scalability.llnl.gov/pnmpi/' description = """MPI Tool Virtualization and Interoperability library.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} # http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/pnmpi-for-gti-1.2.0.tar.gz -sources = ['%(namelower)s-'+ specialversion +'-%(version)s.tar.gz'] source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] +sources = ['%(namelower)s-for-gti-%(version)s.tar.gz'] configopts = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False' sanity_check_paths = { 'files': ["bin/pnmpi-patch", "include/pnmpi.h", "lib/libpnmpi.a"], - 'dirs': [] + 'dirs': [], } moduleclass = 'perf' -- GitLab From 2d71b8ab9f47bc377cdae75964473c0e9357fa98 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 18:20:06 +0100 Subject: [PATCH 287/811] use Score-P easyblock for LWM2, minor style fixes, use gompi/1.4.12-no-OFED toolchain --- ...ED.eb => LWM2-1.1-gompi-1.4.12-no-OFED.eb} | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) rename easybuild/easyconfigs/l/LWM2/{LWM2-1.1-gompi-1.5.12-no-OFED.eb => LWM2-1.1-gompi-1.4.12-no-OFED.eb} (72%) diff --git a/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb similarity index 72% rename from easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb index 376a698417..dec9b30b4f 100644 --- a/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb @@ -6,6 +6,8 @@ # This work is based from experiences from the UNITE project # http://apps.fz-juelich.de/unite/ ## +easyblock = 'EB_Score_minus_P' + name = "LWM2" version = "1.1" @@ -24,34 +26,20 @@ description = """The lightweight measurement module (LWM2) is a low overhead pro some specific application activities. This includes the MPI communication calls and the amount of data transfer, the POSIX file I/O calls and associated data transfers, etc.""" -toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {"usempi": True} -compname = 'GCC' -compver = '4.7.3' - -# compiler toolchain depencies -dependencies = [ - ('PAPI', '5.2.0', "", (compname, compver)), -] - # http://www.vi-hps.org/upload/projects/hopsa/lwm2-1.1.tar.gz sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.vi-hps.org/upload/projects/hopsa/'] -# --- BM CONFIGOPTS --- -# -# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect -# --with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio) -# --with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|platform|scali|sgimpt|sun) -configopts = ' --with-nocross-compiler-suite=gcc --with-mpi=openmpi' -configopts += ' --with-papi-header=${EBROOTPAPI}/include --with-papi-lib=${EBROOTPAPI}/lib64' +# compiler toolchain depencies +dependencies = [ + ('PAPI', '5.2.0'), +] -# --- BM LIB64 --- -# -# On some systems libraries end up in lib/ sanity_check_paths = { - 'files': ["bin/l2freader", "lib64/liblwm2.a"], + 'files': ["bin/l2freader", ("lib64/liblwm2.a", "lib/liblwm2.a")], 'dirs': [] } -- GitLab From 8cca031198fd064c470feb92485d2f6a94685fa4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 18:57:13 +0100 Subject: [PATCH 288/811] specify Score-P easyblock hard to avoid falling back to ConfigureMake --- .../s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb index fed999ee60..4c327fa96c 100644 --- a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb @@ -6,6 +6,9 @@ # This work is based from experiences from the UNITE project # http://apps.fz-juelich.de/unite/ ## +# make sure we don't fall back to the ConfigureMake easyblock +easyblock = 'EB_Score_minus_P' + name = "Score-P" version = "1.2.1" -- GitLab From cec26a5cc0a0da0cc3dcdde0f61191e3eb8b1721 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 19:07:04 +0100 Subject: [PATCH 289/811] add CMake as build dep for PnMPI --- .../CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb | 18 ++++++++++++++++++ .../PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb new file mode 100644 index 0000000000..c259bae35b --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb @@ -0,0 +1,18 @@ +name = 'CMake' +version = "2.8.10.2" + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb index e63b090109..e01b6e0e3b 100644 --- a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb @@ -21,6 +21,8 @@ toolchainopts = {"usempi": True} source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] sources = ['%(namelower)s-for-gti-%(version)s.tar.gz'] +builddependencies = [('CMake', '2.8.10.2')] + configopts = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False' sanity_check_paths = { -- GitLab From b98f5ced690462a127aa25546166efe8f62f3526 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 20:11:25 +0100 Subject: [PATCH 290/811] clean up Scalasca v1.4.3 easyconfig to use EB_Scalasca1 easyblock --- .../Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb index 5b5fc85619..aad8b175e4 100644 --- a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb @@ -6,6 +6,8 @@ # This work is based from experiences from the UNITE project # http://apps.fz-juelich.de/unite/ ## +easyblock = 'EB_Scalasca1' + name = "Scalasca" version = "1.4.3" @@ -23,34 +25,16 @@ dependencies = [ ('binutils', '2.22'), ('Cube', '3.4.3'), ('OPARI2', '1.0.7'), - ('OTF', '1.12.4'), ('PAPI', '5.2.0'), ('PDT', '3.19'), +# Scalasca cannot handle name changes yet introduced with OTF-1.12.3 +# ('OTF', '1.12.4'), ] # http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist/scalasca-1.4.3.tar.gz sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist'] -# notes by Bernd Mohr -# Compiler and MPI suite should always be specified -- MUCH quicker and SAVER than autodetect -# --compiler=(gnu|pgi|intel|path|ibm|sun|clang)--compiler=(gnu|pgi|intel|path|ibm|sun|clang) -# --mpi=(mpich|mpich2|lam|openmpi|intel|intel2|hp|scali|mpibull2|bullxmpi|sun|ibmpoe|intelpoe) -configopts = ' --compiler=gnu' # otherwise Scalasca would potentially pick system Intel compiler -configopts += ' --mpi=openmpi' # quicker and saver than autodetect -configopts += ' --enable-all-mpi-wrappers' -configopts += ' --with-binutils=${EBROOTBINUTILS}' -configopts += ' --with-papi=${EBROOTPAPI}' -configopts += ' --disable-gui' # use external Cube 3.4.3 -configopts += ' --with-pdt=${EBROOTPDT}' -configopts += ' --with-opari2=${EBROOTOPARI2}' -# Scalasca cannot handle name changes yet introduced with OTF-1.12.3 -#configopts += ' --with-otf=${EBROOTOTF}' - -# note: needs to be adjusted for other toolchains -premakeopts = 'cd build-linux-gomp-openmpi && ' -preinstallopts = premakeopts - parallel = 1 sanity_check_paths = { -- GitLab From 7e4e25f986fd1e92c42f513d65992cc6183a1208 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 20:16:28 +0100 Subject: [PATCH 291/811] add CMake as build dep for GTI --- .../easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb index f5a52bfdc9..ca94e17050 100644 --- a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb @@ -23,9 +23,9 @@ sources = ['%(namelower)s-release-%(version)s.tar.gz'] patches = ['GTI-1.2.0-missing-unistd.patch'] -dependencies = [ - ('PnMPI', '1.2.0'), -] +dependencies = [('PnMPI', '1.2.0')] + +builddependencies = [('CMake', '2.8.10.2')] configopts = '-DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}' makeopts = 'CXXFLAGS="$CXXFLAGS -fpermissive"' -- GitLab From e0c7daa3ca364153a5f66ec840620ae8c120b364 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 20:35:21 +0100 Subject: [PATCH 292/811] add CMake as build dep for GTI --- .../easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb index a5c13ba8db..94a699dcb4 100644 --- a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb @@ -25,9 +25,9 @@ toolchainopts = {"usempi": True} source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/'] sources = ['%(namelower)s-release-%(version)s.tar.gz'] -dependencies = [ - ('GTI', '1.2.0'), -] +dependencies = [('GTI', '1.2.0')] + +builddependencies = [('CMake', '2.8.10.2')] configopts = ' -DCMAKE_BUILD_TYPE=Release -DGTI_INSTALL_PREFIX=${EBROOTGTI}' -- GitLab From 6a66bed38deb905df0bdeef69b7a3c49ff8183a6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Nov 2013 21:56:08 +0100 Subject: [PATCH 293/811] provide alternative download URL for Mesa --- .../m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 5 ++++- .../m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb | 5 ++++- .../m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb | 5 ++++- .../m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 0dbc448069..d3ced86b9d 100644 --- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,10 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True} sources = ['%sLib-%s.tar.gz' % (name, version)] -source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version] +source_urls = [ + 'ftp://ftp.freedesktop.org/pub/mesa/%(version)s', + 'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s', +] pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb index b038930e50..aa7d43dd2e 100644 --- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb @@ -8,7 +8,10 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = ['%sLib-%s.tar.gz' % (name, version)] -source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version] +source_urls = [ + 'ftp://ftp.freedesktop.org/pub/mesa/%(version)s', + 'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s', +] pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb index d3a225896d..2b0c88be6d 100644 --- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,10 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'optarch': True} sources = ['%sLib-%s.tar.gz' % (name, version)] -source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version] +source_urls = [ + 'ftp://ftp.freedesktop.org/pub/mesa/%(version)s', + 'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s', +] pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb index bc2ba6b2f5..c2adb7e2f2 100644 --- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb @@ -10,7 +10,10 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = ['%sLib-%s.tar.gz' % (name, version)] -source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version] +source_urls = [ + 'ftp://ftp.freedesktop.org/pub/mesa/%(version)s', + 'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s', +] pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) -- GitLab From 0170d7b0ef66cbdf205214d3ad5e693f3e734ccb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 14 Nov 2013 08:38:03 +0100 Subject: [PATCH 294/811] fix/enhance sanity check paths in MPICH2 easyconfigs --- easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb | 4 ++-- easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb index 96718532d3..c981157c0c 100644 --- a/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb @@ -14,8 +14,8 @@ source_urls = ['http://www.mpich.org/static/tarballs/%(version)s'] preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; ' sanity_check_paths = { - 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', - 'bin/mpiexec', 'bin/mpirun', 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], + 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpif77', 'bin/mpiexec', 'bin/mpirun', + 'include/mpi.h', 'include/mpif.h', 'lib/libmpich.a'], 'dirs': [], } diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb index 6716e71e5b..bccfcd087b 100644 --- a/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-3.0.4-GCC-4.8.1.eb @@ -17,8 +17,10 @@ preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset configopts = '--enable-shared' sanity_check_paths = { - 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', - 'bin/mpiexec', 'bin/mpirun', 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'], + 'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 'bin/mpiexec', 'bin/mpirun', + 'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 'lib/libfmpich.a', 'lib/libfmpich.so', + 'lib/libmpich.a', 'lib/libmpich.so', 'lib/libmpichcxx.a', 'lib/libmpichcxx.so', 'lib/libmpichf90.a', + 'lib/libmpichf90.so'], 'dirs': [], } -- GitLab From 524902a29912854a7c90c90453cf10ba0e5fcf6a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 14 Nov 2013 09:50:43 +0100 Subject: [PATCH 295/811] disable parallel build for MPICH2 v1.1 --- easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb index c981157c0c..9259eb9514 100644 --- a/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/m/MPICH2/MPICH2-1.1-GCC-4.8.1.eb @@ -19,4 +19,7 @@ sanity_check_paths = { 'dirs': [], } +# parallel build may fail +parallel = 1 + moduleclass = 'mpi' -- GitLab From 39735bb16acdec8fad9f7e07f6f427b11e44319c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 14 Nov 2013 10:00:41 +0100 Subject: [PATCH 296/811] fix Szip configure option for HDF to --with-szip --- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb index 77aaf88b28..4280af21ba 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb @@ -16,6 +16,6 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szip=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP" moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb index beeac81a9f..b4ea04cfdb 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb @@ -15,6 +15,6 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szip=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP" moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb index 4cfefc2018..b18ddf73bb 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb @@ -16,6 +16,6 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szip=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP" moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb index 0bbde1cc9d..2914eadfc9 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb @@ -17,6 +17,6 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szip=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP" moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index 652ae87480..1706cf2d0c 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -16,6 +16,6 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szip=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP" moduleclass = 'data' -- GitLab From 00af0ebdb652df8b103857cdf637f2f04009ed06 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 14 Nov 2013 12:06:47 +0100 Subject: [PATCH 297/811] added gbm package to R --- easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb | 2 ++ easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb | 1 + easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb | 1 + easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb | 1 + 10 files changed, 11 insertions(+) diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb index a2e641a449..8468c6029d 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb @@ -135,6 +135,8 @@ exts_list = [ ('R.oo', '1.13.0', ext_options), ('R.matlab', '1.7.0', ext_options), ('Rniftilib', '0.0-32', ext_options), + ('gbm', '2.1', ext_options), + ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb index cdf742e159..84d3f3e99e 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb @@ -135,6 +135,7 @@ exts_list = [ ('R.oo', '1.13.0', ext_options), ('R.matlab', '1.7.0', ext_options), ('Rniftilib', '0.0-32', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb index 71f7f43050..70126d1ce6 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb @@ -135,6 +135,7 @@ exts_list = [ ('R.oo', '1.13.0', ext_options), ('R.matlab', '1.7.0', ext_options), ('Rniftilib', '0.0-32', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb index f9ee59bde0..3a90cc17eb 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb @@ -135,6 +135,7 @@ exts_list = [ ('R.oo', '1.13.0', ext_options), ('R.matlab', '1.7.0', ext_options), ('Rniftilib', '0.0-32', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb index 6eb235ac8f..201aa6b636 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb @@ -135,6 +135,7 @@ exts_list = [ ('R.oo', '1.13.0', ext_options), ('R.matlab', '1.7.0', ext_options), ('Rniftilib', '0.0-32', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb index 9ea41bf416..65f22fa5a8 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb @@ -140,6 +140,7 @@ exts_list = [ ('ShortRead', '1.18.0', bioconductor_options), ('graph', '1.38.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb index 9cf2522c37..2672165c50 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb @@ -140,6 +140,7 @@ exts_list = [ ('ShortRead', '1.18.0', bioconductor_options), ('graph', '1.38.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb index 54e7b1e0bc..2f2b2a553e 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb @@ -140,6 +140,7 @@ exts_list = [ ('ShortRead', '1.18.0', bioconductor_options), ('graph', '1.38.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb index 521894ec3c..2d510cfe36 100644 --- a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb @@ -140,6 +140,7 @@ exts_list = [ ('ShortRead', '1.18.0', bioconductor_options), ('graph', '1.38.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb index 1f762f49eb..e9312bcac5 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb @@ -138,6 +138,7 @@ exts_list = [ ('ShortRead', '1.20.0', bioconductor_options), ('graph', '1.40.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('gbm', '2.1', ext_options), ] moduleclass = 'lang' -- GitLab From 4c20ce8deb416c9d83e782983649bc2e16936569 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 06:44:08 +0100 Subject: [PATCH 298/811] correct module class for gmacml --- easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb b/easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb index d51d6fb879..21c74d4ce9 100644 --- a/easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb +++ b/easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb @@ -30,4 +30,4 @@ dependencies = [ ('FFTW', '3.3.2', '', tc), ] -moduleclass = 'compiler' +moduleclass = 'toolchain' -- GitLab From 761349459e7797c1afc26c20aa82b7492e0ad812 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 06:44:25 +0100 Subject: [PATCH 299/811] bump version to 1.9.0.0, update release notes --- RELEASE_NOTES | 30 +++++++++++++++++++++--------- setup.py | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index cf37f73b12..6970d5b4fb 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,19 +1,31 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 1,710 easyconfig files, for 338 different software packages -and 25 different (compiler) toolchains. +The latest version of easybuild-easyconfig provides 1,710 easyconfig files, for 396 different software packages +and 27 different (compiler) toolchains. -v1.9.0 (November 14th 2013) +v1.9.0 (November 16th 2013) --------------------------- feature + bugfix release -- added example easyconfig files for XXX new software packages: - ARB (#396, #493), imake (#396, #493), inputproto (#396, #493), kbproto (#396, #493), libICE (#396, #493), - libSM (#396, #493), libX11 (#396, #493), libXau (#396, #493), libXaw (#396, #493), libXext (#396, #493), - libXi (#396, #493), libXmu (#396, #493), libXp (#396, #493), libXpm (#396, #493), libXt (#396, #493), - lynx (#396, #493), motif (#396, #493), printproto (#396, #493), Sablotron (#396, #493), xbitmaps (#396, #493), - xextproto (#396, #493), xtrans (#396, #493), +- added example easyconfig files for 58 new software packages: + - Allinea (#468), ARB + dependencies (#396, #493, #495), arpack-ng (#451, #481), CDO (#484, #521), Cube (#505), + ed (#503), FLTK (#503), GenomeAnalysisTK (#467), GIMPS (#527), GTI (#511), IPython (#485, #519), LWM2 (#510), MPICH2 (#460), MUST (#511), + ncdf (#496, #522), OPARI2 (#505), OpenBabel (#504, #524), OTF (#505), OTF2 (#505), + PandaSEQ (#475), ParaView (#498, #514), ParFlow (#483, #520), PCC (#486, #528), PDT (#505), picard (#467), + PnMPI (#511), PyQuante (#499, #523), pysqlite (#519), Scalasca (#505), Score-P (#505), SDCC (#486, #528), Silo (#483, #520), + Stride (#503), SURF (#503), TCC (#486, #528) + - ARB dependencies (23): fixesproto, imake, inputproto, kbproto, libICE, libSM, libX11, libXau, libXaw, libXext, + libXfixes, libXi, libXmu, libXp, libXpm, libXt, lynx, motif, printproto, Sablotron, + xbitmaps, xextproto, xtrans +- added easyconfigs for new gmpich2/1.4.8, gmpolf/1.4.8 and goolf/1.6.10 toolchains (#460, #525, #530) +- added additional easyconfigs for various software packages (list too long to include here) + - version updates, different toolchains, ... +- various bug fixes, including: + - enable building of shared libraries for MPICH (#482) + - fix HDF configure option for Szip, should be --with-szlib (#533) +- other + - add build status badges for master/develop branches to README (#490) v1.8.2.0 (October 18th 2013) ---------------------------- diff --git a/setup.py b/setup.py index db883e435c..3126a05aa1 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.9.0.0dev" +VERSION = "1.9.0.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From ef56d860bae2d9209d35f13340fbb55657951ecb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 06:47:51 +0100 Subject: [PATCH 300/811] fix long lines --- RELEASE_NOTES | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 6970d5b4fb..d81c959c80 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -10,11 +10,11 @@ v1.9.0 (November 16th 2013) feature + bugfix release - added example easyconfig files for 58 new software packages: - Allinea (#468), ARB + dependencies (#396, #493, #495), arpack-ng (#451, #481), CDO (#484, #521), Cube (#505), - ed (#503), FLTK (#503), GenomeAnalysisTK (#467), GIMPS (#527), GTI (#511), IPython (#485, #519), LWM2 (#510), MPICH2 (#460), MUST (#511), - ncdf (#496, #522), OPARI2 (#505), OpenBabel (#504, #524), OTF (#505), OTF2 (#505), + ed (#503), FLTK (#503), GenomeAnalysisTK (#467), GIMPS (#527), GTI (#511), IPython (#485, #519), LWM2 (#510), + MPICH2 (#460), MUST (#511), ncdf (#496, #522), OPARI2 (#505), OpenBabel (#504, #524), OTF (#505), OTF2 (#505), PandaSEQ (#475), ParaView (#498, #514), ParFlow (#483, #520), PCC (#486, #528), PDT (#505), picard (#467), - PnMPI (#511), PyQuante (#499, #523), pysqlite (#519), Scalasca (#505), Score-P (#505), SDCC (#486, #528), Silo (#483, #520), - Stride (#503), SURF (#503), TCC (#486, #528) + PnMPI (#511), PyQuante (#499, #523), pysqlite (#519), Scalasca (#505), Score-P (#505), SDCC (#486, #528), + Silo (#483, #520), Stride (#503), SURF (#503), TCC (#486, #528) - ARB dependencies (23): fixesproto, imake, inputproto, kbproto, libICE, libSM, libX11, libXau, libXaw, libXext, libXfixes, libXi, libXmu, libXp, libXpm, libXt, lynx, motif, printproto, Sablotron, xbitmaps, xextproto, xtrans -- GitLab From 9bfab8502edb21e183416714379756c8b282c682 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 06:48:42 +0100 Subject: [PATCH 301/811] fix moar long lines --- RELEASE_NOTES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index d81c959c80..142ef177c1 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -15,9 +15,9 @@ feature + bugfix release PandaSEQ (#475), ParaView (#498, #514), ParFlow (#483, #520), PCC (#486, #528), PDT (#505), picard (#467), PnMPI (#511), PyQuante (#499, #523), pysqlite (#519), Scalasca (#505), Score-P (#505), SDCC (#486, #528), Silo (#483, #520), Stride (#503), SURF (#503), TCC (#486, #528) - - ARB dependencies (23): fixesproto, imake, inputproto, kbproto, libICE, libSM, libX11, libXau, libXaw, libXext, - libXfixes, libXi, libXmu, libXp, libXpm, libXt, lynx, motif, printproto, Sablotron, - xbitmaps, xextproto, xtrans + - ARB dependencies (23): fixesproto, imake, inputproto, kbproto, libICE, libSM, libX11, libXau, libXaw, + libXext, libXfixes, libXi, libXmu, libXp, libXpm, libXt, lynx, motif, printproto, + Sablotron, xbitmaps, xextproto, xtrans - added easyconfigs for new gmpich2/1.4.8, gmpolf/1.4.8 and goolf/1.6.10 toolchains (#460, #525, #530) - added additional easyconfigs for various software packages (list too long to include here) - version updates, different toolchains, ... -- GitLab From b76f48744c5b1747036d6e17d7ac63ecbc85ab6b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 08:43:20 +0100 Subject: [PATCH 302/811] fix sanity check for matplotlib v1.3.x --- .../matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb | 5 +++-- .../matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb index 6c70a6433c..df45a7d5af 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ] python = "Python" pythonversion = '2.7.5' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) @@ -27,9 +27,10 @@ dependencies = [ ('libpng', '1.6.3', '-zlib-%s' % zlibver), ] +eggname = 'matplotlib-%%(version)s-py%(pyver)s-linux-x86_64.egg' % pyshortver sanity_check_paths = { 'files': [], - 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion] + 'dirs': ['lib/python%s/site-packages/%s' % (pyshortver, eggname)], } moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb index 6dd46d0c4d..d2527d7b96 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb @@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ] python = "Python" pythonversion = '2.7.5' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) @@ -26,9 +26,10 @@ dependencies = [ ('libpng', '1.6.6'), ] +eggname = 'matplotlib-%%(version)s-py%(pyver)s-linux-x86_64.egg' % pyshortver sanity_check_paths = { 'files': [], - 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], + 'dirs': ['lib/python%s/site-packages/%s' % (pyshortver, eggname)], } moduleclass = 'vis' -- GitLab From b7df4f497fc74d92d656b1a3d11c0ea37173da53 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 08:52:12 +0100 Subject: [PATCH 303/811] add missing libpng dep for freetype v2.5.0.1 --- easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb | 1 - .../easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb index 6a4aa141fa..5771475460 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb @@ -6,7 +6,6 @@ description = """FreeType 2 is a software font engine that is designed to be sma portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb index 757c2ccb44..a3b5de75a2 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb @@ -11,6 +11,8 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'} source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] sources = [SOURCE_TAR_GZ] +dependencies = [('libpng', '1.6.6')] + sanity_check_paths = { 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], 'dirs': ['include/freetype2'], -- GitLab From 0415e085e39f0275017c68a58a7dc263f69c56dd Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 08:53:13 +0100 Subject: [PATCH 304/811] fix typo in SCons easyconfigs --- .../s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb | 2 +- .../easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.3.eb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb index 042f0a3927..8b61797076 100644 --- a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb @@ -17,7 +17,7 @@ dependencies = [(python, pyver)] sanity_check_paths = { 'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'], - 'dirs': ['lib/%(namelower)-%(version)s/%(name)s'], + 'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'], } options = {'modulename': False} diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb index 1d00a172f0..6185a8ef97 100644 --- a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -17,7 +17,7 @@ dependencies = [(python, pyver)] sanity_check_paths = { 'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'], - 'dirs': ['lib/%(namelower)-%(version)s/%(name)s'], + 'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'], } options = {'modulename': False} diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.3.eb index 6dcf9fedf6..37ed0ff7a4 100644 --- a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.3.eb @@ -17,7 +17,7 @@ dependencies = [(python, pyver)] sanity_check_paths = { 'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'], - 'dirs': ['lib/%(namelower)-%(version)s/%(name)s'], + 'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'], } options = {'modulename': False} -- GitLab From 65ca5ed070d0c656a7d807a569ff6994f23af618 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 08:57:45 +0100 Subject: [PATCH 305/811] add alternatives for checking lxml egg in sanity check paths --- .../l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb | 7 ++++--- .../l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb index 04fd1c6bdf..dea6e016af 100644 --- a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb @@ -13,7 +13,7 @@ sources = ['%(name)s-%(version)s.tgz'] python = 'Python' pythonversion = '2.7.3' -pythonshortversion = '.'.join(pythonversion.split('.')[:2]) +pyshortver = '.'.join(pythonversion.split('.')[:2]) versionsuffix = "-%s-%s" % (python, pythonversion) @@ -23,11 +23,12 @@ dependencies = [ ('libxslt', '1.1.28'), ] -pylibdir = "lib/python%s/site-packages/%%(name)s" % pythonshortversion +pylibdir = "lib/python%s/site-packages/%%(name)s" % pyshortver sanity_check_paths = { 'files': [], - 'dirs': ['%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion)], + 'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pyshortver), + '%s-%%(version)s-py%s-linux-x86_64.egg' % (pylibdir, pyshortver))], } moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb index baf8fa9262..ada05f00c3 100644 --- a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb @@ -13,7 +13,7 @@ sources = ['%(name)s-%(version)s.tgz'] python = 'Python' pythonversion = '2.7.3' -pythonshortversion = '.'.join(pythonversion.split('.')[:2]) +pyshortver = '.'.join(pythonversion.split('.')[:2]) versionsuffix = "-%s-%s" % (python, pythonversion) @@ -23,11 +23,12 @@ dependencies = [ ('libxslt', '1.1.28'), ] -pylibdir = "lib/python%s/site-packages/%%(name)s" % pythonshortversion +pylibdir = "lib/python%s/site-packages/%%(name)s" % pyshortver sanity_check_paths = { 'files': [], - 'dirs': ['%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion)], + 'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pyshortver), + '%s-%%(version)s-py%s-linux-x86_64.egg' % (pylibdir, pyshortver))], } moduleclass = 'lib' -- GitLab From 4c3f144422cea4f192b23780aecfecf5f3cc5845 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 09:00:16 +0100 Subject: [PATCH 306/811] specify alternatives for matplotlib sanity check --- .../m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb | 3 ++- .../m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb index df45a7d5af..b45fe7a187 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -27,10 +27,11 @@ dependencies = [ ('libpng', '1.6.3', '-zlib-%s' % zlibver), ] +pyprefix = 'lib/python%s/site-packages' % pyshortver eggname = 'matplotlib-%%(version)s-py%(pyver)s-linux-x86_64.egg' % pyshortver sanity_check_paths = { 'files': [], - 'dirs': ['lib/python%s/site-packages/%s' % (pyshortver, eggname)], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], } moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb index d2527d7b96..4bb62a19b0 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb @@ -26,10 +26,11 @@ dependencies = [ ('libpng', '1.6.6'), ] +pyprefix = 'lib/python%s/site-packages' % pyshortver eggname = 'matplotlib-%%(version)s-py%(pyver)s-linux-x86_64.egg' % pyshortver sanity_check_paths = { 'files': [], - 'dirs': ['lib/python%s/site-packages/%s' % (pyshortver, eggname)], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], } moduleclass = 'vis' -- GitLab From c76ac6fb4022e49e1b1574318a58afca1d5f8e13 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 09:09:32 +0100 Subject: [PATCH 307/811] fix sanity check for motif --- easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb | 6 +++--- easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb | 6 +++--- easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb | 5 +++++ easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb | 5 +++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb index 22fb85436c..13750addff 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb @@ -1,5 +1,5 @@ name = 'motif' -version = '2.2.4' # this version provides libXm.so.3 +version = '2.2.4' easyblock = 'ConfigureMake' homepage = 'http://motif.ics.com/' @@ -50,8 +50,8 @@ configopts = "--enable-shared" parallel = 1 sanity_check_paths = { - 'files': ['lib/libXm.so.3'], - 'dirs': [] + 'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a'], + 'dirs': ['bin', 'include/Mrm', 'include/uil', 'include/X11', 'include/Xm'], } moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb index 2e3fc1ae9f..0b6bd08d0c 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb @@ -1,5 +1,5 @@ name = 'motif' -version = '2.2.4' # this version provides libXm.so.3 +version = '2.2.4' easyblock = 'ConfigureMake' homepage = 'http://motif.ics.com/' @@ -50,8 +50,8 @@ configopts = "--enable-shared" parallel = 1 sanity_check_paths = { - 'files': ['lib/libXm.so.3'], - 'dirs': [] + 'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a'], + 'dirs': ['bin', 'include/Mrm', 'include/uil', 'include/X11', 'include/Xm'], } moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb index 3f9ec34302..2acf37eefa 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-goolf-1.4.10.eb @@ -24,4 +24,9 @@ preconfigopts = "./autogen.sh && " # makefile is not parallel safe parallel = 1 +sanity_check_paths = { + 'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a', 'bin/mwm', 'bin/uil', 'bin/xmbind'], + 'dirs': ['include/Mrm', 'include/uil', 'include/X11', 'include/Xm'], +} + moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb index 04c45d219f..be6b381189 100644 --- a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb @@ -24,4 +24,9 @@ preconfigopts = "./autogen.sh && " # makefile is not parallel safe parallel = 1 +sanity_check_paths = { + 'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a', 'bin/mwm', 'bin/uil', 'bin/xmbind'], + 'dirs': ['include/Mrm', 'include/uil', 'include/X11', 'include/Xm'], +} + moduleclass = 'vis' -- GitLab From c7398c8052fc71435130d57b09f846eba8d28db7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 09:13:52 +0100 Subject: [PATCH 308/811] add alternatives to sanity check for pandas --- .../p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb | 7 ++++--- .../p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb | 7 ++++--- .../p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb index e5a2e84a8b..4c33987f04 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb @@ -23,8 +23,9 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2]) pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name) sanity_check_paths = { - 'files': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)], - 'dirs': [] - } + 'files': [("%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver), + "%s-%%(version)s-py%s-linux-x86_64.egg" % (pylibdir, py_short_ver))], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb index 0d29e8b37a..1e3b66ee19 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb @@ -23,8 +23,9 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2]) pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name) sanity_check_paths = { - 'files': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)], - 'dirs': [] - } + 'files': [("%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver), + "%s-%%(version)s-py%s-linux-x86_64.egg" % (pylibdir, py_short_ver))], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb index 915b78a0e7..37af8a2699 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb @@ -23,8 +23,9 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2]) pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name) sanity_check_paths = { - 'files': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)], - 'dirs': [] + 'files': [("%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver), + "%s-%%(version)s-py%s-linux-x86_64.egg" % (pylibdir, py_short_ver))], + 'dirs': [], } moduleclass = 'lib' -- GitLab From f37777768312e1fa7dc4601cafcad6e67a98206c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 09:19:29 +0100 Subject: [PATCH 309/811] fix typo --- .../m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb | 2 +- .../m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb index b45fe7a187..e6a5b35166 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb @@ -28,7 +28,7 @@ dependencies = [ ] pyprefix = 'lib/python%s/site-packages' % pyshortver -eggname = 'matplotlib-%%(version)s-py%(pyver)s-linux-x86_64.egg' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver sanity_check_paths = { 'files': [], 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb index 4bb62a19b0..8edf2b22c2 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb @@ -27,7 +27,7 @@ dependencies = [ ] pyprefix = 'lib/python%s/site-packages' % pyshortver -eggname = 'matplotlib-%%(version)s-py%(pyver)s-linux-x86_64.egg' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver sanity_check_paths = { 'files': [], 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], -- GitLab From 42ca6fd848fcf781ce2ab891ea1289a40e7e2815 Mon Sep 17 00:00:00 2001 From: Andreas Panteli Date: Fri, 15 Nov 2013 10:46:56 +0200 Subject: [PATCH 310/811] Contribute new easyconfig for Libint with ictce-4.1.13 needed for CP2K --- .../l/Libint/Libint-1.1.4-ictce-4.1.13.eb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..6f64e7b117 --- /dev/null +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb @@ -0,0 +1,24 @@ +name = 'Libint' +version = '1.1.4' + +homepage = 'http://www.files.chem.vt.edu/chem-dept/valeev/software/libint/libint.html' +description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body + matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory.""" + + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'download') + +configopts = "--with-pic --enable-deriv --enable-r12" + +sanity_check_paths = { + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[] + } + +moduleclass = 'chem' -- GitLab From f97ae80cc98fd99e4fcf5d9ccbf647d0725343ec Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 15 Nov 2013 17:41:17 +0100 Subject: [PATCH 311/811] add OCaml & Erlang Signed-off-by: Fotis Georgatos --- .../e/Erlang/Erlang-R16B02-goolf-1.4.10.eb | 32 +++++++++++++++++ .../o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb | 35 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb new file mode 100644 index 0000000000..903021b2af --- /dev/null +++ b/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb @@ -0,0 +1,32 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = "Erlang" +version = "R16B02" + +homepage = 'http://www.example.com' +description = """Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. Some of its uses are + in telecoms, banking, e-commerce, computer telephony and instant messaging. Erlang's + runtime system has built-in support for concurrency, distribution and fault tolerance.""" + +toolchain = {'version': '1.4.10', 'name': 'goolf'} + +sources = ['otp_src_%(version)s.tar.gz'] +source_urls = ['http://www.erlang.org/download/'] + +builddependencies = [('Autoconf', '2.69')] +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/erl", "bin/erlc"], + 'dirs': [] +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..1274793c40 --- /dev/null +++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb @@ -0,0 +1,35 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +## + +name = "OCaml" +version = "4.01.0" + +homepage = 'http://www.example.com' +description = """OCaml is a general purpose industrial-strength programming language + with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria + it benefits from one of the most advanced type systems and supports functional, + imperative and object-oriented styles of programming.""" + +toolchain = {'version': '1.4.10', 'name': 'goolf'} + +sources = ['ocaml-%(version)s.tar.gz'] +source_urls = ['http://caml.inria.fr/pub/distrib/ocaml-%(version_major_minor)s'] + +builddependencies = [('Autoconf', '2.69')] +dependencies = [('ncurses', '5.9')] + +prefix_opt = "-prefix " +makeopts = "world" + +sanity_check_paths = { + 'files': ["bin/ocaml", "bin/ocamlc"], + 'dirs': [] +} + +moduleclass = 'lang' -- GitLab From 682275e6918aa827d2c062492dc998572e1961e0 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 15 Nov 2013 17:51:02 +0100 Subject: [PATCH 312/811] add homepages for OCaml/Erlang & optimize better OCaml build Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb index 903021b2af..f16d2df15b 100644 --- a/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb @@ -10,7 +10,7 @@ name = "Erlang" version = "R16B02" -homepage = 'http://www.example.com' +homepage = 'http://www.erlang.org/' description = """Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high availability. Some of its uses are in telecoms, banking, e-commerce, computer telephony and instant messaging. Erlang's diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb index 1274793c40..cb3cc4532d 100644 --- a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb @@ -10,7 +10,7 @@ name = "OCaml" version = "4.01.0" -homepage = 'http://www.example.com' +homepage = 'http://ocaml.org/' description = """OCaml is a general purpose industrial-strength programming language with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria it benefits from one of the most advanced type systems and supports functional, @@ -25,7 +25,7 @@ builddependencies = [('Autoconf', '2.69')] dependencies = [('ncurses', '5.9')] prefix_opt = "-prefix " -makeopts = "world" +makeopts = "world.opt" sanity_check_paths = { 'files': ["bin/ocaml", "bin/ocamlc"], -- GitLab From 4e8f74dca2cfe59bb2b2f46c275b538a30239093 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 15 Nov 2013 19:03:59 +0100 Subject: [PATCH 313/811] add Szip as dependency for Ferret, required because of linking to HDF5 lib --- .../easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb | 1 + easybuild/easyconfigs/f/Ferret/Ferret-6.72-goolf-1.4.10.eb | 1 + easybuild/easyconfigs/f/Ferret/Ferret-lib64-hardcoded.patch | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb index 78f914edb5..6712058e86 100644 --- a/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb @@ -14,6 +14,7 @@ source_urls = ['ftp://ftp.pmel.noaa.gov/ferret/pub/source'] dependencies = [ ('netCDF', '4.1.3'), ('zlib', '1.2.7'), + ('Szip', '2.1'), ('cURL', '7.27.0'), ('ncurses', '5.9'), ('libreadline', '6.2'), diff --git a/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goolf-1.4.10.eb b/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goolf-1.4.10.eb index 8ff4d67493..02e973122d 100644 --- a/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goolf-1.4.10.eb @@ -14,6 +14,7 @@ source_urls = ['ftp://ftp.pmel.noaa.gov/ferret/pub/source'] dependencies = [ ('netCDF', '4.1.3'), ('zlib', '1.2.7'), + ('Szip', '2.1'), ('cURL', '7.27.0'), ('ncurses', '5.9'), ('libreadline', '6.2'), diff --git a/easybuild/easyconfigs/f/Ferret/Ferret-lib64-hardcoded.patch b/easybuild/easyconfigs/f/Ferret/Ferret-lib64-hardcoded.patch index df9b0d656d..d67bae3d1b 100644 --- a/easybuild/easyconfigs/f/Ferret/Ferret-lib64-hardcoded.patch +++ b/easybuild/easyconfigs/f/Ferret/Ferret-lib64-hardcoded.patch @@ -25,7 +25,7 @@ diff -ru FERRET.orig/fer/platform_specific_flags.mk.x86_64-linux FERRET/fer/plat + CDFLIB = $(NETCDF4_DIR)/lib/libnetcdff.a \ + $(NETCDF4_DIR)/lib/libnetcdf.a \ + $(HDF5_DIR)/lib/libhdf5_hl.a \ -+ $(HDF5_DIR)/lib/libhdf5.a \ ++ $(HDF5_DIR)/lib/libhdf5.a $(EBROOTSZIP)/lib/libsz.a \ + $(EBROOTZLIB)/lib/libz.a LINUX_OBJS = special/linux_routines.o \ -- GitLab From 41b08f18d36ee021937b11dc2f871f5e3d80a766 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 16 Nov 2013 03:37:17 +0100 Subject: [PATCH 314/811] update easyconfigs count --- RELEASE_NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 142ef177c1..495aeca4bd 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,7 +1,7 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 1,710 easyconfig files, for 396 different software packages +The latest version of easybuild-easyconfig provides 1,939 easyconfig files, for 396 different software packages and 27 different (compiler) toolchains. v1.9.0 (November 16th 2013) -- GitLab From 6cd84e182960c279245f44a2e6ee4f2b27c03cb3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 17 Nov 2013 06:57:44 +0100 Subject: [PATCH 315/811] add alternative for phonopy sanity check --- .../p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb index 05a9023d98..b04b53c6a6 100644 --- a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb @@ -28,7 +28,7 @@ pylibdir = "lib/python%s/site-packages/%%(name)s" % pythonshortversion sanity_check_paths = { 'files': [], - 'dirs': ['%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion)], + 'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion), '%(name)s')], } moduleclass = 'lib' -- GitLab From d1cae743fedf1485896bdef2c4fe91e5ab08b23f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 17 Nov 2013 13:22:59 +0100 Subject: [PATCH 316/811] fix typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 84580039c4..babe85ff33 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ We'd love you to contribute back to EasyBuild, and here's how you can do it: the branch - hack - pull request cycle. -## Praperation +## Preparation ### Fork easybuild-easyconfigs -- GitLab From 2956bda8e3692586377e34aef625c5aad94bda41 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 17 Nov 2013 13:54:22 +0100 Subject: [PATCH 317/811] provide correct alternative for phonopy sanity check lib path --- .../p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb index b04b53c6a6..2e67c2d367 100644 --- a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb @@ -28,7 +28,7 @@ pylibdir = "lib/python%s/site-packages/%%(name)s" % pythonshortversion sanity_check_paths = { 'files': [], - 'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion), '%(name)s')], + 'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion), pylibdir)], } moduleclass = 'lib' -- GitLab From 0b6ae1a059842cc6981234a11db86c1b07a136b0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 17 Nov 2013 14:35:50 +0100 Subject: [PATCH 318/811] fix release date for EB v1.9.0 --- RELEASE_NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 495aeca4bd..eea0f2c004 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,7 +4,7 @@ For more detailed information, please see the git log. The latest version of easybuild-easyconfig provides 1,939 easyconfig files, for 396 different software packages and 27 different (compiler) toolchains. -v1.9.0 (November 16th 2013) +v1.9.0 (November 17th 2013) --------------------------- feature + bugfix release -- GitLab From 8ac08b63eeb0b66bdf547928585d0364c5f483d5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 17 Nov 2013 14:38:49 +0100 Subject: [PATCH 319/811] add note on HDF5 --- RELEASE_NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index eea0f2c004..c93f9dee84 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -24,6 +24,7 @@ feature + bugfix release - various bug fixes, including: - enable building of shared libraries for MPICH (#482) - fix HDF configure option for Szip, should be --with-szlib (#533) + - for HDF5, this issue is fixed in the HDF5 easyblock - other - add build status badges for master/develop branches to README (#490) -- GitLab From 1b65ccf2e765592d0fd0fdb168425c9f2183c704 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 18 Nov 2013 21:45:41 +0100 Subject: [PATCH 320/811] add new elements for goolfc/2.0.10 Signed-off-by: Fotis Georgatos --- .../f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb | 32 ++++++++++++ .../easyconfigs/g/gompic/gompic-1.6.10.eb | 29 +++++++++++ .../easyconfigs/g/goolfc/goolfc-2.0.10.eb | 41 +++++++++++++++ ...enBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb | 51 +++++++++++++++++++ .../OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb | 40 +++++++++++++++ ...mpic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb | 25 +++++++++ 6 files changed, 218 insertions(+) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb create mode 100644 easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb create mode 100644 easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb create mode 100644 easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb new file mode 100644 index 0000000000..7dd42f220e --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gompic', 'version': '1.6.10'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb b/easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb new file mode 100644 index 0000000000..525fd48b04 --- /dev/null +++ b/easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb @@ -0,0 +1,29 @@ +easyblock = "Toolchain" + +name = 'gompic' +version = '1.6.10' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, + including OpenMPI for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.8.2' +comp = (compname, compver) + +mpilib = 'OpenMPI' +mpiver = '1.7.3' + +cudaname = 'CUDA' +cudaver = '5.5.22' +cudasuffix = '-' + cudaname + '-' + cudaver + +# compiler toolchain dependencies +dependencies = [ + comp, + (mpilib, mpiver, cudasuffix, comp), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb b/easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb new file mode 100644 index 0000000000..549e0bec37 --- /dev/null +++ b/easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb @@ -0,0 +1,41 @@ +easyblock = "Toolchain" + +name = 'goolfc' +version = '2.0.10' + +homepage = '(none)' +description = """GCC based compiler toolchain __with CUDA support__, and including + OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp_name = 'GCC' +comp_version = '4.8.2' +comp = (comp_name, comp_version) + +# toolchain used to build goolfc dependencies +comp_mpi_tc_name = 'gompic' +comp_mpi_tc_ver = '1.6.10' +comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) + +cudaname = 'CUDA' +cudaver = '5.5.22' +cudasuffix = '-' + cudaname + '-' + cudaver + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blassuff = '-LAPACK-3.4.2' +blas = '-%s-%s%s' % (blaslib, blasver, blassuff) + +# compiler toolchain dependencies +# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain +# because of toolchain preperation functions +dependencies = [ + comp, # part of gompic + ('OpenMPI', '1.7.3', cudasuffix, comp), # part of gompic, which includes also CUDA + (blaslib, blasver, blassuff, comp_mpi_tc), + ('FFTW', '3.3.3', '', comp_mpi_tc), + ('ScaLAPACK', '2.0.2', blas, comp_mpi_tc), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..dfef0b31c1 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb @@ -0,0 +1,51 @@ +name = 'OpenBLAS' +version = '0.2.8' + +lapackver = '3.4.2' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'gompic', 'version': '1.6.10'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb new file mode 100644 index 0000000000..64159cacf9 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb @@ -0,0 +1,40 @@ +name = 'OpenMPI' +version = "1.7.3" +versionsuffix = '-CUDA-5.5.22' + +homepage = 'http://www.open-mpi.org/' +description = """The Open MPI Project is an open source MPI-2 implementation.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] + +builddependencies = [ + ('Automake', '1.14'), + ('Autoconf', '2.69') +] + +dependencies = [ + ('hwloc', '1.7.2'), + ('CUDA', '5.5.22', '', True), +] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support +configopts += '--with-cuda=$CUDA_HOME ' # CUDA-aware build; N.B. --disable-dlopen is incompatible + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"] +} + +moduleclass = 'mpi' + +patches = ['openmpi-mca-params.conf-1.4.5-local.patch', 'pax_disable.patch'] diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..0bc94ce1d6 --- /dev/null +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb @@ -0,0 +1,25 @@ +name = 'ScaLAPACK' +version = '2.0.2' + +homepage = 'http://www.netlib.org/scalapack/' +description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines + redesigned for distributed memory MIMD parallel computers.""" + +toolchain = {'name': 'gompic', 'version': '1.6.10'} +toolchainopts = {'pic': True} + +source_urls = [homepage] +sources = ['%(namelower)s-%(version)s.tgz'] + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blassuff = '-LAPACK-3.4.2' + +versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff) + +dependencies = [(blaslib, blasver, blassuff)] + +## parallel build tends to fail, so disabling it +parallel = 1 + +moduleclass = 'numlib' -- GitLab From 1d85a645e9ba730fdd0ddf5a9a1a52aadc018a78 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 19 Nov 2013 12:39:02 +0100 Subject: [PATCH 321/811] Added ghostscript --- .../ghostscript-9.10-goolf-1.4.10.eb | 24 +++++++++++++++++++ .../ghostscript-9.10-ictce-4.1.13.eb | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb b/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb new file mode 100644 index 0000000000..c2f7480573 --- /dev/null +++ b/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb @@ -0,0 +1,24 @@ +name = 'ghostscript' +version = '9.10' + +homepage = 'http://ghostscript.com' +description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to + different targets. It used to be part of the cups printing stack, but is no longer used for that. +""" +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True} + +source_urls = ["http://downloads.ghostscript.com/public/"] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ +# optional, these are actually patched and included in the sources, +# ('expat', '2.1.0'), +# ('freetype', '2.4.10'), +# ('libpng', '1.6.2'), + ('LibTIFF', '4.0.3'), +] + +configopts = "--with-system-libtiff --enable-dynamic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb b/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb new file mode 100644 index 0000000000..d38ce6de2c --- /dev/null +++ b/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb @@ -0,0 +1,24 @@ +name = 'ghostscript' +version = '9.10' + +homepage = 'http://ghostscript.com' +description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to + different targets. It used to be part of the cups printing stack, but is no longer used for that. +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True} + +source_urls = ["http://downloads.ghostscript.com/public/"] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ +# optional, these are actually patched and included in the sources, +# ('expat', '2.1.0'), +# ('freetype', '2.4.10'), +# ('libpng', '1.6.2'), + ('LibTIFF', '4.0.3'), +] + +configopts = "--with-system-libtiff --enable-dynamic" + +moduleclass = 'lib' -- GitLab From f12f0bf4fdcaf8eb20aec04e3b9e337f859f59ba Mon Sep 17 00:00:00 2001 From: pescobar Date: Tue, 19 Nov 2013 16:23:53 +0100 Subject: [PATCH 322/811] added CAP3 assembler config files for intel-x86, intel-x86_64 and opteron --- .../easyconfigs/c/CAP3/CAP3-intel-x86.eb | 23 +++++++++++++++++++ .../easyconfigs/c/CAP3/CAP3-intel-x86_64.eb | 23 +++++++++++++++++++ easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb | 23 +++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb create mode 100644 easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb create mode 100644 easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb b/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb new file mode 100644 index 0000000000..e9d20d0c64 --- /dev/null +++ b/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb @@ -0,0 +1,23 @@ + +name = 'CAP3' +version = 'intel-x86_12-21-2007' + +easyblock = 'PackedBinary' + +homepage = 'http://seq.cs.iastate.edu/' +description = """CAP3 assembly program """ + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [('http://seq.cs.iastate.edu/CAP3/')] +sources = ['cap3.linux.tar'] + +sanity_check_paths = { + 'files': ['cap3','formcon'], + 'dirs': [], +} + + +moduleclass = 'bio' + + diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb b/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb new file mode 100644 index 0000000000..46918913be --- /dev/null +++ b/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb @@ -0,0 +1,23 @@ + +name = 'CAP3' +version = 'intel-x86_64_12-21-2007' + +easyblock = 'PackedBinary' + +homepage = 'http://seq.cs.iastate.edu/' +description = """CAP3 assembly program """ + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [('http://seq.cs.iastate.edu/CAP3/')] +sources = ['cap3.linux.x86_64.tar'] + +sanity_check_paths = { + 'files': ['cap3','formcon'], + 'dirs': [], +} + + +moduleclass = 'bio' + + diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb b/easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb new file mode 100644 index 0000000000..559fab20ae --- /dev/null +++ b/easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb @@ -0,0 +1,23 @@ + +name = 'CAP3' +version = 'opteron-12-21-2007' + +easyblock = 'PackedBinary' + +homepage = 'http://seq.cs.iastate.edu/' +description = """CAP3 assembly program """ + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [('http://seq.cs.iastate.edu/CAP3/')] +sources = ['cap3.linux.opteron64.tar'] + +sanity_check_paths = { + 'files': ['cap3','formcon'], + 'dirs': [], +} + + +moduleclass = 'bio' + + -- GitLab From 07104ce9598fd3007c1f21d5a8b2640ac37b342b Mon Sep 17 00:00:00 2001 From: pescobar Date: Tue, 19 Nov 2013 16:33:55 +0100 Subject: [PATCH 323/811] added R-3.0.2-goolf-1.4.10-bare --- .../r/R/R-3.0.2-goolf-1.4.10-bare.eb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb new file mode 100644 index 0000000000..d0aa0dd324 --- /dev/null +++ b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb @@ -0,0 +1,37 @@ +name = 'R' +version = '3.0.2' +versionsuffix = '-bare' # bare, as in no extensions included + +homepage = 'http://www.r-project.org/' +description = """R is a free software environment for statistical computing and graphics.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s'] + +preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"' +configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib" +# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below +configopts += " --with-recommended-packages=no" + +dependencies = [ + ('libreadline', '6.2'), + ('ncurses', '5.9'), + ('libpng', '1.6.2'), # for plotting in R + ('Java', '1.7.0_21', '', True), # Java bindings are built if Java is found, might as well provide it +] + +exts_list = [] # just to make it explicit this module doesn't include any extensions + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['R', 'Rscript']] + + ['lib64/R/include/%s' % x for x in ['Rconfig.h', 'Rdefines.h', 'Rembedded.h', + 'R.h', 'Rinterface.h', 'Rinternals.h', + 'Rmath.h', 'Rversion.h', 'S.h']] + + ['lib64/R/modules/%s' % x for x in ['internet.so', 'lapack.so', 'vfonts.so']] + + ['lib64/R/lib/libR.so'], + 'dirs': [] +} + +moduleclass = 'lang' -- GitLab From 713a352f100870850f2673c9e7c4281d24dffffb Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 02:40:22 +0100 Subject: [PATCH 324/811] template with SOURCE_TGZ Signed-off-by: Fotis Georgatos --- .../easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb | 2 +- .../easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb | 2 +- .../b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb | 2 +- .../b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb | 2 +- .../easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb | 2 +- .../easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb | 2 +- .../n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb | 2 +- .../n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb | 2 +- .../o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb | 2 +- .../easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb | 2 +- .../p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb | 2 +- .../easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb | 2 +- .../easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb | 2 +- .../easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb index 40eaf1a383..5d4df914d3 100644 --- a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb @@ -23,7 +23,7 @@ description = """The BAM format is an efficient method for storing and sharing d toolchain = {'name': 'goolf', 'version': '1.4.10'} # eg. http://www.hudsonalpha.org/gsl/static/software/bam2fastq-1.1.0.tgz -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] source_urls = ['http://www.hudsonalpha.org/gsl/static/software/'] files_to_copy = [(["bam2fastq"], 'bin')] diff --git a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb index c22f2d6caf..4243fd37f2 100644 --- a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb @@ -23,7 +23,7 @@ description = """The BAM format is an efficient method for storing and sharing d toolchain = {'name': 'ictce', 'version': '5.3.0'} # eg. http://www.hudsonalpha.org/gsl/static/software/bam2fastq-1.1.0.tgz -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] source_urls = ['http://www.hudsonalpha.org/gsl/static/software/'] files_to_copy = [(["bam2fastq"], 'bin')] diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb index 0f69cf489c..a957f3428f 100644 --- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} # there is no tarball provided, only SVN checkout through: # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] dependencies = [('Java', '1.7.0_15', '', True)] diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb index 83a222c545..073b6bae5c 100644 --- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb @@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} # there is no tarball provided, only SVN checkout through: # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] dependencies = [('Java', '1.7.0_15', '', True)] diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb index 6b96386814..de5d0fcdf9 100644 --- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} # there is no tarball provided, only SVN checkout through: # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] dependencies = [('Java', '1.7.0_15', '', True)] diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb index 20b367819c..e1bcb81951 100644 --- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} # there is no tarball provided, only SVN checkout through: # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] dependencies = [('Java', '1.7.0_15', '', True)] diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb index dea6e016af..7ab203990e 100644 --- a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The lxml XML toolkit is a Pythonic binding for the C libraries toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://lxml.de/files/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] python = 'Python' pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb index ada05f00c3..7c17d46955 100644 --- a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The lxml XML toolkit is a Pythonic binding for the C libraries toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://lxml.de/files/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] python = 'Python' pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb index 9d8732ce41..3522f8a87b 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb @@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True} # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # Parallel build contains a race on etip.h, needed for c++/demo.cc. parallel = 1 diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb index 64f64c54eb..f954a9b12a 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb @@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True} # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # Parallel build contains a race on etip.h, needed for c++/demo.cc. parallel = 1 diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb index 97bd2dfeb6..6a10d2ec63 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb @@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True} # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # Parallel build contains a race on etip.h, needed for c++/demo.cc. parallel = 1 diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb index 00d09276a8..4913ef008f 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb index 7d12bb5e12..8b7d3a2416 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb @@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True} # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # Parallel build contains a race on etip.h, needed for c++/demo.cc. parallel = 1 diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb index 064d35ca84..1632ef23de 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb @@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True} # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # Parallel build contains a race on etip.h, needed for c++/demo.cc. parallel = 1 diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb index 8bd4bda916..43375f2a29 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb @@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True} # In future, this URL will not be sufficient to obtain this tarball, because # the directory contains only a couple of older ncurses 5.9 snapshots. source_urls = ['ftp://invisible-island.net/ncurses/current/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # Parallel build contains a race on etip.h, needed for c++/demo.cc. parallel = 1 diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb index f4cd636622..47f96c354b 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb @@ -11,7 +11,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb index 17e9162920..fc95905bea 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb @@ -11,7 +11,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb index 0e8e0b1c76..9a382ba0a0 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb @@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb index c16690c3c6..846b27e9ad 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb @@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb index b192fe9ac2..4f2803ebd1 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb @@ -11,7 +11,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb index 6268f6a338..93b4f37bde 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb @@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb index 73282af7a1..3f2e8fb697 100644 --- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb +++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb @@ -11,7 +11,7 @@ toolchain = {'name': 'iqacml', 'version': '4.4.13'} source_urls = ['http://downloads.sourceforge.net/foam/%(version)s'] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'ThirdParty-%(version)s.tgz', ] diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb index 8831f1a81b..bb57de5afb 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb index f626304d89..8ee11e4811 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb index 7cd7a6cc68..97c0820aec 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb index 5defdd9ca7..536c688b86 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '5.2.0'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb index 350cff539f..45f1f26710 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb index 78733636f2..78d4528c83 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb index 965f7680f9..76f06b40da 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb index d6df6cdaaa..7aac7b2dfc 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index f097672302..601fa79282 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb index d6387e790c..cab3752cb6 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb index 36c7fd70fe..3e7e8f9aa4 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb index cb3e4c646f..6cefbb84da 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index 2904d6f980..bc83d85dbe 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb index 44396979b5..e1104a66dd 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb index e69840bf6a..05893e2a35 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb index 0fcb35553c..289c124daa 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb index 0ef59f1a6c..bf8beca6cb 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb index 6d4756c14e..a79b557e86 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb @@ -12,7 +12,7 @@ scipyversion = '0.11.0' pytablesversion = '2.4.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb index 591a7c22f0..709e1ad8ad 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb index 61eaa9350c..8aa152a8fd 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.0' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-%(version)s_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index 890f3ac899..dc1af16dd5 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.0' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-%(version)s_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index ba61bc3e08..837e9740b5 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.0' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-%(version)s_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index 9cd24fe3ae..7700c24281 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.0' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-%(version)s_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 4896534784..e12d4e2536 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.1' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-%(version)s_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index fbb0800072..2b51a97a46 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.0' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-%(version)s_libffi_int128_icc.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index 087bed47a1..540e0abee8 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index f52c47b304..304dcc8026 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 938b80ce48..0ca1a89dd3 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -11,7 +11,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 7971193188..17470443c6 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -12,7 +12,7 @@ numpyversion = '1.6.1' scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb index 98e5e870b9..7d7645d75c 100644 --- a/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb @@ -11,7 +11,7 @@ source_urls = [ 'http://www.cs.kuleuven.be/~theo/tools/', # SimpleCUDD ] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'SimpleCUDD.tar.gz', # no version number?! ] diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb index 3ad722d21e..ee27ea143c 100644 --- a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb @@ -11,7 +11,7 @@ source_urls = [ 'http://www.cs.kuleuven.be/~theo/tools/', # SimpleCUDD ] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'SimpleCUDD.tar.gz', # no version number?! ] diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb index 9761353794..bb29badc8b 100644 --- a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb @@ -11,7 +11,7 @@ source_urls = [ 'http://www.cs.kuleuven.be/~theo/tools/', # SimpleCUDD ] sources = [ - '%(name)s-%(version)s.tgz', + SOURCE_TGZ, 'SimpleCUDD.tar.gz', # no version number?! ] -- GitLab From d199ac1a326376b697d02c76a63caf2953e56db6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 02:45:37 +0100 Subject: [PATCH 325/811] template with SOURCELOWER_TGZ Signed-off-by: Fotis Georgatos --- .../LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb | 2 +- .../l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb | 2 +- .../easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb | 2 +- easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb | 2 +- easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb | 2 +- .../easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb | 2 +- easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb | 2 +- .../m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb | 2 +- .../easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb | 2 +- ...APACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb | 2 +- ...LAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb | 2 +- ...ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- ...CK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- ...LAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- .../ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- ...ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- ...LAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- ...ACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- ...aLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb | 2 +- .../ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- .../ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 2 +- .../ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb | 2 +- ...PACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb | 2 +- .../ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb | 2 +- .../ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb index 8b15048447..c9319bda9f 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] versionsuffix = '-%s-%s' % ('ATLAS', '3.8.4') diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb index 654ef2b7f9..7722ab0a36 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] blaslib = 'ATLAS' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb index 908402fe2b..7a9d14764d 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb index c68bfa3e9c..b8517be37b 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gmpich2', 'version': '1.4.8'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb index b0cffff94e..6bdb18e61f 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.3.12'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb index 4350fbda75..9be946f5e8 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.4.10'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb index da972092a4..c930b5d2ba 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb index 7292fa7362..5a6e906741 100644 --- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb +++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb @@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin toolchain = {'name': 'gompi', 'version': '1.5.12'} toolchainopts = {'pic': True} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb index 8d81812dc2..cee59253ac 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb @@ -8,7 +8,7 @@ It is based on MPICH2 and MVICH.""" toolchain = {'name': 'GCC', 'version': '4.6.3'} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] # note: this URL will only work for the most recent version (previous versions no longer available?) source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2'] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb index 19e6c4de4e..53cdff914e 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb @@ -7,7 +7,7 @@ It is based on MPICH2 and MVICH.""" toolchain = {'name': 'GCC', 'version': '4.6.3'} -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] # note: this URL will only work for the most recent version (previous versions no longer available?) source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2'] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb index 2b6e8dfed4..9be4dedbf3 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb @@ -7,7 +7,7 @@ description = "This is an MPI-2 implementation (conforming to MPI 2.1 standard) toolchain = {'name': 'GCC', 'version': '4.7.2'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb index 9ff3ca9a33..602d1c4c80 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb @@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation. It is based on MPICH2 and MVI toolchain = {'name': 'GCC', 'version': '4.7.3'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb index 5b4bd89d04..86fdc73adc 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb @@ -7,7 +7,7 @@ description = "This is an MPI-2 implementation (conforming to MPI 2.1 standard) toolchain = {'name': 'GCC', 'version': '4.7.2'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb index 05e1fd9ee5..1c45f04807 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb @@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation. It is based on MPICH2 and MVI toolchain = {'name': 'GCC', 'version': '4.7.2'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb index 1eb4d70733..892dac4687 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb @@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation. It is based on MPICH2 and MVI toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb index 27a74baecd..9e7d8d7641 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb @@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation. It is based on MPICH2 and MVI toolchain = {'name': 'GCC', 'version': '4.7.3'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb index d71631e46b..adc0860457 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'iiqmpi', 'version': '3.3.0'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] # BLAS and LAPACK acmln = 'ACML' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb index 168e48a0db..269cb64669 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'ATLAS' blasver = '3.8.4' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index b943203372..904f9125ac 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'cgmpich', 'version': '1.1.6'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index 5bea6d5a9b..df6546768d 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'cgmvapich2', 'version': '1.1.12rc1'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index eee66ed24d..799e3b5272 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'cgmvapich2', 'version': '1.2.7'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index cfe77a497f..d0e2892049 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'cgompi', 'version': '1.1.7'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index 5b744a280f..967d7b0bda 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gmpich2', 'version': '1.4.8'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index 5ff70cf998..9f4ac4da77 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gmvapich2', 'version': '1.7.12'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index 060eb83f03..4e2c7a1161 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gmvapich2', 'version': '1.7.12rc1'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb index f68c5fe5d4..b8ff206dfb 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gmvapich2', 'version': '1.7.9a2'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blas_lapack_lib = 'ACML' blas_lapack_ver = '5.2.0' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index ee98eec7c9..04f36f4b91 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.3.12'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb index c1e8c6b2e6..8f7ad295d1 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.4.10'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.6' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb index 8027e58830..7e8bf14eee 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.5.12'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'ATLAS' blasver = '3.10.1' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb index 5fd2b5ab55..68e8936860 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'ATLAS' blasver = '3.10.1' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb index 5baf987e04..b037ae507c 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.6.10'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blaslib = 'OpenBLAS' blasver = '0.2.8' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb index 9f74510c4f..325514fe67 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'iiqmpi', 'version': '4.4.13'} toolchainopts = {'pic': True} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] blas_lapack_lib = 'ACML' blas_lapack_ver = '5.3.1' -- GitLab From c770ae372cd3133712152b17dc145cb8c0540226 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 02:53:44 +0100 Subject: [PATCH 326/811] template even more with SOURCELOWER_TGZ Signed-off-by: Fotis Georgatos --- .../b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb | 2 +- .../easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb | 2 +- .../easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb | 2 +- ....0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb index abce8e1ac7..15eee3a6b7 100644 --- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb @@ -13,7 +13,7 @@ version = '1.03e' homepage = 'http://www.coker.com.au/bonnie++/' description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O""" -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://www.coker.com.au/bonnie++/'] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb index cc7ea34456..00dc69f950 100644 --- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb @@ -13,7 +13,7 @@ version = '1.03e' homepage = 'http://www.coker.com.au/bonnie++/' description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O""" -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://www.coker.com.au/bonnie++/'] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb index 34d9dfcf6e..b0b5384914 100644 --- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb @@ -13,7 +13,7 @@ version = '1.03e' homepage = 'http://www.coker.com.au/bonnie++/' description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O""" -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://www.coker.com.au/bonnie++/'] toolchain = {'version': '4.0.6', 'name': 'ictce'} diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb index bc3566fe23..23c215e249 100644 --- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb @@ -13,7 +13,7 @@ version = '1.03e' homepage = 'http://www.coker.com.au/bonnie++/' description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O""" -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://www.coker.com.au/bonnie++/'] diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb index 1c90c20dab..3e399ef780 100644 --- a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb @@ -7,7 +7,7 @@ description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['ftp://invisible-island.net/byacc'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb index 1b21e9763c..8b8782fe4b 100644 --- a/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb @@ -7,7 +7,7 @@ In contrast to bison, it is written to avoid dependencies upon a particular comp toolchain = {'name': 'goolf', 'version': '1.4.10'} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['ftp://invisible-island.net/byacc'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb index 1c347cdee7..9b30eede50 100644 --- a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb @@ -7,7 +7,7 @@ description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc toolchain = {'name': 'ictce', 'version' : '4.0.6'} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['ftp://invisible-island.net/byacc'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb index 523a138e8a..3f0c68f0c2 100644 --- a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb @@ -8,7 +8,7 @@ description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc toolchain = {'name': 'ictce', 'version': '5.3.0'} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['ftp://invisible-island.net/byacc'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb index ee57773249..8a5facff39 100644 --- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/'] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb index f7b209a5b8..f9f4f41e38 100644 --- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb @@ -9,7 +9,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/'] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb index 322bdf428f..3585a1adbe 100644 --- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb @@ -9,7 +9,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'pic': True} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/'] # CLHEP compiles with icc instead of icpc diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb index 7510428bdd..b61ee5dfbe 100644 --- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb @@ -10,7 +10,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'pic': True} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/'] # CLHEP compiles with icc instead of icpc diff --git a/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb b/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb index ccb736b20c..382a1b327e 100644 --- a/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb +++ b/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb @@ -8,7 +8,7 @@ description = """The e-Core technology simulates the natural processes of sedime toolchain = {'name': 'dummy', 'version': 'dummy'} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] patches = ['ecore-license-var.patch'] diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb index 611b783f5d..210286f19d 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb @@ -8,7 +8,7 @@ description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = ['%s-%s.tgz' % (name.lower(), version)] +sources = [SOURCELOWER_TGZ] source_urls = [homepage] blaslib = 'ATLAS' -- GitLab From e85d92e135d31e00666c54e02a97eb6aab24dbe2 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 02:56:03 +0100 Subject: [PATCH 327/811] template with SOURCELOWER_ZIP Signed-off-by: Fotis Georgatos --- .../Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 1dd4e23222..d3d564e940 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -13,7 +13,7 @@ description = """The greenlet package is a spin-off of Stackless, a version of C toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] python = "Python" pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb index 73c65c5dea..4de1c939b5 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb @@ -13,7 +13,7 @@ scheduling; coroutines, in other words. This is useful when you want to control toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] python = "Python" pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb index bb349c82a4..5384581b45 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb @@ -13,7 +13,7 @@ description = """The greenlet package is a spin-off of Stackless, a version of C toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] python = "Python" pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb index d3dfb0cdef..1091c7035e 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb @@ -14,7 +14,7 @@ description = """The greenlet package is a spin-off of Stackless, a version of C toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] python = "Python" pythonversion = '2.7.3' diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb index d84cd89ae9..8936c49f7b 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb index e34b6a8e71..2c331ec80f 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb @@ -6,7 +6,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb index f049a7290f..2a9c066f57 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb @@ -7,7 +7,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb index 8d5cc91b46..1c14c19383 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True} -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb index 148776315e..2bbc6e083e 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'pic': True} -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] sanity_check_paths = { diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb index db861191fd..778a35918b 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb @@ -7,7 +7,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'iqacml', 'version': '3.7.3'} -sources = ['%s-%s.zip' % (name.lower(), version)] +sources = [SOURCELOWER_ZIP] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] sanity_check_paths = { -- GitLab From bcd5ddeb8625e45eb67ac7765b8197e082df81b1 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 03:02:00 +0100 Subject: [PATCH 328/811] template with SOURCE_TAR Signed-off-by: Fotis Georgatos --- .../easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb | 2 +- .../easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb index dbced3e64b..aa40c8e163 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb index 40a9844a04..ad06ddb722 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb index 6626ea0412..52560e746f 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb @@ -9,7 +9,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb index 1e29860282..c4f3a2a7e0 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb index 36b9488a21..ef8adc2283 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb @@ -9,7 +9,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb index cd9cd1eda9..f194362219 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] patches = ['fix_makefile.patch'] diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb index d471cd44b2..1c99de3550 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] patches = ['fix_makefile.patch'] diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb index 7012aa01db..6a4c924d81 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb @@ -9,7 +9,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] patches = ['fix_makefile.patch'] diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb index c7e5c2c63f..9c96a28d96 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] patches = ['fix_makefile.patch'] diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb index 7e04bd54d3..6ebe064edf 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb @@ -9,7 +9,7 @@ toolchainopts = {'opt': True} dependencies = [('JasPer', '1.900.1')] -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] patches = ['fix_makefile.patch'] -- GitLab From bac7ee84af4698c9f4342455c9cf79780c758fc5 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 03:11:52 +0100 Subject: [PATCH 329/811] template with SOURCELOWER_TAR_GZ Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb index 9b84ed765c..4fa7753215 100644 --- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb @@ -7,7 +7,7 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions toolchain = {'name': 'ictce', 'version': '5.3.0'} -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] dependencies = [ diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb index 1156a3d1e9..f7f33b20cd 100644 --- a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb @@ -7,7 +7,7 @@ description = """h5utils is a set of utilities for visualization and conversion convert HDF5 datasets into the formats required by other free visualization software (e.g. plain text, Vis5d, and VTK).""" source_urls = ['http://ab-initio.mit.edu/h5utils/'] -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] patches = ['libpng1.5_fix.patch'] diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb index 32972e3ae5..74ca15b43e 100644 --- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} source_urls = ['http://ab-initio.mit.edu/libctl/'] -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] dependencies = [('guile', '1.8.8')] diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb index c3709d8e78..271da139b9 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb @@ -6,7 +6,7 @@ description = """GNU libmatheval is a library (callable from C and Fortran) to p and evaluate symbolic expressions input as text.""" source_urls = ['http://ftp.gnu.org/gnu/libmatheval/'] -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb index 90651eb628..a5d16e83a0 100644 --- a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb @@ -12,7 +12,7 @@ toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': source_urls = ['http://ab-initio.mit.edu/meep/', 'http://ab-initio.mit.edu/meep/old/'] -sources = ['%s-%s.tar.gz' % (name.lower(), version)] +sources = [SOURCELOWER_TAR_GZ] patches = ['Meep-%s_version-string-without-spaces.patch' % version] -- GitLab From 5c41a2cfb7e5d4ad56107e536e19aa2552c6da9a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 03:16:12 +0100 Subject: [PATCH 330/811] template with SOURCE_TGZ Signed-off-by: Fotis Georgatos --- .../m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb | 2 +- .../easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb | 2 +- .../easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb index 83a3f3611c..3ab6fccc96 100644 --- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb @@ -19,7 +19,7 @@ description = """A short read assember for metagenomics""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s-%s.tgz' % (name, version)] +sources = [SOURCE_TGZ] source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src'] # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package. diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb index 59ff6b35c3..c9bcb07364 100644 --- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb @@ -18,7 +18,7 @@ description = """A short read assember for metagenomics""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s-%s.tgz' % (name, version)] +sources = [SOURCE_TGZ] source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src'] # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package. diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb index d264b2ce44..c7d1a1094e 100644 --- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb @@ -19,7 +19,7 @@ description = """A short read assember for metagenomics""" toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s-%s.tgz' % (name, version)] +sources = [SOURCE_TGZ] source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src'] # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package. diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb index 2a88c56f9e..a9129b8002 100644 --- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb @@ -20,7 +20,7 @@ description = """A short read assember for metagenomics""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s-%s.tgz' % (name, version)] +sources = [SOURCE_TGZ] source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src'] # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package. -- GitLab From 9877e3f6bf689c06ad21b7efe80cdce39cd5bfc2 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 03:18:55 +0100 Subject: [PATCH 331/811] template with SOURCE_TAR_XZ Signed-off-by: Fotis Georgatos --- .../easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb | 2 +- .../easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb index acd5a35b61..6264b44320 100644 --- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ['http://cairographics.org/releases/'] -sources = ['%(name)s-%(version)s.tar.xz'] +sources = [SOURCE_TAR_XZ] dependencies = [ ('libpng', '1.5.14'), diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb index 6b7a9cdd10..fe30ba2cfb 100644 --- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb @@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://cairographics.org/releases/'] -sources = ['%(name)s-%(version)s.tar.xz'] +sources = [SOURCE_TAR_XZ] dependencies = [ ('libpng', '1.5.14'), diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb index c483aa6c2f..768941a832 100644 --- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb @@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} source_urls = ['http://cairographics.org/releases/'] -sources = ['%(name)s-%(version)s.tar.xz'] +sources = [SOURCE_TAR_XZ] dependencies = [ ('libpng', '1.5.14'), diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb index 89a55a0ac7..c623937595 100644 --- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb @@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://cairographics.org/releases/'] -sources = ['%(name)s-%(version)s.tar.xz'] +sources = [SOURCE_TAR_XZ] dependencies = [ ('libpng', '1.5.14'), diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb index 3a776649d4..05a624232e 100644 --- a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb @@ -7,7 +7,7 @@ description = "gnutls-3.0.22: GNU Transport Layer Security library" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ['ftp://ftp.gnutls.org/pub/gnutls/'] -sources = ['%s-%s.tar.xz' % (name, version)] +sources = [SOURCE_TAR_XZ] dependencies = [ ('GMP', '5.0.5'), diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb index 1ae868fbce..ccb40b1358 100644 --- a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb @@ -6,7 +6,7 @@ description = "gnutls-3.0.22: GNU Transport Layer Security library" toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['ftp://ftp.gnutls.org/pub/gnutls/'] -sources = ['%s-%s.tar.xz' % (name, version)] +sources = [SOURCE_TAR_XZ] dependencies = [ ('GMP', '5.0.5'), -- GitLab From aadb27c7370041537cd4f3efab72eb1df3f4f69f Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 20 Nov 2013 03:29:20 +0100 Subject: [PATCH 332/811] template with SOURCELOWER_TAR Signed-off-by: Fotis Georgatos --- .../python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 4a10173f4d..2643e2c09c 100644 --- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True} source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"] -sources = ['%s-%s.tar' % (name.lower(), version)] +sources = [SOURCELOWER_TAR] patches = [ 'MPI_destructor_1.3.patch' diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb index e3438c674f..67aaeea480 100644 --- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True} source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"] -sources = ['%s-%s.tar' % (name.lower(), version)] +sources = [SOURCELOWER_TAR] patches = [ 'MPI_destructor_1.3.patch' diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb index d4a1091638..dccd4207fd 100644 --- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True} source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"] -sources = ['%s-%s.tar' % (name.lower(), version)] +sources = [SOURCELOWER_TAR] patches = [ 'MPI_destructor_1.3.patch' -- GitLab From f494bd3ef3fbd37a7d8ba7b5389768ad9c83b51a Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 12:21:42 +0100 Subject: [PATCH 333/811] added HTSeq and new matplotlib goolf versions --- .../h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb | 26 ++++++++++++++ ...plotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb | 34 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb new file mode 100644 index 0000000000..d36513cc06 --- /dev/null +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb @@ -0,0 +1,26 @@ +easyblock = 'PythonPackage' +name = 'HTSeq' +version = '0.5.4p5' + +homepage = 'http://www-huber.embl.de/users/anders/HTSeq/doc/overview.html' +description = """HTSeq is a Python package that provides infrastructure to process data from high-throughput sequencing +assays.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + ('matplotlib', '1.2.1', versionsuffix), + (python, pythonver), +] + + +options = {'modulename': name} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb new file mode 100644 index 0000000000..b35452ca6d --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb @@ -0,0 +1,34 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.2.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.8'), + ('freetype', '2.4.11'), + ('libpng', '1.6.6'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], +} + +moduleclass = 'vis' -- GitLab From 07325159c3f79c816f61c9277df4a5860e8de16f Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 13:49:14 +0100 Subject: [PATCH 334/811] bumped matplotib version --- easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb index d36513cc06..a4920b1638 100644 --- a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb @@ -16,7 +16,7 @@ pythonver = '2.7.5' versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [ - ('matplotlib', '1.2.1', versionsuffix), + ('matplotlib', '1.3.1', versionsuffix), (python, pythonver), ] -- GitLab From 1a24e7db3c80c083430978ec0e0f51c3ace29b7f Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 13:52:31 +0100 Subject: [PATCH 335/811] added new matplotlib for goolf and ictce + ictce for HTSeq --- .../h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb | 26 ++++++++++++++ .../1.3.1-goolf-1.4.10-Python-2.7.5.eb | 36 +++++++++++++++++++ ...plotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb | 36 +++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb new file mode 100644 index 0000000000..880a628b44 --- /dev/null +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb @@ -0,0 +1,26 @@ +easyblock = 'PythonPackage' +name = 'HTSeq' +version = '0.5.4p5' + +homepage = 'http://www-huber.embl.de/users/anders/HTSeq/doc/overview.html' +description = """HTSeq is a Python package that provides infrastructure to process data from high-throughput sequencing +assays.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + ('matplotlib', '1.3.1', versionsuffix), + (python, pythonver), +] + + +options = {'modulename': name} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb new file mode 100644 index 0000000000..e21841f64e --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb @@ -0,0 +1,36 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pyshortver = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.8'), + ('freetype', '2.5.0.1'), + ('libpng', '1.6.6'), +] + +pyprefix = 'lib/python%s/site-packages' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver +sanity_check_paths = { + 'files': [], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb new file mode 100644 index 0000000000..1a8bdada73 --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb @@ -0,0 +1,36 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pyshortver = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.8'), + ('freetype', '2.5.0.1'), + ('libpng', '1.6.6'), +] + +pyprefix = 'lib/python%s/site-packages' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver +sanity_check_paths = { + 'files': [], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], +} + +moduleclass = 'vis' -- GitLab From 14755acf3942fdd149622718759f05e2d8084275 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 13:56:19 +0100 Subject: [PATCH 336/811] added freetype for 4.1.13 + bumped zlib version in libpng for consistency --- .../freetype/freetype-2.5.0.1-ictce-4.1.13.eb | 21 +++++++++++++++++++ .../l/libpng/libpng-1.6.6-goolf-1.4.10.eb | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..de48d98038 --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'freetype' +version = '2.5.0.1' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [('libpng', '1.6.6')] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb index 3e4fd3d652..c31ece3983 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb @@ -10,7 +10,7 @@ toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.7')] +dependencies = [('zlib', '1.2.8')] configopts = "--with-pic" -- GitLab From d2cef945960fab913bf9e5166911e25b0dc14b62 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 14:06:02 +0100 Subject: [PATCH 337/811] added new freetype for goolf --- .../freetype/freetype-2.5.0.1-goolf-1.4.10.eb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..c8025842ef --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb @@ -0,0 +1,21 @@ +name = 'freetype' +version = '2.5.0.1' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [('libpng', '1.6.6')] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' -- GitLab From c83cc8a655c8178ac5ec8ebb31ea38ea1221af89 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 14:13:36 +0100 Subject: [PATCH 338/811] bumped libpng's zlib on 2 more occasions --- easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb index 3abbc07090..c7377b1613 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb @@ -10,7 +10,7 @@ toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.7')] +dependencies = [('zlib', '1.2.8')] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb index 150ca35db4..076608ccb2 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchainopts = {'optarch': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.7')] +dependencies = [('zlib', '1.2.8')] configopts = "--with-pic" -- GitLab From 936f1022e6e15ec915bf25c990642ccc4d1008ae Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 14:46:26 +0100 Subject: [PATCH 339/811] undid changes of libpng's zlib bump --- easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb index c31ece3983..3e4fd3d652 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-goolf-1.4.10.eb @@ -10,7 +10,7 @@ toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.8')] +dependencies = [('zlib', '1.2.7')] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb index c7377b1613..3abbc07090 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb @@ -10,7 +10,7 @@ toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.8')] +dependencies = [('zlib', '1.2.7')] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb index 076608ccb2..150ca35db4 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchainopts = {'optarch': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.8')] +dependencies = [('zlib', '1.2.7')] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb index cc63b4067d..7324290431 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb @@ -10,7 +10,7 @@ toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.8')] +dependencies = [('zlib', '1.2.7')] configopts = "--with-pic" -- GitLab From 380982d54abfb7ba069e9b618f62d4842e0a3e36 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 14:53:26 +0100 Subject: [PATCH 340/811] added new python + matplotlibs for this python --- ...plotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb | 34 +++++++++++ ...plotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb | 36 +++++++++++ .../p/Python/Python-2.7.6-goolf-1.4.10.eb | 61 +++++++++++++++++++ .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 61 +++++++++++++++++++ 4 files changed, 192 insertions(+) create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb new file mode 100644 index 0000000000..2e3028812f --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb @@ -0,0 +1,34 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.6' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.7'), + ('freetype', '2.4.11'), + ('libpng', '1.6.6'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb new file mode 100644 index 0000000000..2e66e93a73 --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb @@ -0,0 +1,36 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pyshortver = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.7'), + ('freetype', '2.5.0.1'), + ('libpng', '1.6.6'), +] + +pyprefix = 'lib/python%s/site-packages' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver +sanity_check_paths = { + 'files': [], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb new file mode 100644 index 0000000000..41832c9598 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb @@ -0,0 +1,61 @@ +name = 'Python' +version = '2.7.6' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.0' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python-%(version)s_libffi_int128_icc.patch'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '0.6c11', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb new file mode 100644 index 0000000000..5cd8489340 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -0,0 +1,61 @@ +name = 'Python' +version = '2.7.5' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.0' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python-%(version)s_libffi_int128_icc.patch'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.4', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), +] + +moduleclass = 'lang' -- GitLab From 4d19f41eef603ab6fa105b357b8b80f24201120b Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 14:54:26 +0100 Subject: [PATCH 341/811] fixed wrong patch --- easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb | 2 -- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb index 41832c9598..d5f0fba73e 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb @@ -13,8 +13,6 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] - # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 5cd8489340..06f0c86066 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -13,7 +13,7 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] +# patches = ['python-%(version)s_libffi_int128_icc.patch'] # python needs bzip2 to build the bz2 package dependencies = [ -- GitLab From f13c5c009e91521357c8b473d23fee7eb9b6e3f8 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:01:06 +0100 Subject: [PATCH 342/811] forgot to change python version --- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 06f0c86066..0b34fdc73a 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -1,5 +1,5 @@ name = 'Python' -version = '2.7.5' +version = '2.7.6' homepage = 'http://python.org/' description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." -- GitLab From d6a037a2c358252c6132aea49cd07b01175def21 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:04:35 +0100 Subject: [PATCH 343/811] removed wrong matpotlib easyconfigs --- .../1.3.1-goolf-1.4.10-Python-2.7.5.eb | 36 ------------------- ...plotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb | 36 ------------------- 2 files changed, 72 deletions(-) delete mode 100644 easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb delete mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb deleted file mode 100644 index e21841f64e..0000000000 --- a/easybuild/easyconfigs/m/matplotlib/1.3.1-goolf-1.4.10-Python-2.7.5.eb +++ /dev/null @@ -1,36 +0,0 @@ -easyblock = "PythonPackage" - -name = 'matplotlib' -version = '1.3.1' - -homepage = 'http://matplotlib.org' -description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of - hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python - and ipython shell, web application servers, and six graphical user interface toolkits.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -source_urls = [SOURCEFORGE_SOURCE] -sources = [SOURCELOWER_TAR_GZ] - -python = "Python" -pythonversion = '2.7.5' -pyshortver = ".".join(pythonversion.split(".")[:-1]) - -versionsuffix = "-%s-%s" % (python, pythonversion) - -dependencies = [ - (python, pythonversion), - ('zlib', '1.2.8'), - ('freetype', '2.5.0.1'), - ('libpng', '1.6.6'), -] - -pyprefix = 'lib/python%s/site-packages' % pyshortver -eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver -sanity_check_paths = { - 'files': [], - 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], -} - -moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb deleted file mode 100644 index 1a8bdada73..0000000000 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.5.eb +++ /dev/null @@ -1,36 +0,0 @@ -easyblock = "PythonPackage" - -name = 'matplotlib' -version = '1.3.1' - -homepage = 'http://matplotlib.org' -description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of - hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python - and ipython shell, web application servers, and six graphical user interface toolkits.""" - -toolchain = {'name': 'ictce', 'version': '4.1.13'} - -source_urls = [SOURCEFORGE_SOURCE] -sources = [SOURCELOWER_TAR_GZ] - -python = "Python" -pythonversion = '2.7.5' -pyshortver = ".".join(pythonversion.split(".")[:-1]) - -versionsuffix = "-%s-%s" % (python, pythonversion) - -dependencies = [ - (python, pythonversion), - ('zlib', '1.2.8'), - ('freetype', '2.5.0.1'), - ('libpng', '1.6.6'), -] - -pyprefix = 'lib/python%s/site-packages' % pyshortver -eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver -sanity_check_paths = { - 'files': [], - 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], -} - -moduleclass = 'vis' -- GitLab From 0ca0eb9ce41039e4ff4fa19afdbad146724a34a5 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:18:01 +0100 Subject: [PATCH 344/811] added zlib 1.2.7 build for ictce 5.5.0 --- .../z/zlib/zlib-1.2.7-ictce-5.5.0.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb new file mode 100644 index 0000000000..c39a877574 --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb @@ -0,0 +1,20 @@ +name = 'zlib' +version = '1.2.7' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, + not covered by any patents -- lossless data-compression library for use on virtually any + computer hardware and operating system.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 5de86918be056eb8555793ea608f979b5b9babbd Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:24:48 +0100 Subject: [PATCH 345/811] removed failing sanity check, if import matplotlib works, we're happy --- .../matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb | 4 ---- .../matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb index 2e3028812f..e4c90c4c44 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb @@ -26,9 +26,5 @@ dependencies = [ ('libpng', '1.6.6'), ] -sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], -} moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb index 2e66e93a73..9bd2215f1c 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb @@ -26,6 +26,7 @@ dependencies = [ ('libpng', '1.6.6'), ] +# is this actually needed? the PythonPackage will check if import matplotlib succeeds, which is as good as this? pyprefix = 'lib/python%s/site-packages' % pyshortver eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver sanity_check_paths = { -- GitLab From 13f17b209b55c3e1ff2777c6f602e04165c646d7 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:26:38 +0100 Subject: [PATCH 346/811] bumped python version for htseq --- easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb index a4920b1638..a28674575c 100644 --- a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb @@ -12,7 +12,7 @@ source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/'] sources = [SOURCE_TAR_GZ] python = 'Python' -pythonver = '2.7.5' +pythonver = '2.7.6' versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [ diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb index 880a628b44..aa8a6d2d2b 100644 --- a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb @@ -12,7 +12,7 @@ source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/'] sources = [SOURCE_TAR_GZ] python = 'Python' -pythonver = '2.7.5' +pythonver = '2.7.6' versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [ -- GitLab From 30440f5e924e2096434e6d354294a939a7c62277 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:28:55 +0100 Subject: [PATCH 347/811] forgot to bump version of python in matplotlib: --- .../m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb index 9bd2215f1c..d97e421867 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb @@ -14,7 +14,7 @@ source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = "Python" -pythonversion = '2.7.5' +pythonversion = '2.7.6' pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -- GitLab From 2012748eee7cfbdc4b997aaf1fda4a25791ba4dc Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 15:57:55 +0100 Subject: [PATCH 348/811] changed one version to much, reverting --- easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb index 7324290431..cc63b4067d 100644 --- a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-5.5.0.eb @@ -10,7 +10,7 @@ toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCELOWER_TAR_GZ] -dependencies = [('zlib', '1.2.7')] +dependencies = [('zlib', '1.2.8')] configopts = "--with-pic" -- GitLab From 359dde374a123ef3198e186230ae0d03cc1d563e Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 16:01:18 +0100 Subject: [PATCH 349/811] removed zlib 1.2.7 for ictce 5.5.0, we will use 1.2.8 for the 5.5.0 toolchain --- .../z/zlib/zlib-1.2.7-ictce-5.5.0.eb | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb deleted file mode 100644 index c39a877574..0000000000 --- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb +++ /dev/null @@ -1,20 +0,0 @@ -name = 'zlib' -version = '1.2.7' - -homepage = 'http://www.zlib.net/' -description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, - not covered by any patents -- lossless data-compression library for use on virtually any - computer hardware and operating system.""" - -toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'optarch': True, 'pic': True} - -sources = [SOURCELOWER_TAR_GZ] -source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] - -sanity_check_paths = { - 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'], - 'dirs': [], -} - -moduleclass = 'lib' -- GitLab From 68e47b13c35aad0492e4f41f161bf44acc404e75 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 20 Nov 2013 16:14:27 +0100 Subject: [PATCH 350/811] removed unneeded ec --- ...plotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb deleted file mode 100644 index b35452ca6d..0000000000 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-goolf-1.4.10-Python-2.7.5.eb +++ /dev/null @@ -1,34 +0,0 @@ -easyblock = "PythonPackage" - -name = 'matplotlib' -version = '1.2.1' - -homepage = 'http://matplotlib.org' -description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of - hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python - and ipython shell, web application servers, and six graphical user interface toolkits.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] -sources = [SOURCELOWER_TAR_GZ] - -python = "Python" -pythonversion = '2.7.5' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) - -versionsuffix = "-%s-%s" % (python, pythonversion) - -dependencies = [ - (python, pythonversion), - ('zlib', '1.2.8'), - ('freetype', '2.4.11'), - ('libpng', '1.6.6'), -] - -sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], -} - -moduleclass = 'vis' -- GitLab From 89ebf5ce72b96f6a2146a6b47c9446f65e89c928 Mon Sep 17 00:00:00 2001 From: Adam DeConinck Date: Wed, 20 Nov 2013 17:35:37 -0800 Subject: [PATCH 351/811] Add Erlang easyconfigs with and without Java dep Also include the most recent Java, because I couldn't find the most recent Java with an easyconfig on Oracle's site. --- .../ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb | 23 ++++++++++++++++ .../e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb | 26 +++++++++++++++++++ easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb | 15 +++++++++++ 3 files changed, 64 insertions(+) create mode 100644 easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb create mode 100644 easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb create mode 100644 easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb new file mode 100644 index 0000000000..819ddd9b6b --- /dev/null +++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb @@ -0,0 +1,23 @@ +name = 'ErlangOTP' +version = 'R16B02' +versionsuffix = "-no-Java" + +homepage = 'http://www.erlang.org/' +description = """Erlang is a general-purpose concurrent, garbage-collected programming language and runtime system.""" + +toolchain = {'name': 'GCC', 'version': '4.7.2'} +toolchainopts = {} # toolchain options, e.g. opt, pic, usempi, optarch, ... + +sources = ['otp_src_%(version)s.tar.gz'] +source_urls = ['http://www.erlang.org/download'] + +configopts = '--without-javac ' +patches = [] + +sanity_check_paths = { + 'files': ['bin/erl'], + 'dirs': ['lib/erlang/bin', 'lib/erlang/lib'] + +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb new file mode 100644 index 0000000000..0415fc7a1c --- /dev/null +++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb @@ -0,0 +1,26 @@ +name = 'ErlangOTP' +version = 'R16B02' + +homepage = 'http://www.erlang.org/' +description = """Erlang is a general-purpose concurrent, garbage-collected programming language and runtime system.""" + + +toolchain = {'name': 'GCC', 'version': '4.7.2'} +toolchainopts = {} # toolchain options, e.g. opt, pic, usempi, optarch, ... + +sources = ['otp_src_%(version)s.tar.gz'] +source_urls = ['http://www.erlang.org/download'] + +builddependencies = [('Java','1.7.0_45','',True)] + +configopts = '--with-javac ' +patches = [] + +sanity_check_paths = { + 'files': ['bin/erl'], + 'dirs': ['lib/erlang/bin', 'lib/erlang/lib', + 'lib/erlang/lib/jinterface-1.5.8'] # Note java dependency + +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb new file mode 100644 index 0000000000..592d650cab --- /dev/null +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb @@ -0,0 +1,15 @@ +name = 'Java' +version = '1.7.0_45' + +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'} + +## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +(vp, vs) = version.split('_') +altver = '%su%s' % (vp.split('.')[1], vs) +sources = ['jdk-%s-linux-x64.tar.gz' % altver] + +moduleclass = 'lang' -- GitLab From fda77bc117ef5d1f27f0cf376c813db3f89471b3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 25 Nov 2013 16:15:02 +0100 Subject: [PATCH 352/811] bump version to v1.10.0.0dev --- easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb | 5 ++++- .../l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb | 5 ++++- .../l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb | 5 ++++- .../l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.13-goolf-1.4.10.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb | 5 ++++- easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb | 5 ++++- setup.py | 2 +- 12 files changed, 45 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb index de6fb450b3..0c3d74c035 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb @@ -10,8 +10,11 @@ allows code written in one language to call code written in another language.""" toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['ftp://sourceware.org/pub/libffi/'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb index 9988537e78..8ea7a2f64c 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb @@ -10,8 +10,11 @@ allows code written in one language to call code written in another language.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['ftp://sourceware.org/pub/libffi/'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb index bb250cc5bb..f4504554c3 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goolf-1.4.10.eb @@ -9,8 +9,11 @@ FFI stands for Foreign Function Interface. A foreign function interface is the p allows code written in one language to call code written in another language.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['ftp://sourceware.org/pub/libffi/'] sanity_check_paths = { 'files': ['lib/libffi.a'], diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb index 83c290bfaf..fd11c9cdc0 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb @@ -10,8 +10,11 @@ allows code written in one language to call code written in another language.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['ftp://sourceware.org/pub/libffi/'] patches = ['libffi-%(version)s_icc_UINT128.patch'] diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb index 438ed0863f..c6b9fc165b 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'gmpolf', 'version': '1.4.8'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb index 91550378f6..d9a287357f 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb index b765fbda7b..d739b39a04 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goolf-1.4.10.eb index 04702be670..613a185859 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goolf-1.4.10.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb index 8c7c963c25..8feab385c4 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] patches = ['libffi-%(version)s_include-xmmintrin.patch'] diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb index 0e0090cb84..402c182ac9 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.2.0.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'ictce', 'version': '5.2.0'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] patches = ['libffi-%(version)s_include-xmmintrin.patch'] diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb index 06822ddc75..d19893fd6b 100644 --- a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-5.3.0.eb @@ -7,7 +7,10 @@ conventions. This allows a programmer to call any function specified by a call i toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['ftp://sourceware.org/pub/libffi/'] +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] sources = [SOURCELOWER_TAR_GZ] patches = ['libffi-%(version)s_include-xmmintrin.patch'] diff --git a/setup.py b/setup.py index 3126a05aa1..97ba63939b 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.9.0.0" +VERSION = "1.10.0.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 405ba6220c04df6f54bf3221af2f966eeb7209c7 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 25 Nov 2013 16:17:13 +0100 Subject: [PATCH 353/811] Valgrind: updated to 3.9 with goalf-1.5.12 --- .../Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..0bcf0e9356 --- /dev/null +++ b/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine, Ghent University +# Authors:: Fotis Georgatos , Ward Poelmans +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html +## + +name = 'Valgrind' +version = '3.9.0' + +homepage = 'http://valgrind.org/downloads/' +description = "Valgrind: Debugging and profiling tools" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} + +source_urls = ['http://valgrind.org/downloads/'] +sources = [SOURCELOWER_TAR_BZ2] + +binaries = [ + 'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff', + 'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb' +] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in binaries], + 'dirs': [] +} + +moduleclass = 'debugger' -- GitLab From 944df1554dacd6e82d44bea51c7d97441c54021f Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 25 Nov 2013 16:39:35 +0100 Subject: [PATCH 354/811] Valgrind-3.9.0: shorting header a bit --- .../v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb index 0bcf0e9356..8f5bbc5897 100644 --- a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb @@ -1,7 +1,7 @@ ## # This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # -# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine, Ghent University +# Copyright:: Copyright 2012-2013 LCSB, Ghent University # Authors:: Fotis Georgatos , Ward Poelmans # License:: MIT/GPL # $Id$ -- GitLab From 312e9eb65a23763798b51cfcecebf67b7737f6cb Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 25 Nov 2013 21:31:44 +0100 Subject: [PATCH 355/811] turn modextrapaths into lists & also populate MANPATH Signed-off-by: Fotis Georgatos --- .../t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb index 4db2aee3fd..bb51694ffd 100644 --- a/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb +++ b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb @@ -30,8 +30,9 @@ sanity_check_paths = { } modextrapaths = { - 'PATH': 'nvidia-healthmon', - 'CPATH': 'nvml/include', + 'PATH': ['nvidia-healthmon'], + 'CPATH': ['nvml/include'], + 'MANPATH': ['nvml/doc/man'], } moduleclass = 'system' -- GitLab From 6259c71785ba428e9e149b14f93053a309544039 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 26 Nov 2013 14:09:33 +0100 Subject: [PATCH 356/811] init contrib_GMT Signed-off-by: Fotis Georgatos --- .../c/CMake/CMake-2.8.11-goolf-1.4.10.eb | 20 ++++++++++ .../g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb | 22 +++++++++++ .../g/GMT/GMT-5.1.0-goolf-1.4.10.eb | 38 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb new file mode 100644 index 0000000000..3b3474d82a --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = "2.8.11" + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..62e541c4f9 --- /dev/null +++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb @@ -0,0 +1,22 @@ +name = 'GDAL' +version = '1.9.2' + +homepage = 'http://www.gdal.org/' +description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style + Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model + to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for + data translation and processing.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://download.osgeo.org/gdal/'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +sanity_check_paths = { + 'files': ['lib/libgdal.so', 'lib/libgdal.a'], + 'dirs': ['bin', 'include'] +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..30ef74821b --- /dev/null +++ b/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb @@ -0,0 +1,38 @@ +name = "GMT" +version = "5.1.0" + +easyblock = "CMakeMake" + +homepage = 'http://gmt.soest.hawaii.edu/' +description = """GMT is an open source collection of about 80 command-line tools for manipulating + geographic and Cartesian data sets (including filtering, trend fitting, gridding, projecting, + etc.) and producing PostScript illustrations ranging from simple x-y plots via contour maps + to artificially illuminated surfaces and 3D perspective views; the GMT supplements add another + 40 more specialized and discipline-specific tools. """ + +toolchain = {'version': '1.4.10', 'name': 'goolf'} + +sources = ['gmt-%(version)s-src.tar.bz2'] +source_urls = ['http://gmt.soest.hawaii.edu/files/download?name='] + +builddependencies = [('CMake', '2.8.11')] + +dependencies = [ + ('PCRE', '8.12'), + ('GDAL', '1.9.2'), + ('GEOS', '3.3.5'), + ('Sphinx', '1.1.3', '-Python-2.7.3'), + ('netCDF', '4.2.1.1'), + #('Ghostscript', '9.10'), +] + +separate_build_dir = True + +sanity_check_paths = { + 'files': ['bin/gmt', 'bin/isogmt'], + 'dirs': [] +} + +modextrapaths = {'GMTHOME': ''} + +moduleclass = 'geo' -- GitLab From 87638b6ae39df24b62aed766f5ab85fe3d113d3c Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 27 Nov 2013 14:18:48 +0100 Subject: [PATCH 357/811] added O2scl 0.913 config file --- .../o/O2scl/o2scl-0.913-goolf-1.4.10.eb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb new file mode 100644 index 0000000000..a703fdda55 --- /dev/null +++ b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb @@ -0,0 +1,25 @@ +name = 'o2scl' +version = '0.913' + +homepage = 'http://o2scl.sourceforge.net/' + +description = """ An object-oriented library for scientific +computing in C++ useful for solving, minimizing, differentiating, +integrating, interpolating, optimizing, approximating, analyzing, +fitting, and more.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('Eigen', '3.1.4'), + ('libreadline', '6.2'), + ('HDF5', '1.8.11'), + ('Boost', '1.53.0'), + ('GSL', '1.15'), +] + + +moduleclass = 'lib' -- GitLab From e7fda0458f6c49e959e624ad0fde58f7d63c8539 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 27 Nov 2013 23:15:39 +0100 Subject: [PATCH 358/811] added missing dependencies HDF5-1.8.11-goolf-1.4.10.eb Eigen-4.1.4-goolf-1.4.10.eb --- .../e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb | 25 +++++++++++++++++++ .../h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb | 22 ++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb new file mode 100644 index 0000000000..d2d1de373c --- /dev/null +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb @@ -0,0 +1,25 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'Eigen' +version = '3.1.4' + +homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' +description = """Eigen is a C++ template library for linear algebra: + matrices, vectors, numerical solvers, and related algorithms.""" +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] +sources = ['%s.tar.bz2' % version] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb new file mode 100644 index 0000000000..13548661bc --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb @@ -0,0 +1,22 @@ +name = 'HDF5' +version = '1.8.11' +versionsuffix = '-serial' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('zlib', '1.2.8'), + ('Szip', '2.1'), +] + +patches = ['configure_libtool.patch'] + +moduleclass = 'data' -- GitLab From 2c041a9a6ffc42c4cc54d9fde8f9f1d63e6d3d82 Mon Sep 17 00:00:00 2001 From: pescobar Date: Thu, 28 Nov 2013 11:30:37 +0100 Subject: [PATCH 359/811] removed version suffix in HDF5 ebconfig --- easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb index 13548661bc..4406c160f4 100644 --- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb @@ -1,6 +1,5 @@ name = 'HDF5' version = '1.8.11' -versionsuffix = '-serial' homepage = 'http://www.hdfgroup.org/HDF5/' description = """HDF5 is a unique technology suite that makes possible the management of -- GitLab From 5234b1035175f3caab70f32aaefbb2290eb46589 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 28 Nov 2013 16:48:50 +0100 Subject: [PATCH 360/811] added more default packages to python + python 2.7.6 --- .../p/Python/Python-2.7.3-cgmpolf-1.1.6.eb | 39 +++++++-- .../Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb | 37 +++++++- .../p/Python/Python-2.7.3-cgmvolf-1.2.7.eb | 37 +++++++- .../p/Python/Python-2.7.3-cgoolf-1.1.7.eb | 36 +++++++- .../p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 36 +++++++- .../p/Python/Python-2.7.3-gmvolf-1.7.12.eb | 36 +++++++- .../p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb | 35 +++++++- .../Python-2.7.3-goalf-1.1.0-no-OFED.eb | 36 +++++++- .../p/Python/Python-2.7.3-goolf-1.4.10.eb | 36 +++++++- .../p/Python/Python-2.7.3-ictce-4.0.6.eb | 37 +++++++- .../p/Python/Python-2.7.3-ictce-4.1.13.eb | 36 +++++++- .../p/Python/Python-2.7.3-ictce-5.2.0.eb | 36 +++++++- .../p/Python/Python-2.7.3-ictce-5.3.0.eb | 36 +++++++- .../p/Python/Python-2.7.3-iomkl-4.6.13.eb | 37 +++++++- .../p/Python/Python-2.7.3-iqacml-3.7.3.eb | 31 ++++++- .../Python-2.7.5-goalf-1.5.12-no-OFED.eb | 28 +++++- .../p/Python/Python-2.7.5-goolf-1.4.10.eb | 29 ++++++- .../p/Python/Python-2.7.5-ictce-4.1.13.eb | 28 +++++- .../p/Python/Python-2.7.5-ictce-5.3.0.eb | 28 +++++- .../p/Python/Python-2.7.5-ictce-5.5.0.eb | 28 +++++- .../p/Python/Python-2.7.5-iqacml-3.7.3.eb | 28 +++++- .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 85 +++++++++++++++++++ .../Python-3.2.3-goalf-1.1.0-no-OFED.eb | 46 +++++++++- .../p/Python/Python-3.2.3-goolf-1.4.10.eb | 46 +++++++++- .../p/Python/Python-3.2.3-ictce-4.0.6.eb | 46 +++++++++- .../p/Python/Python-3.2.3-ictce-5.3.0.eb | 46 +++++++++- 26 files changed, 896 insertions(+), 83 deletions(-) create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb index 350cff539f..bc9555614f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb @@ -19,23 +19,29 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), -] - -# order is important! +]# order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +51,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb index 78733636f2..33a828a8a3 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb @@ -20,22 +20,30 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +53,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb index 965f7680f9..0c06d2fa65 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb @@ -23,19 +23,27 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -43,11 +51,32 @@ exts_list = [ 'source_urls': ['http://argparse.googlecode.com/files/'], }), ('lockfile', '0.9.1', { - 'source_urls': ['http://pylockfile.googlecode.com/files/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb index d6df6cdaaa..3b8f57925e 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb @@ -23,19 +23,28 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +54,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index f097672302..ced51446f7 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -20,22 +20,29 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +52,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb index d6387e790c..c32d8b7ed6 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb @@ -20,22 +20,29 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +52,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb index 36c7fd70fe..20ae20457a 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb @@ -23,19 +23,27 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +53,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb index cb3e4c646f..d81b8ae31d 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb @@ -20,22 +20,29 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +52,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index 2904d6f980..c71cbd0a39 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -20,22 +20,29 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -45,9 +52,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb index 44396979b5..93bfab822a 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb @@ -22,22 +22,30 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -47,9 +55,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb index e69840bf6a..d661950b98 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb @@ -25,19 +25,28 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -47,9 +56,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb index 0fcb35553c..47c841baf6 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb @@ -25,19 +25,28 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -47,9 +56,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb index 0ef59f1a6c..9e11017ac9 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb @@ -25,19 +25,28 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -47,9 +56,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb index 6d4756c14e..8f38de5208 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb @@ -23,22 +23,30 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] - # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -48,9 +56,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb index 591a7c22f0..ca8be92f02 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb @@ -26,9 +26,12 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), @@ -42,6 +45,9 @@ exts_list = [ ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), ('paycheck', '1.0.2', { 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], }), @@ -51,9 +57,30 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.17.2', { + ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb index 61eaa9350c..b3c8bdbff1 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -25,10 +25,13 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('nose', '1.3.0', { + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { @@ -56,6 +59,27 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index 890f3ac899..38147fabe1 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -23,12 +23,16 @@ dependencies = [ ('ncurses', '5.9'), ] + # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('nose', '1.3.0', { + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { @@ -56,6 +60,27 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index ba61bc3e08..99e757460c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -25,10 +25,13 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('nose', '1.3.0', { + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { @@ -56,6 +59,27 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index 9cd24fe3ae..a72f924582 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -25,10 +25,13 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('nose', '1.3.0', { + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { @@ -56,6 +59,27 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 4896534784..61b0dfecda 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -25,10 +25,13 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('nose', '1.3.0', { + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { @@ -56,6 +59,27 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index fbb0800072..f217c668fd 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -26,10 +26,13 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '0.6c11', { + ('setuptools', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('nose', '1.3.0', { + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { @@ -57,6 +60,27 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb new file mode 100644 index 0000000000..3839bf7e8e --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -0,0 +1,85 @@ +name = 'Python' +version = '2.7.6' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.7.0' +scipyversion = '0.12.0' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python-%(version)s_libffi_int128_icc.patch'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('pip', '1.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.1.2', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index 087bed47a1..262a4466a4 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -23,9 +23,8 @@ dependencies = [ # order is important! exts_list = [ - ('distribute', '0.6.26', { - 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], - 'modulename': 'setuptools', + ('setuptools', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], @@ -35,11 +34,50 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index f52c47b304..fbf9131ead 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -23,9 +23,8 @@ dependencies = [ # order is important! exts_list = [ - ('distribute', '0.6.26', { - 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], - 'modulename': 'setuptools', + ('setuptools', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], @@ -35,11 +34,50 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 938b80ce48..17a9e0871c 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -23,9 +23,8 @@ dependencies = [ # order is important! exts_list = [ - ('distribute', '0.6.26', { - 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], - 'modulename': 'setuptools', + ('setuptools', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], @@ -35,11 +34,50 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 7971193188..8459b7a082 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -24,9 +24,8 @@ dependencies = [ # order is important! exts_list = [ - ('distribute', '0.6.26', { - 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], - 'modulename': 'setuptools', + ('setuptools', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], @@ -36,11 +35,50 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'], + 'patches': [ + 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-iqacml.patch', + ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), + ('mpi4py', '1.3', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.1', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.1', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), ] moduleclass = 'lang' -- GitLab From df7c8590ede15ef12e864298c75093e744af9024 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 28 Nov 2013 16:54:14 +0100 Subject: [PATCH 361/811] libffi patch no longer needed, fixed it upstream --- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 3839bf7e8e..307c1882b5 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -13,8 +13,6 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] - # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), -- GitLab From 48fe4bb236ddf4bc0066b27b0eeb7b99f503ce00 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Thu, 28 Nov 2013 17:04:23 +0100 Subject: [PATCH 362/811] fixed typo --- easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb | 3 +-- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb | 3 +-- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 3 +-- .../easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb | 3 +-- easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb | 3 +-- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 3 +-- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 3 +-- 25 files changed, 25 insertions(+), 32 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb index bc9555614f..4a0b5c7d11 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb @@ -66,7 +66,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb index 33a828a8a3..a613874ed7 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb @@ -68,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb index 0c06d2fa65..8474696bf4 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb @@ -68,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb index 3b8f57925e..63570ad089 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb @@ -69,7 +69,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index ced51446f7..db195c0bbe 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -67,7 +67,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb index c32d8b7ed6..8c99e72128 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb @@ -67,7 +67,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb index 20ae20457a..e1bf5116c1 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb @@ -68,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb index d81b8ae31d..b70cb62012 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb @@ -67,7 +67,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index c71cbd0a39..9337284cb3 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -67,7 +67,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb index 93bfab822a..1f9a33d788 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb @@ -70,7 +70,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb index d661950b98..c9f07cf92c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb @@ -71,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb index 47c841baf6..1518cbeadc 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb @@ -71,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb index 9e11017ac9..fe22e97e4c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb @@ -71,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb index 8f38de5208..00c9c8c84b 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb @@ -71,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb index ca8be92f02..3842277046 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb @@ -72,7 +72,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index 38147fabe1..ee3eba59bf 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -39,7 +39,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -72,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index 99e757460c..88226659dc 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -38,7 +38,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -71,7 +70,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index a72f924582..50e419b7ce 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -71,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 61b0dfecda..5b599ff1d0 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -71,7 +71,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index f217c668fd..00445c611f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -72,7 +72,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 307c1882b5..adc6635723 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -36,7 +36,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -69,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index 262a4466a4..fb7852574b 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -36,7 +36,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -69,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index fbf9131ead..c42562dc72 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -36,7 +36,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -69,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 17a9e0871c..9422982772 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -36,7 +36,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -69,7 +68,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 8459b7a082..66d906e00a 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -37,7 +37,6 @@ exts_list = [ 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', ], }), ('scipy', scipyversion, { @@ -70,7 +69,7 @@ exts_list = [ }), ('arff', '1.1', { 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'], + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', -- GitLab From 8caf10f18511da9b77f56d39b80efba1c98727de Mon Sep 17 00:00:00 2001 From: Toon Verstraelen Date: Thu, 28 Nov 2013 16:57:54 +0100 Subject: [PATCH 363/811] Config files for nano course Several existing configs were copied and modified for the combination ictce-4.1.13 and Python-2.7.3. The OpenBabel package contains a Python extension, so they should get a Python-2.7.X suffix. A Config for molden was added. --- .../c/CMake/CMake-2.8.12-ictce-4.1.13.eb | 20 ++++++++++ .../e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb | 26 +++++++++++++ .../m/molden/molden-5.0-ictce-4.1.13.eb | 31 +++++++++++++++ .../m/molden/molden-5.0-ictce.patch | 15 ++++++++ .../m/molden/molden-5.0-molden-only.patch | 13 +++++++ .../numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb | 26 +++++++++++++ ....3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb} | 8 +++- ...enBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb | 38 +++++++++++++++++++ ...enBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb} | 8 +++- .../scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb | 19 ++++++++++ 10 files changed, 202 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/m/molden/molden-5.0-ictce.patch create mode 100644 easybuild/easyconfigs/m/molden/molden-5.0-molden-only.patch create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb rename easybuild/easyconfigs/o/OpenBabel/{OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb => OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb} (81%) create mode 100644 easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb rename easybuild/easyconfigs/o/OpenBabel/{OpenBabel-2.3.2-ictce-5.5.0.eb => OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb} (82%) create mode 100644 easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb new file mode 100644 index 0000000000..126afc1210 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb new file mode 100644 index 0000000000..da3a06f00f --- /dev/null +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'Eigen' +version = '3.1.4' + +homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' +description = """Eigen is a C++ template library for linear algebra: + matrices, vectors, numerical solvers, and related algorithms.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] +sources = ['%(version)s.tar.bz2'] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..2a42235dbc --- /dev/null +++ b/easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb @@ -0,0 +1,31 @@ +easyblock = "MakeCp" + +name = 'molden' +version = '5.0' + +homepage = 'http://www.cmbi.ru.nl/molden/' +description = """Molden is a package for displaying Molecular Density from the Ab Initio packages GAMESS-UK, GAMESS-US and GAUSSIAN and the Semi-Empirical packages Mopac/Ampac""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [ + '%(name)s%(version)s.tar.gz', +] + +source_urls = [ + 'ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/%(name)s%(version)s.tar.gz' +] + +patches = [ + 'molden-%(version)s-ictce.patch', + 'molden-%(version)s-molden-only.patch', +] + +files_to_copy = [(['molden'],'bin'), 'CopyRight', 'README', 'REGISTER'] + +sanity_check_paths={ + 'files': ['bin/molden', 'README', 'REGISTER'], + 'dirs': [], +} + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/m/molden/molden-5.0-ictce.patch b/easybuild/easyconfigs/m/molden/molden-5.0-ictce.patch new file mode 100644 index 0000000000..2897b802f0 --- /dev/null +++ b/easybuild/easyconfigs/m/molden/molden-5.0-ictce.patch @@ -0,0 +1,15 @@ +# Because there is no configure script, one has to specify the compiler manually. +# By Toon Verstraelen +--- molden5.0-orig/makefile 2013-11-28 16:02:04.563545000 +0100 ++++ molden5.0/makefile 2013-11-28 16:08:13.606238000 +0100 +@@ -13,8 +13,8 @@ + # Disregard compiler warnings on rdmolf.f + # + # +-CC = cc +-FC = gfortran ++CC = icc ++FC = ifort + LIBS = -lX11 -lm + LDR = ${FC} + LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm diff --git a/easybuild/easyconfigs/m/molden/molden-5.0-molden-only.patch b/easybuild/easyconfigs/m/molden/molden-5.0-molden-only.patch new file mode 100644 index 0000000000..feffc8a8e0 --- /dev/null +++ b/easybuild/easyconfigs/m/molden/molden-5.0-molden-only.patch @@ -0,0 +1,13 @@ +# Only compile the molden binary to keep things simple +# By Toon Verstraelen (toon.verstraelen@ugent.be) +--- molden5.0-orig/makefile 2013-11-28 16:02:04.563545000 +0100 ++++ molden5.0/makefile 2013-11-28 16:08:13.606238000 +0100 +@@ -252,7 +252,7 @@ + # + #LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm + +-all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf ++all: molden + + + molden: $(OBJS) mpdum.o xwin.o diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..6bd0ab86b5 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,26 @@ +name = 'numpy' +version = '1.6.2' + +homepage = 'http://www.numpy.org' +description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things: + a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran + code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses, + NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be + defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +sources = [SOURCE_TAR_GZ] + +patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] + +python = 'Python' +pyver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb similarity index 81% rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb rename to easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb index 41317da7be..7b44103d5e 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb @@ -19,11 +19,17 @@ patches = [ builddependencies = [('CMake', '2.8.12')] +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + dependencies = [ + (python, pythonversion), ('zlib', '1.2.8'), ('libxml2', '2.9.1'), ('Eigen', '3.1.4'), - ('Python', '2.7.5'), ] runtest = 'test' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..386a5e44fd --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,38 @@ +name = 'OpenBabel' +version = '2.3.2' + +homepage = 'http://openbabel.org' +description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical +data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data +from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'OpenBabel-%(version)s-use-xHost.patch', + 'OpenBabel-%(version)s-fix-link-path-tests.patch', + 'OpenBabel-%(version)s-ignore-failed-test.patch', +] + +builddependencies = [('CMake', '2.8.12')] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.7'), + ('libxml2', '2.9.1'), + ('Eigen', '3.1.4'), +] + +runtest = 'test' + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb similarity index 82% rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb rename to easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb index 54fdc7e734..39852f3739 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb @@ -20,11 +20,17 @@ patches = [ builddependencies = [('CMake', '2.8.12')] +python = "Python" +pythonversion = '2.7.7' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + dependencies = [ + (python, pythonversion), ('zlib', '1.2.8'), ('libxml2', '2.9.1'), ('Eigen', '3.1.4'), - ('Python', '2.7.5'), ] runtest = 'test' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..e391cf854c --- /dev/null +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,19 @@ +name = 'scipy' +version = '0.11.0' +versionsuffix = '-Python-2.7.3' + +homepage = 'http://www.scipy.org' +description = """SciPy is a collection of mathematical algorithms and convenience + functions built on the Numpy extension for Python.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True} + +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +sources = [SOURCE_TAR_GZ] + +dependencies = [ + ('numpy', '1.6.2', versionsuffix), + ] + +moduleclass = 'math' -- GitLab From 143aca9bce744a7c856ce5a186396684b091cd09 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 29 Nov 2013 11:48:04 +0100 Subject: [PATCH 364/811] added ABySS 1.3.6 with google-sparsehash dependency to reduce memory consumption --- .../ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb | 38 +++++++++++++++++++ .../Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb | 26 +++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb new file mode 100644 index 0000000000..54ffe4617c --- /dev/null +++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'ABySS' +version = '1.3.6' +versionsuffix = '-Python-2.7.5' + +homepage = 'http://www.bcgsc.ca/platform/bioinfo/software/abyss' +description = """Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'usempi': True} + +# eg. http://www.bcgsc.ca/downloads/abyss/abyss-1.3.4.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.bcgsc.ca/downloads/abyss/'] + + +dependencies = [ + ('google-sparsehash', '2.0.2'), + ('Boost', '1.49.0',versionsuffix), +] + +sanity_check_paths = { + 'files': ["bin/ABYSS", "bin/ABYSS-P"], + 'dirs': [] + } + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb new file mode 100644 index 0000000000..ff19195a78 --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb @@ -0,0 +1,26 @@ +name = 'Boost' +version = '1.49.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +pythonversion = '2.7.5' +versionsuffix = '-Python-%s' % pythonversion + +dependencies = [ + ('bzip2', '1.0.6'), + ('Python', pythonversion), +] + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' -- GitLab From eecb43ef21610afdbf30a99f81fce7d792bca263 Mon Sep 17 00:00:00 2001 From: Toon Verstraelen Date: Fri, 29 Nov 2013 15:41:21 +0100 Subject: [PATCH 365/811] Molden with capital M --- .../Molden-5.0-ictce-4.1.13.eb} | 10 +++++----- .../Molden-5.0-ictce.patch} | 0 .../Molden-5.0-molden-only.patch} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename easybuild/easyconfigs/m/{molden/molden-5.0-ictce-4.1.13.eb => Molden/Molden-5.0-ictce-4.1.13.eb} (71%) rename easybuild/easyconfigs/m/{molden/molden-5.0-ictce.patch => Molden/Molden-5.0-ictce.patch} (100%) rename easybuild/easyconfigs/m/{molden/molden-5.0-molden-only.patch => Molden/Molden-5.0-molden-only.patch} (100%) diff --git a/easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb similarity index 71% rename from easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb rename to easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb index 2a42235dbc..92aa6cbc83 100644 --- a/easybuild/easyconfigs/m/molden/molden-5.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb @@ -1,6 +1,6 @@ easyblock = "MakeCp" -name = 'molden' +name = 'Molden' version = '5.0' homepage = 'http://www.cmbi.ru.nl/molden/' @@ -9,16 +9,16 @@ description = """Molden is a package for displaying Molecular Density from the A toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [ - '%(name)s%(version)s.tar.gz', + '%(namelower)s%(version)s.tar.gz', ] source_urls = [ - 'ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/%(name)s%(version)s.tar.gz' + 'ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/%(namelower)s%(version)s.tar.gz' ] patches = [ - 'molden-%(version)s-ictce.patch', - 'molden-%(version)s-molden-only.patch', + 'Molden-%(version)s-ictce.patch', + 'Molden-%(version)s-molden-only.patch', ] files_to_copy = [(['molden'],'bin'), 'CopyRight', 'README', 'REGISTER'] diff --git a/easybuild/easyconfigs/m/molden/molden-5.0-ictce.patch b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce.patch similarity index 100% rename from easybuild/easyconfigs/m/molden/molden-5.0-ictce.patch rename to easybuild/easyconfigs/m/Molden/Molden-5.0-ictce.patch diff --git a/easybuild/easyconfigs/m/molden/molden-5.0-molden-only.patch b/easybuild/easyconfigs/m/Molden/Molden-5.0-molden-only.patch similarity index 100% rename from easybuild/easyconfigs/m/molden/molden-5.0-molden-only.patch rename to easybuild/easyconfigs/m/Molden/Molden-5.0-molden-only.patch -- GitLab From be18a6e83db6bd3b1eda766b7380332814248958 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 29 Nov 2013 15:42:22 +0100 Subject: [PATCH 366/811] added samtools-0.1.19 and required patches this depends on modified samtools.py easyblock --- .../SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb | 33 +++++++++++++ .../SAMtools_0.1.19_Makefile-ncurses.patch | 46 +++++++++++++++++ .../s/SAMtools/SAMtools_0.1.19_misc.patch | 49 +++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch create mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb new file mode 100644 index 0000000000..06c8c4d00c --- /dev/null +++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb @@ -0,0 +1,33 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'SAMtools' +version = '0.1.19' + +homepage = 'http://samtools.sourceforge.net/' +description = """SAM (Sequence Alignment/Map) format is a generic format +for storing large nucleotide sequence alignments.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [('http://sourceforge.net/projects/samtools/files/%s/%s' % (name.lower(), version), 'download')] + +patches = ['SAMtools_0.1.19_Makefile-ncurses.patch','SAMtools_0.1.19_misc.patch'] + +dependencies = [ + ('ncurses', '5.9'), + ('zlib', '1.2.8'), +] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch new file mode 100644 index 0000000000..98fd2203b8 --- /dev/null +++ b/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch @@ -0,0 +1,46 @@ +--- samtools-0.1.19.orig/Makefile 2013-03-19 08:48:09.000000000 +0100 ++++ samtools-0.1.19/Makefile 2013-11-29 13:17:00.210306930 +0100 +@@ -12,10 +12,10 @@ + cut_target.o phase.o bam2depth.o padding.o bedcov.o bamshuf.o \ + bam_tview_curses.o bam_tview_html.o + PROG= samtools +-INCLUDES= -I. ++INCLUDES= -I$(EBROOTNCURSES)/include -I$(EBROOTZLIB)/include -I. + SUBDIRS= . bcftools misc +-LIBPATH= +-LIBCURSES= -lcurses # -lXCurses ++LIBPATH= -L$(EBROOTZLIB)/lib ++LIBCURSES= -L$(EBROOTNCURSES)/lib -lcurses -L$(EBROOTZLIB)/lib -lz # -lXCurses + + .SUFFIXES:.c .o + .PHONY: all lib +@@ -44,13 +44,13 @@ + $(AR) -csru $@ $(LOBJS) + + samtools:lib-recur $(AOBJS) +- $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread ++ $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -L$(EBROOTZLIB)/lib -lz -lpthread + + razip:razip.o razf.o $(KNETFILE_O) +- $(CC) $(CFLAGS) -o $@ $^ -lz ++ $(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz + + bgzip:bgzip.o bgzf.o $(KNETFILE_O) +- $(CC) $(CFLAGS) -o $@ $^ -lz -lpthread ++ $(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz -lpthread + + bgzf.o:bgzf.c bgzf.h + $(CC) -c $(CFLAGS) $(DFLAGS) -DBGZF_CACHE $(INCLUDES) bgzf.c -o $@ +@@ -81,10 +81,10 @@ + + + libbam.1.dylib-local:$(LOBJS) +- libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -lz ++ libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -L$(EBROOTZLIB)/lib -lz + + libbam.so.1-local:$(LOBJS) +- $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -lz ++ $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -L$(EBROOTZLIB)/lib -lz + + dylib: + @$(MAKE) cleanlocal; \ diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch new file mode 100644 index 0000000000..b3f2a74519 --- /dev/null +++ b/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch @@ -0,0 +1,49 @@ +--- samtools-0.1.19.orig/misc/Makefile 2013-03-19 08:48:09.000000000 +0100 ++++ samtools-0.1.19/misc/Makefile 2013-11-29 13:34:10.250913354 +0100 +@@ -5,7 +5,8 @@ + DFLAGS= -D_FILE_OFFSET_BITS=64 + OBJS= + PROG= md5sum-lite md5fa maq2sam-short maq2sam-long ace2sam wgsim bamcheck +-INCLUDES= -I.. ++INCLUDES= -I$(EBROOTNCURSES)/include -I$(EBROOTZLIB)/include -I.. ++LIBPATH= -L$(EBROOTZLIB)/lib + SUBDIRS= . + + .SUFFIXES:.c .o +@@ -28,19 +29,19 @@ + lib: + + bamcheck:bamcheck.o +- $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -lz ++ $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -L$(EBROOTZLIB)/lib -lz + + bamcheck.o:bamcheck.c ../faidx.h ../khash.h ../sam.h ../razf.h + $(CC) $(CFLAGS) -c -I.. -o $@ bamcheck.c + + ace2sam:ace2sam.o +- $(CC) $(CFLAGS) -o $@ ace2sam.o -lz ++ $(CC) $(CFLAGS) -o $@ ace2sam.o -L$(EBROOTZLIB)/lib -lz + + wgsim:wgsim.o +- $(CC) $(CFLAGS) -o $@ wgsim.o -lm -lz ++ $(CC) $(CFLAGS) -o $@ wgsim.o -lm -L$(EBROOTZLIB)/lib -lz + + md5fa:md5.o md5fa.o md5.h ../kseq.h +- $(CC) $(CFLAGS) -o $@ md5.o md5fa.o -lz ++ $(CC) $(CFLAGS) -o $@ md5.o md5fa.o -L$(EBROOTZLIB)/lib -lz + + md5sum-lite:md5sum-lite.o + $(CC) $(CFLAGS) -o $@ md5sum-lite.o +@@ -49,10 +50,10 @@ + $(CC) -c $(CFLAGS) -DMD5SUM_MAIN -o $@ md5.c + + maq2sam-short:maq2sam.c +- $(CC) $(CFLAGS) -o $@ maq2sam.c -lz ++ $(CC) $(CFLAGS) -o $@ maq2sam.c -L$(EBROOTZLIB)/lib -lz + + maq2sam-long:maq2sam.c +- $(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -lz ++ $(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -L$(EBROOTZLIB)/lib -lz + + md5fa.o:md5.h md5fa.c + $(CC) $(CFLAGS) -c -I.. -o $@ md5fa.c -- GitLab From 50ceb603c0c3464cc1532d2de96da415b63ed202 Mon Sep 17 00:00:00 2001 From: Toon Verstraelen Date: Sat, 30 Nov 2013 06:11:57 +0100 Subject: [PATCH 367/811] Fixed several formatting issues --- .../easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb | 13 +++++-------- ...Babel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb | 7 ++++--- .../OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb | 7 ++++--- .../OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb | 7 ++++--- ...scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 4 +--- .../scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb | 4 +--- .../scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb | 4 +--- .../scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb | 4 +--- .../scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb | 4 +--- .../scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb | 4 +--- 10 files changed, 23 insertions(+), 35 deletions(-) diff --git a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb index 92aa6cbc83..76a1b7f50f 100644 --- a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb @@ -4,17 +4,14 @@ name = 'Molden' version = '5.0' homepage = 'http://www.cmbi.ru.nl/molden/' -description = """Molden is a package for displaying Molecular Density from the Ab Initio packages GAMESS-UK, GAMESS-US and GAUSSIAN and the Semi-Empirical packages Mopac/Ampac""" +description = """Molden is a package for displaying Molecular Density from the + Ab Initio packages GAMESS-UK, GAMESS-US and GAUSSIAN and the Semi-Empirical + packages Mopac/Ampac""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -sources = [ - '%(namelower)s%(version)s.tar.gz', -] - -source_urls = [ - 'ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/%(namelower)s%(version)s.tar.gz' -] +sources = ['%(namelower)s%(version)s.tar.gz'] +source_urls = ['ftp://ftp.cmbi.ru.nl/pub/molgraph/molden'] patches = [ 'Molden-%(version)s-ictce.patch', diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb index 7b44103d5e..b0dbc264bd 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb @@ -2,9 +2,10 @@ name = 'OpenBabel' version = '2.3.2' homepage = 'http://openbabel.org' -description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical -data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data -from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.""" +description = """Open Babel is a chemical toolbox designed to speak the many + languages of chemical data. It's an open, collaborative project allowing anyone + to search, convert, analyze, or store data from molecular modeling, chemistry, + solid-state materials, biochemistry, or related areas.""" toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} toolchainopts = {'optarch': True} diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb index 386a5e44fd..534fdf2177 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb @@ -2,9 +2,10 @@ name = 'OpenBabel' version = '2.3.2' homepage = 'http://openbabel.org' -description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical -data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data -from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.""" +description = """Open Babel is a chemical toolbox designed to speak the many + languages of chemical data. It's an open, collaborative project allowing anyone + to search, convert, analyze, or store data from molecular modeling, chemistry, + solid-state materials, biochemistry, or related areas.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb index 39852f3739..b50e725a50 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb @@ -2,9 +2,10 @@ name = 'OpenBabel' version = '2.3.2' homepage = 'http://openbabel.org' -description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical -data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data -from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.""" +description = """Open Babel is a chemical toolbox designed to speak the many + languages of chemical data. It's an open, collaborative project allowing anyone + to search, convert, analyze, or store data from molecular modeling, chemistry, + solid-state materials, biochemistry, or related areas.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True} diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index f466b5ee8a..6be5a1f63a 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -12,8 +12,6 @@ toolchainopts = {'pic': True} source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] sources = [SOURCE_TAR_GZ] -dependencies = [ - ('numpy', '1.6.2', versionsuffix), - ] +dependencies = [('numpy', '1.6.2', versionsuffix)] moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb index 952fc435a5..1e2a06545e 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb @@ -12,8 +12,6 @@ toolchainopts = {'pic': True} source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] sources = [SOURCE_TAR_GZ] -dependencies = [ - ('numpy', '1.6.2', versionsuffix), - ] +dependencies = [('numpy', '1.6.2', versionsuffix)] moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb index 564b138ba6..ace3c72316 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb @@ -12,8 +12,6 @@ toolchainopts = {'pic': True} source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] sources = [SOURCE_TAR_GZ] -dependencies = [ - ('numpy', '1.6.2', versionsuffix), - ] +dependencies = [('numpy', '1.6.2', versionsuffix)] moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb index e391cf854c..b80ca9d761 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb @@ -12,8 +12,6 @@ toolchainopts = {'pic': True} source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] sources = [SOURCE_TAR_GZ] -dependencies = [ - ('numpy', '1.6.2', versionsuffix), - ] +dependencies = [('numpy', '1.6.2', versionsuffix)] moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb index 7875f20000..aaa6f260b9 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb @@ -12,8 +12,6 @@ toolchainopts = {'pic': True} source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] sources = [SOURCE_TAR_GZ] -dependencies = [ - ('numpy', '1.6.2', versionsuffix), - ] +dependencies = [('numpy', '1.6.2', versionsuffix)] moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb index d0822a60e9..0451302efb 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb @@ -12,8 +12,6 @@ toolchainopts = {'pic': True} source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] -dependencies = [ - ('numpy', '1.6.2', versionsuffix), -] +dependencies = [('numpy', '1.6.2', versionsuffix)] moduleclass = 'math' -- GitLab From 217c15c118a1ac4a7ae64d3ab34c894c58584ca7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 30 Nov 2013 13:56:47 +0100 Subject: [PATCH 368/811] fix remarks --- .../easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb | 2 +- .../easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb index 53d4aebdfe..10676832a7 100644 --- a/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb @@ -5,7 +5,7 @@ version = '1.6.4' homepage = 'http://www.parallelpython.com/' description = """PP is a python module which provides mechanism for parallel execution of python code on SMP -(systems with multiple processors or cores) and clusters (computers connected via network).""" + (systems with multiple processors or cores) and clusters (computers connected via network).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb index 7cae0123b6..da9a5dfc46 100644 --- a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb @@ -5,7 +5,7 @@ version = '1.6.4' homepage = 'http://www.parallelpython.com/' description = """PP is a python module which provides mechanism for parallel execution of python code on SMP -(systems with multiple processors or cores) and clusters (computers connected via network).""" + (systems with multiple processors or cores) and clusters (computers connected via network).""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -- GitLab From 4797378337306b614fc6a9e6b7ff7f1f9116f6b6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 30 Nov 2013 14:02:55 +0100 Subject: [PATCH 369/811] fix sanity check for PP --- .../easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb | 4 ++-- .../easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb index 10676832a7..da24746b62 100644 --- a/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb @@ -23,8 +23,8 @@ dependencies = [ ] sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pythonshortversion] + 'files': ['lib/python%s/site-packages/%%(namelower)s.py' % pythonshortversion], + 'dirs': [], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb index da9a5dfc46..cbf60d507e 100644 --- a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb @@ -23,8 +23,8 @@ dependencies = [ ] sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pythonshortversion] + 'files': ['lib/python%s/site-packages/%%(namelower)s.py' % pythonshortversion], + 'dirs': [], } moduleclass = 'lang' -- GitLab From 1aa8a69249774e5b5e3011caa5cf492cc009d953 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 30 Nov 2013 20:12:02 +0100 Subject: [PATCH 370/811] add CP2K easyconfig with ictce/5.5.0 + deps --- .../easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb | 7 +++---- .../easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb | 7 +++---- .../easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb | 7 +++---- .../easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb index 62a0302056..4f975041bc 100644 --- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb @@ -12,9 +12,8 @@ toolchainopts = {'pic': True} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] -dependencies = [ - ('HDF5', '1.8.10-patch1'), - ('Doxygen', '1.8.3.1') -] +dependencies = [('HDF5', '1.8.10-patch1')] + +builddependencies = [('Doxygen', '1.8.3.1')] moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb index 7f0aa16d44..a43794119f 100644 --- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb @@ -12,9 +12,8 @@ toolchainopts = {'pic':True} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] -dependencies = [ - ('HDF5', '1.8.10', '-gpfs'), - ('Doxygen', '1.8.2') -] +dependencies = [('HDF5', '1.8.10', '-gpfs')] + +builddependencies = [('Doxygen', '1.8.3.1')] moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb index b3da59719e..b2e2392049 100644 --- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb @@ -12,9 +12,8 @@ toolchainopts = {'pic': True} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] -dependencies = [ - ('HDF5', '1.8.10', '-gpfs'), - ('Doxygen', '1.8.2') - ] +dependencies = [('HDF5', '1.8.10', '-gpfs')] + +builddependencies = [('Doxygen', '1.8.3.1')] moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb index e2a1c7f2e6..dd168910be 100644 --- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb @@ -12,9 +12,8 @@ toolchainopts = {'pic': True} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] -dependencies = [ - ('HDF5', '1.8.10-patch1'), - ('Doxygen', '1.8.3.1') -] +dependencies = [('HDF5', '1.8.10-patch1')] + +builddependencies = [('Doxygen', '1.8.3.1')] moduleclass = 'data' -- GitLab From f957d9c5f5c5d1966a35d6510de0375e116c9810 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 30 Nov 2013 20:27:11 +0100 Subject: [PATCH 371/811] style fixes in QuantumESPRESSO ictce easyconfigs, added ictce/5.5.0 easyconfigs --- ...ESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb | 32 +++++------ ...QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb | 32 +++++------ ...QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb | 32 +++++------ .../QuantumESPRESSO-4.2-goolf-1.4.10.eb | 32 +++++------ .../QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb | 28 +++++----- .../QuantumESPRESSO-4.2-ictce-4.0.6.eb | 28 +++++----- .../QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb | 29 +++++----- .../QuantumESPRESSO-4.2-ictce-5.3.0.eb | 27 +++++----- .../QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb | 41 ++++++++++++++ .../QuantumESPRESSO-4.2-ictce-5.5.0.eb | 37 +++++++++++++ ...PRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb | 38 ++++++------- ...antumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb | 38 ++++++------- ...antumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb | 38 ++++++------- .../QuantumESPRESSO-5.0.2-goolf-1.4.10.eb | 38 ++++++------- ...uantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb | 44 +++++++-------- .../QuantumESPRESSO-5.0.2-ictce-4.0.6.eb | 44 +++++++-------- ...uantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb | 45 ++++++++-------- .../QuantumESPRESSO-5.0.2-ictce-5.3.0.eb | 45 ++++++++-------- ...uantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb | 53 +++++++++++++++++++ .../QuantumESPRESSO-5.0.2-ictce-5.5.0.eb | 49 +++++++++++++++++ 20 files changed, 463 insertions(+), 287 deletions(-) create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb create mode 100644 easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb index afa5eaf4f0..c9c39b7a97 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb @@ -12,25 +12,25 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-errors.patch', - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'want-2.3.0_fix-memstat-issue.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure-LDFLAGS.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-errors.patch', + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'want-2.3.0_fix-memstat-issue.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure-LDFLAGS.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb index e5ec5f6d62..632b84416c 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb @@ -11,25 +11,25 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-errors.patch', - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'want-2.3.0_fix-memstat-issue.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure-LDFLAGS.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-errors.patch', + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'want-2.3.0_fix-memstat-issue.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure-LDFLAGS.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb index 4da00620d4..da2796c1f4 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb @@ -12,25 +12,25 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-errors.patch', - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'want-2.3.0_fix-memstat-issue.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure-LDFLAGS.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-errors.patch', + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'want-2.3.0_fix-memstat-issue.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure-LDFLAGS.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb index 48256367ad..fd96509a3d 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb @@ -11,25 +11,25 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-errors.patch', - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'want-2.3.0_fix-memstat-issue.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure-LDFLAGS.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-errors.patch', + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'want-2.3.0_fix-memstat-issue.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure-LDFLAGS.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb index d4e4a77148..1e05a6e28d 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb @@ -12,23 +12,23 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure_ictce.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb index b91d022bda..d15d97009b 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb @@ -11,23 +11,23 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure_ictce.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb index 9252372604..8e7a8dd992 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb @@ -8,28 +8,27 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure_ictce.patch', - ] + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb index 2c9da47c8d..4ec5d3ed70 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb @@ -7,28 +7,27 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'want-2.3.0.tar.gz', - 'yambo-3.2.1-r.448.tar.gz', + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', ] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz - ] + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] patches = [ - 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', - 'yambo-3.2.1_fix-objects-files.patch', - 'yambo_fix-configure_ictce.patch', - ] + 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', +] makeopts = 'all gipaw vdw w90 want gww xspectra yambo' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb new file mode 100644 index 0000000000..ce2a27d6d2 --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb @@ -0,0 +1,41 @@ +name = 'QuantumESPRESSO' +version = '4.2' +versionsuffix = '-hybrid' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +sources = [ + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', +] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] + +patches = [ + 'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', +] + +makeopts = 'all gipaw vdw w90 want gww xspectra yambo' + +# parallel build tends to fail +parallel = 1 + +# hybrid build (enable OpenMP) +hybrid = True + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb new file mode 100644 index 0000000000..8e4fd12593 --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb @@ -0,0 +1,37 @@ +name = 'QuantumESPRESSO' +version = '4.2' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +sources = [ + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'want-2.3.0.tar.gz', + 'yambo-3.2.1-r.448.tar.gz', + ] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/64/96/', # espresso-4.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # want-2.3.0.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/98/', # yambo-3.2.1-r.448.tar.gz +] + +patches = [ + 'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch', + 'yambo-3.2.1_fix-objects-files.patch', + 'yambo_fix-configure_ictce.patch', +] + +makeopts = 'all gipaw vdw w90 want gww xspectra yambo' + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb index 2de08f4797..25260f443e 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb @@ -13,27 +13,27 @@ toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable (and no longer available) - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = ['yambo-3.2.5_fix-objects-files.patch'] diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb index 4709569909..b8ec946c61 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb @@ -12,27 +12,27 @@ toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable (and no longer available) - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = ['yambo-3.2.5_fix-objects-files.patch'] diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb index 6807d9cc10..0c8b2cd88a 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb @@ -13,27 +13,27 @@ toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable (and no longer available) - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = ['yambo-3.2.5_fix-objects-files.patch'] diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb index 67dfd49bc1..a27849d9f9 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb @@ -12,27 +12,27 @@ toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable (and no longer available) - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = ['yambo-3.2.5_fix-objects-files.patch'] diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb index 47adff3a59..ae7fa28b20 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb @@ -13,32 +13,32 @@ toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = [ - 'yambo-3.2.5_fix-objects-files.patch', - 'QuantumESPRESSO-5.0.2_yambo-fftw.patch', - ] + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-%(version)s_yambo-fftw.patch', +] # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb index f982d909d3..7e9edfdb1a 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb @@ -12,32 +12,32 @@ toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = [ - 'yambo-3.2.5_fix-objects-files.patch', - 'QuantumESPRESSO-5.0.2_yambo-fftw.patch', - ] + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-%(version)s_yambo-fftw.patch', +] # gipaw excluded, because v5.0 isn't stable # xspectra v5.0.2 is nowhere to be found diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb index 2acbc21f76..a72624e45a 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb @@ -8,38 +8,37 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = [ - 'yambo-3.2.5_fix-objects-files.patch', - 'QuantumESPRESSO-5.0.2_yambo-fftw.patch', - ] + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-%(version)s_yambo-fftw.patch', +] # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb index 854d3543cf..e410223931 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb @@ -7,38 +7,37 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ - 'espresso-%s.tar.gz' % version, - 'wannier90-1.2.tar.gz', - 'atomic-5.0.2.tar.gz', - 'neb-5.0.2.tar.gz', - 'PHonon-5.0.2.tar.gz', - 'plumed-1.3-qe.tar.gz', - 'pwcond-5.0.2.tar.gz', - 'tddfpt-5.0.2.tar.gz', - 'want-2.4.0-base.tar.gz', - 'yambo-3.2.5-rev.26.tar.gz', - ] + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] missing_sources = [ - 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable - 'sax-2.0.3.tar.gz', # nowhere to be found - 'xspectra-5.0.2.tar.gz', # nowhere to be found - ] + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] source_urls = [ - 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz - 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz - 'http://files.qe-forge.org/index.php?file=', # others - ] + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] patches = [ - 'yambo-3.2.5_fix-objects-files.patch', - 'QuantumESPRESSO-5.0.2_yambo-fftw.patch', - ] + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-%(version)s_yambo-fftw.patch', +] # gipaw excluded, because v5.0 isn't stable # xspectra v5.0.2 is nowhere to be found diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb new file mode 100644 index 0000000000..bdd20f0388 --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb @@ -0,0 +1,53 @@ +name = 'QuantumESPRESSO' +version = '5.0.2' +versionsuffix = '-hybrid' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +# major part of this list was determined from espresso-5.0.2/install/plugins_list +sources = [ + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] +missing_sources = [ + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] + +patches = [ + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-%(version)s_yambo-fftw.patch', +] + +# parallel build tends to fail +parallel = 1 + +# gipaw excluded, because v5.0 isn't stable +# xspectra v5.0.2 is nowhere to be found +makeopts = 'all w90 want yambo plumed' + +# hybrid build (enable OpenMP) +hybrid = True + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb new file mode 100644 index 0000000000..85601025bc --- /dev/null +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb @@ -0,0 +1,49 @@ +name = 'QuantumESPRESSO' +version = '5.0.2' + +homepage = 'http://www.pwscf.org/' +description = """Quantum ESPRESSO is an integrated suite of computer codes + for electronic-structure calculations and materials modeling at the nanoscale. + It is based on density-functional theory, plane waves, and pseudopotentials + (both norm-conserving and ultrasoft).""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +# major part of this list was determined from espresso-5.0.2/install/plugins_list +sources = [ + 'espresso-%(version)s.tar.gz', + 'wannier90-1.2.tar.gz', + 'atomic-5.0.2.tar.gz', + 'neb-5.0.2.tar.gz', + 'PHonon-5.0.2.tar.gz', + 'plumed-1.3-qe.tar.gz', + 'pwcond-5.0.2.tar.gz', + 'tddfpt-5.0.2.tar.gz', + 'want-2.4.0-base.tar.gz', + 'yambo-3.2.5-rev.26.tar.gz', +] +missing_sources = [ + 'qe-gipaw-5.0.tar.gz', # gipaw excluded, because v5.0 isn't stable + 'sax-2.0.3.tar.gz', # nowhere to be found + 'xspectra-5.0.2.tar.gz', # nowhere to be found +] +source_urls = [ + 'http://www.qe-forge.org/gf/download/frsrelease/116/403/', # espresso-5.0.2.tar.gz + 'http://www.qe-forge.org/gf/download/frsrelease/64/97/', # wannier90-1.2.tar.gz + 'http://files.qe-forge.org/index.php?file=', # others +] + +patches = [ + 'yambo-3.2.5_fix-objects-files.patch', + 'QuantumESPRESSO-%(version)s_yambo-fftw.patch', +] + +# gipaw excluded, because v5.0 isn't stable +# xspectra v5.0.2 is nowhere to be found +makeopts = 'all w90 want yambo plumed' + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'chem' -- GitLab From acb14a42a753bfd322ac65737188d345b8786de7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 1 Dec 2013 09:43:37 +0100 Subject: [PATCH 372/811] enable openmp toolchain option for hybrid QuantumESPRESSO builds --- .../QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb | 2 +- .../QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb | 2 +- .../q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb | 2 +- .../q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb | 2 +- .../q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb | 2 +- .../QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb | 2 +- .../QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb | 2 +- .../QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb | 2 +- .../QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb | 2 +- .../QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb index c9c39b7a97..c7c70b133c 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} sources = [ 'espresso-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb index da2796c1f4..106b9ec5dc 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb @@ -9,7 +9,7 @@ It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} sources = [ 'espresso-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb index 1e05a6e28d..ff1ccd416c 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'ictce', 'version': '4.0.6'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} sources = [ 'espresso-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb index 8e7a8dd992..cd5c794061 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} sources = [ 'espresso-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb index ce2a27d6d2..1dd41c052b 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} sources = [ 'espresso-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb index 25260f443e..4d7911d2df 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb index 0c8b2cd88a..df07d19513 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb @@ -9,7 +9,7 @@ It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb index ae7fa28b20..5376b7ca12 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'ictce', 'version': '4.0.6'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb index a72624e45a..63c5ce63fa 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb index bdd20f0388..04ad81b30e 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb @@ -9,7 +9,7 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes (both norm-conserving and ultrasoft).""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'usempi': True} +toolchainopts = {'usempi': True, 'openmp': True} # major part of this list was determined from espresso-5.0.2/install/plugins_list sources = [ -- GitLab From 937083aacdf17b525945b56a1d2a7a14b0cc1e12 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 1 Dec 2013 14:21:52 +0100 Subject: [PATCH 373/811] add missing Doxygen easyconfig --- .../d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..f5c2ee7700 --- /dev/null +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb @@ -0,0 +1,18 @@ +name = 'Doxygen' +version = '1.8.3.1' + +homepage = 'http://www.doxygen.org' +description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, +IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = ['%(namelower)s-%(version)s.src.tar.gz'] +source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] + +dependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +moduleclass = 'devel' -- GitLab From f642702aa779d9a7a9ea626b6df80a61495fb227 Mon Sep 17 00:00:00 2001 From: pescobar Date: Mon, 2 Dec 2013 00:15:34 +0100 Subject: [PATCH 374/811] added BWA-0.7.5a-goolf-1.4.10.eb --- .../b/BWA/BWA-0.7.5a-goolf-1.4.10.eb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb new file mode 100644 index 0000000000..f2eec4ae3c --- /dev/null +++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB +# Authors:: George Tsouloupas , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'BWA' +version = '0.7.5a' + +homepage = 'http://bio-bwa.sourceforge.net/' +description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns + relatively short nucleotide sequences against a long reference sequence such as the human genome.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [('http://sourceforge.net/projects/bio-bwa/files/', 'download')] + +moduleclass = 'bio' -- GitLab From 28963ed8aa8ec0e239a160226a6aa1ce75da7e90 Mon Sep 17 00:00:00 2001 From: pescobar Date: Mon, 2 Dec 2013 00:22:26 +0100 Subject: [PATCH 375/811] removed R-3.0.2-goolf-1.4.10-bare.eb from this PR --- .../r/R/R-3.0.2-goolf-1.4.10-bare.eb | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb deleted file mode 100644 index d0aa0dd324..0000000000 --- a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10-bare.eb +++ /dev/null @@ -1,37 +0,0 @@ -name = 'R' -version = '3.0.2' -versionsuffix = '-bare' # bare, as in no extensions included - -homepage = 'http://www.r-project.org/' -description = """R is a free software environment for statistical computing and graphics.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -sources = [SOURCE_TAR_GZ] -source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s'] - -preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"' -configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib" -# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below -configopts += " --with-recommended-packages=no" - -dependencies = [ - ('libreadline', '6.2'), - ('ncurses', '5.9'), - ('libpng', '1.6.2'), # for plotting in R - ('Java', '1.7.0_21', '', True), # Java bindings are built if Java is found, might as well provide it -] - -exts_list = [] # just to make it explicit this module doesn't include any extensions - -sanity_check_paths = { - 'files': ['bin/%s' % x for x in ['R', 'Rscript']] + - ['lib64/R/include/%s' % x for x in ['Rconfig.h', 'Rdefines.h', 'Rembedded.h', - 'R.h', 'Rinterface.h', 'Rinternals.h', - 'Rmath.h', 'Rversion.h', 'S.h']] + - ['lib64/R/modules/%s' % x for x in ['internet.so', 'lapack.so', 'vfonts.so']] + - ['lib64/R/lib/libR.so'], - 'dirs': [] -} - -moduleclass = 'lang' -- GitLab From febf46f8ca1625de7ae5034c13eff05b782317f7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 10:14:07 +0100 Subject: [PATCH 376/811] use -mt version of netCDF libraries for ESMF and NCL, add patch file for ESMF --- .../c/cURL/cURL-7.27.0-ictce-4.1.13.eb | 22 ++++++++++++++ .../d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb | 18 +++++++++++ .../e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb | 12 ++++---- .../e/ESMF/ESMF-6.1.1_libopts.patch | 11 +++++++ .../HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb | 30 +++++++++++++++++++ .../libjpeg-turbo-1.3.0-ictce-4.1.13.eb | 21 +++++++++++++ .../n/NASM/NASM-2.07-ictce-4.1.13.eb | 29 ++++++++++++++++++ .../n/NCL/NCL-6.1.2-ictce-4.1.13.eb | 6 ++-- .../netCDF-C++-4.2-ictce-4.1.13-mt.eb | 26 ++++++++++++++++ .../netCDF-Fortran-4.2-ictce-4.1.13-mt.eb | 18 +++++++++++ .../netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb | 20 +++++++++++++ 11 files changed, 205 insertions(+), 8 deletions(-) create mode 100644 easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb create mode 100644 easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb create mode 100644 easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb create mode 100644 easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..595b5ff8ef --- /dev/null +++ b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb @@ -0,0 +1,22 @@ +name = 'cURL' +version = '7.27.0' + +homepage = 'http://curl.haxx.se' +description = """libcurl is a free and easy-to-use client-side URL transfer library, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports + SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, + proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, + Kerberos), file transfer resume, http proxy tunneling and more.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://curl.haxx.se/download/'] + +sanity_check_paths = { + 'files': ["bin/curl", "lib/libcurl.a", "lib/libcurl.so"], + 'dirs': ["lib/pkgconfig"], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..1af9922e91 --- /dev/null +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb @@ -0,0 +1,18 @@ +name = 'Doxygen' +version = '1.8.3.1' + +homepage = 'http://www.doxygen.org' +description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, +IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = ['%(namelower)s-%(version)s.src.tar.gz'] +source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] + +dependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb index f76aa98e59..5d118d3698 100644 --- a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb @@ -9,16 +9,18 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'usempi': True} source_urls = [SOURCEFORGE_SOURCE] -sources = ['%s_%s_src.tar.gz' % (name.lower(), '_'.join(version.split('.')))] +sources = ['%%(namelower)s_%s_src.tar.gz' % '_'.join(version.split('.'))] + +patches = ['ESMF-6.1.1_libopts.patch'] dependencies = [ - ('netCDF', '4.2.1.1'), - ('netCDF-Fortran', '4.2'), - ('netCDF-C++', '4.2'), + ('netCDF', '4.2.1.1', '-mt'), + ('netCDF-Fortran', '4.2', '-mt'), + ('netCDF-C++', '4.2', '-mt'), ] # LDFLAGS has to be unset to avoid linking issues -preinstallopts = "unset LDFLAGS && " +preinstallopts = "unset LDFLAGS &&" # too parallel causes the build to become really slow maxparallel = 8 diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch new file mode 100644 index 0000000000..0d03f78059 --- /dev/null +++ b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch @@ -0,0 +1,11 @@ +--- esmf/build/common.mk.orig 2013-11-26 16:58:50.958274359 +0100 ++++ esmf/build/common.mk 2013-11-26 16:59:02.339274158 +0100 +@@ -896,7 +896,7 @@ + endif + ESMF_SL_LIBS_TO_MAKE = libesmf + ESMF_SL_LIBLINKER = $(ESMF_CXXCOMPILER) +-ESMF_SL_LIBOPTS += ++ESMF_SL_LIBOPTS += $(ESMF_CXXCOMPILEOPTS) + ESMF_SL_LIBLIBS += + + # - Shared objects diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb new file mode 100644 index 0000000000..b1532bad95 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb @@ -0,0 +1,30 @@ +name = 'HDF5' +version = '1.8.10' +versionsuffix = "-gpfs-mt" + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management + of extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'HDF5_%(version)s_configure_ictce.patch', + 'HDF5-%(version)s_mpi-includes_order_fix.patch', +] + +dependencies = [ + ('zlib', '1.2.7'), + ('Szip','2.1'), +] + +configopts = "--enable-gpfs --enable-threadsafe --enable-production " + +preconfigopts = 'export FFLAGS="-fopenmp $FFLAGS" && export F90FLAGS="-fopenmp $F90FLAGS" && ' +premakeopts = 'export FFLAGS="-fopenmp $FFLAGS" && export F90FLAGS="-fopenmp $F90FLAGS" && ' + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..a8b098068f --- /dev/null +++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'libjpeg-turbo' +version = '1.3.0' + +homepage = 'http://sourceforge.net/libjpeg-turbo/' +description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG +compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding. +""" +toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.10'}) +toolchainopts = {'pic': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('NASM', '2.07'), +] + +configopts = "--with-jpeg8" +runtest = "test" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb b/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb new file mode 100644 index 0000000000..f6a342b73a --- /dev/null +++ b/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb @@ -0,0 +1,29 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html +## + +name = 'NASM' +version = '2.07' + +homepage = 'http://nasm.sourceforge.net/' +description = """NASM-2.07: General-purpose x86 assembler""" + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/nasm/files', 'download'] + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sanity_check_paths = { + 'files': ['bin/nasm'], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb index 6006d25573..f2f25fd0a4 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb @@ -6,7 +6,7 @@ description = """NCL is an interpreted language designed specifically for scient visualization.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -toolchainopts = {'opt': True, 'pic': True, 'usempi': True} +toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'openmp': True} sources = ['%(namelower)s_ncarg-%(version)s.tar.gz'] @@ -16,8 +16,8 @@ patches = [ dependencies = [ ('cURL', '7.28.1'), - ('netCDF', '4.2.1.1'), - ('netCDF-Fortran', '4.2'), + ('netCDF', '4.2.1.1', '-mt'), + ('netCDF-Fortran', '4.2', '-mt'), ('JasPer', '1.900.1'), ('g2lib', '1.4.0'), ('g2clib', '1.4.0'), diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb new file mode 100644 index 0000000000..df031c2880 --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb @@ -0,0 +1,26 @@ +name = 'netCDF-C++' +version = '4.2' +versionsuffix = '-mt' + +homepage = 'http://www.unidata.ucar.edu/software/netcdf/' +description = """NetCDF (network Common Data Form) is a set of software libraries + and machine-independent data formats that support the creation, access, and sharing of array-oriented + scientific data.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True, 'openmp': True} + +sources = ['netcdf-cxx-%(version)s.tar.gz'] +source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] + +dependencies = [ + ('netCDF', '4.2.1.1', versionsuffix), + ('cURL', '7.28.1'), +] + +sanity_check_paths = { + 'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'], + 'dirs': [], +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb new file mode 100644 index 0000000000..6b36f2c00b --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb @@ -0,0 +1,18 @@ +name = 'netCDF-Fortran' +version = '4.2' +versionsuffix = '-mt' + +homepage = 'http://www.unidata.ucar.edu/software/netcdf/' +description = """NetCDF (network Common Data Form) is a set of software libraries + and machine-independent data formats that support the creation, access, and sharing of array-oriented + scientific data.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True, 'openmp': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] + +dependencies = [('netCDF', '4.2.1.1', versionsuffix)] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb new file mode 100644 index 0000000000..1d208f1301 --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb @@ -0,0 +1,20 @@ +name = 'netCDF' +version = '4.2.1.1' +versionsuffix = '-mt' + +homepage = 'http://www.unidata.ucar.edu/software/netcdf/' +description = """NetCDF (network Common Data Form) is a set of software libraries + and machine-independent data formats that support the creation, access, and sharing of array-oriented + scientific data.""" + +toolchain = {'name':'ictce','version':'4.1.13'} +toolchainopts = {'pic': True, 'openmp': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] + +dependencies = [('HDF5', '1.8.10', '-gpfs-mt')] + +builddependencies = [('Doxygen', '1.8.3.1')] + +moduleclass = 'data' -- GitLab From 0a93f7cd4cc6ff4ed4d05f725ab47adc7d377ceb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 10:14:24 +0100 Subject: [PATCH 377/811] correct dep versions --- easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index a3407d071e..a83caaaf0c 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -8,8 +8,8 @@ toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), + ('flex', '2.5.37'), + ('Bison', '2.7'), ('Szip', '2.1'), ('JasPer', '1.900.1'), ] -- GitLab From c38e0ebc22110d36d71f7527212cd03f1fb005ce Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 10:16:02 +0100 Subject: [PATCH 378/811] add missing easyconfigs --- .../b/Bison/Bison-2.5-ictce-5.5.0.eb | 20 +++++++++++ .../c/CP2K/CP2K-20111205-ictce-5.5.0.eb | 33 +++++++++++++++++++ .../f/flex/flex-2.5.35-ictce-5.5.0.eb | 14 ++++++++ .../easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb | 23 +++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb new file mode 100644 index 0000000000..f025220a43 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.5' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar + into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb new file mode 100644 index 0000000000..57f859f95c --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb @@ -0,0 +1,33 @@ +name = 'CP2K' +version = '20111205' + +homepage = 'http://www.cp2k.org' +description = """CP2K is a freely available (GPL) program, written in Fortran 95, + to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems. + It provides a general framework for different methods such as e.g. density functional theory (DFT) + using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """ + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCE_TAR_GZ] + +patches = [ + 'fix_compile_date_lastcvs.patch', + 'do_regtest_nocompile.patch', +] + +builddependencies = [ + ('flex', '2.5.35'), + ('Bison', '2.5'), +] + +dependencies = [('Libint', '1.1.4')] + +# don't use parallel make, results in compilation failure +# because Fortran module files aren't created before they are needed +parallel = 1 + +# regression test reports failures (120/2196 tests fail with segfault) +ignore_regtest_fails = True + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb new file mode 100644 index 0000000000..4cd202259c --- /dev/null +++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb @@ -0,0 +1,14 @@ +name = 'flex' +version = '2.5.35' + +homepage = 'http://flex.sourceforge.net/' +description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, + sometimes called a tokenizer, is a program which recognizes lexical patterns in text.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb new file mode 100644 index 0000000000..07b38b0359 --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb @@ -0,0 +1,23 @@ +name = 'M4' +version = '1.4.16' + +homepage = 'http://www.gnu.org/software/m4/m4.html' +description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible + although it has some extensions (for example, handling more than 9 positional parameters to macros). GNU M4 also has + built-in functions for including files, running shell commands, doing arithmetic, etc.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/m4'] + +patches = ['M4-%(version)s-no-gets.patch'] + +configopts = "--enable-cxx" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From 7688a8778f587d7f11befeb68687629f2752a0dd Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 10:45:39 +0100 Subject: [PATCH 379/811] add missing Doxygen easyconfig file --- .../d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb new file mode 100644 index 0000000000..1af9922e91 --- /dev/null +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb @@ -0,0 +1,18 @@ +name = 'Doxygen' +version = '1.8.3.1' + +homepage = 'http://www.doxygen.org' +description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, +IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = ['%(namelower)s-%(version)s.src.tar.gz'] +source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] + +dependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +moduleclass = 'devel' -- GitLab From 4218a17cf13f9ef6d689c5457f24cf691ab6c135 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 10:54:47 +0100 Subject: [PATCH 380/811] add missing Bison easyconfig file --- .../b/Bison/Bison-2.7-ictce-5.3.0.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb new file mode 100644 index 0000000000..996f2950d9 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.7' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar + into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files':["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs':[], +} + +moduleclass = 'lang' -- GitLab From 61c748052fed4287bcfeb4ab482cb7a6e2c58680 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 2 Dec 2013 18:22:26 +0100 Subject: [PATCH 381/811] added new packages to R --- .../easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..bc9a5be12c --- /dev/null +++ b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb @@ -0,0 +1,143 @@ +name = 'R' +version = '3.0.2' + +homepage = 'http://www.r-project.org/' +description = """R is a free software environment for statistical computing and graphics.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s'] + +preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"' +configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib" +# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below +configopts += " --with-recommended-packages=no" + +dependencies = [ + ('libreadline', '6.2'), + ('ncurses', '5.9'), + ('libpng', '1.6.6'), # for plotting in R + ('Java', '1.7.0_21', '', True), # Java bindings are built if Java is found, might as well provide it +] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['R', 'Rscript']] + + ['lib64/R/include/%s' % x for x in ['Rconfig.h', 'Rdefines.h', 'Rembedded.h', + 'R.h', 'Rinterface.h', 'Rinternals.h', + 'Rmath.h', 'Rversion.h', 'S.h']] + + ['lib64/R/modules/%s' % x for x in ['internet.so', 'lapack.so', 'vfonts.so']] + + ['lib64/R/lib/libR.so'], + 'dirs': [] +} + +name_tmpl = '%(name)s_%(version)s.tar.gz' +ext_options = { + 'source_urls': [ + 'http://cran.r-project.org/src/contrib/Archive/%(name)s', # package archive + 'http://cran.freestatistics.org/src/contrib', # alternative for packages + ], + 'source_tmpl': name_tmpl, +} +# Bioconductor packages have a different download url +bioconductor_options = { + 'source_urls': ['http://www.bioconductor.org/packages/2.13/bioc/src/contrib/'], + 'source_tmpl': name_tmpl, +} +# !! order of packages is important !! +exts_list = [ + # default libraries, only here to sanity check their presence + 'base', + 'datasets', + 'graphics', + 'grDevices', + 'grid', + 'methods', + 'splines', + 'stats', + 'stats4', + 'tools', + 'utils', + # non-standard libraries, should be specified with fixed versions! + ('irace', '1.04', ext_options), + ('rJava', '0.9-4', ext_options), + ('lattice', '0.20-24', ext_options), + ('RColorBrewer', '1.0-5', ext_options), + ('latticeExtra', '0.6-26', ext_options), + ('Matrix', '1.1-0', ext_options), + ('png', '0.1-6', ext_options), + ('Rcpp', '0.10.6', ext_options), + ('quadprog', '1.5-5', ext_options), + ('BB', '2013.4-1', ext_options), + ('rlecuyer', '0.3-3', ext_options), + ('snow', '0.3-13', ext_options), + ('MASS', '7.3-29', ext_options), + ('class', '7.3-9', ext_options), + ('e1071', '1.6-1', ext_options), + ('nnet', '7.3-7', ext_options), + ('car', '2.0-19', ext_options), + ('colorspace', '1.2-4', ext_options), + ('robustbase', '0.9-10', ext_options), + ('sp', '1.0-14', ext_options), + ('vcd', '1.3-1', ext_options), + ('snowfall', '1.84-4', ext_options), + ('rpart', '4.1-3', ext_options), + ('mice', '2.18', ext_options), + ('nlme', '3.1-111', ext_options), + ('mgcv', '1.7-27', ext_options), + ('logistf', '1.21', ext_options), + ('akima', '0.5-11', ext_options), + ('bitops', '1.0-6', ext_options), + ('boot', '1.3-9', ext_options), + ('cluster', '1.14.4', ext_options), + ('coda', '0.16-1', ext_options), + ('codetools', '0.2-8', ext_options), + ('DBI', '0.2-7', ext_options), + ('foreign', '0.8-57', ext_options), + ('survival', '2.37-4', ext_options), + ('gam', '1.09', ext_options), + ('gamlss.data', '4.2-6', ext_options), + ('gamlss.dist', '4.2-0', ext_options), + ('hwriter', '1.3', ext_options), + ('KernSmooth', '2.23-10', ext_options), + ('zoo', '1.7-10', ext_options), + ('lmtest', '0.9-32', ext_options), + ('mnormt', '1.4-5', ext_options), + ('mvtnorm', '0.9-9996', ext_options), + ('numDeriv', '2012.9-1', ext_options), + ('pscl', '1.04.4', ext_options), + ('RSQLite', '0.11.4', ext_options), + ('sandwich', '2.3-0', ext_options), + ('sfsmisc', '1.0-24', ext_options), + ('spatial', '7.3-7', ext_options), + ('VGAM', '0.9-3', ext_options), + ('waveslim', '1.7.1', ext_options), + ('xtable', '1.7-1', ext_options), + ('profileModel', '0.5-9', ext_options), + ('brglm', '0.5-9', ext_options), + ('deSolve', '1.10-8', ext_options), + ('odesolve', '0.9-9', ext_options), + ('tseriesChaos', '0.1-13', ext_options), + ('tseries', '0.10-32', ext_options), + ('neuRosim', '0.2-10', ext_options), + ('fastICA', '1.2-0', ext_options), + ('R.methodsS3', '1.5.2', ext_options), + ('R.oo', '1.15.8', ext_options), + ('R.matlab', '2.0.5', ext_options), + ('Rniftilib', '0.0-32', ext_options), + ('BiocGenerics', '0.8.0', bioconductor_options), + ('Biobase', '2.22.0', bioconductor_options), + ('IRanges', '1.20.5', bioconductor_options), + ('AnnotationDbi', '1.24.0', bioconductor_options), + ('XVector', '0.2.0', bioconductor_options), + ('Biostrings', '2.30.0', bioconductor_options), + ('GenomicRanges', '1.14.3', bioconductor_options), + ('BSgenome', '1.30.0', bioconductor_options), + ('zlibbioc', '1.8.0', bioconductor_options), + ('Rsamtools', '1.14.1', bioconductor_options), + ('ShortRead', '1.20.0', bioconductor_options), + ('graph', '1.40.0', bioconductor_options), + ('igraph0', '0.5.7', ext_options), +] + +moduleclass = 'lang' -- GitLab From 609d165edebb843df70ded77de548d4e9505d4fa Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 2 Dec 2013 18:23:24 +0100 Subject: [PATCH 382/811] added bedtools --- .../BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb | 20 +++++++++++++++++++ .../BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb | 15 ++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..41345eb68e --- /dev/null +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb @@ -0,0 +1,20 @@ +easyblock = 'MakeCp' +name = 'BEDTools' +version = 'v2.17.0' + +homepage = 'http://code.google.com/p/bedtools/' +description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module + allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ["http://bedtools.googlecode.com/files/"] +sources = ['%(name)s.%(version)s.tar.gz'] + +dirs = ["bin", "data", "docs", "genomes", 'scripts'] +# copy all directories to the installation directory +files_to_copy = dirs + +sanity_check_paths = {'files': [], 'dirs': dirs} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb new file mode 100644 index 0000000000..57c9ecc225 --- /dev/null +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb @@ -0,0 +1,15 @@ +name = 'BEDTools' +version = 'v2.17.0' + +homepage = 'http://code.google.com/p/bedtools/' +description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module + allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ["http://bedtools.googlecode.com/files/"] +sources = ['%(name)s.%(version)s.tar.gz'] + +skipsteps = ['configure'] + +moduleclass = 'bio' -- GitLab From d222b60e44a360880ced9a75ea0b3603e5e90e6c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 18:25:27 +0100 Subject: [PATCH 383/811] bump extension versions to latest in Python 2.7.6 easyconfig --- .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index adc6635723..9d19f216fe 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} -numpyversion = '1.7.0' -scipyversion = '0.12.0' +numpyversion = '1.8.0' +scipyversion = '0.13.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] @@ -23,25 +23,25 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '1.4.2', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), - ('pip', '1.1', { + ('pip', '1.4.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], }), - ('nose', '1.1.2', { + ('nose', '1.3.0', { 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, + 'numpy-%s-mkl.patch' % numpyversion, ], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], }), - ('mpi4py', '1.3', { + ('mpi4py', '1.3.1', { 'source_urls': ['https://mpi4py.googlecode.com/files/'], }), ('paycheck', '1.0.2', { @@ -53,10 +53,10 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.19.2', { 'source_urls': ['http://www.cython.org/release/'], }), - ('dateutil', '2.1', { + ('dateutil', '2.2', { 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], }), -- GitLab From 4a578d690711c117c5c9f1ef7ad3365d6d47efbb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 18:26:49 +0100 Subject: [PATCH 384/811] restory faulty version bumps for setuptools and Cython, remove numpy-iqacml.patch where it's not required --- .../easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb | 4 ++-- .../p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb | 4 ++-- .../easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 4 ++-- .../easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb | 4 ++-- .../p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb | 4 ++-- .../p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb | 4 ++-- .../easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 4 ++-- .../easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb | 4 ++-- .../p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb | 4 ++-- .../easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb | 4 ++-- .../easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb | 9 +++------ .../easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb | 4 ++-- 21 files changed, 52 insertions(+), 82 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb index 4a0b5c7d11..40021bd464 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb @@ -21,7 +21,7 @@ dependencies = [ ('ncurses', '5.9-20130406'), ]# order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -51,7 +51,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb index a613874ed7..84f064c627 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb @@ -22,7 +22,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -33,10 +33,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -53,7 +50,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb index 8474696bf4..e855f7175e 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb @@ -23,7 +23,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -53,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb index 63570ad089..1876113358 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb @@ -23,7 +23,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -34,10 +34,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -54,7 +51,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index db195c0bbe..a38b2c3f31 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -22,7 +22,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -52,7 +52,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb index 8c99e72128..c89425f2de 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb @@ -22,7 +22,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -52,7 +52,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb index e1bf5116c1..137c961318 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb @@ -23,7 +23,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -53,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb index b70cb62012..1155745345 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb @@ -22,7 +22,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -52,7 +52,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index 9337284cb3..1f0a6d0a81 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -22,7 +22,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -52,7 +52,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb index 1f9a33d788..3b07a66bff 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb @@ -24,7 +24,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -35,10 +35,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -55,7 +52,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb index c9f07cf92c..dde1df538f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb index 1518cbeadc..9250403c43 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb index fe22e97e4c..17649568df 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb index 00c9c8c84b..95ba9a38e7 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb @@ -25,7 +25,7 @@ dependencies = [ ] # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb index 3842277046..f7db99ce7f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb @@ -26,7 +26,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -57,7 +57,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb index b3c8bdbff1..2447f7bc5d 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index ee3eba59bf..7c65b339df 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -26,7 +26,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -56,7 +56,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index 88226659dc..7031a25f57 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -55,7 +55,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index 50e419b7ce..3f66b26c69 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 5b599ff1d0..a7284262e3 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -25,7 +25,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -36,10 +36,7 @@ exts_list = [ }), ('numpy', numpyversion, { 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], - 'patches': [ - 'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion, - 'numpy-iqacml.patch', - ], + 'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion], }), ('scipy', scipyversion, { 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], @@ -56,7 +53,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index 00445c611f..a510ac66d6 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -26,7 +26,7 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { + ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], }), ('pip', '1.1', { @@ -57,7 +57,7 @@ exts_list = [ ('lockfile', '0.9.1', { 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], }), - ('Cython', '0.19.1', { + ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), ('dateutil', '2.1', { -- GitLab From 312fa97b489d76c31d4238038366a7c7caf3083d Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 2 Dec 2013 18:30:39 +0100 Subject: [PATCH 385/811] now really added new packages, previous commit was just goolf version of the latest ictce R ec --- .../easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb | 14 ++++++++++++++ easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb index bc9a5be12c..ad736c3c91 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb @@ -138,6 +138,20 @@ exts_list = [ ('ShortRead', '1.20.0', bioconductor_options), ('graph', '1.40.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('plyr', '1.8', ext_options), + ('dichromat', '2.0-0', ext_options), + ('Formula', '1.1-1', ext_options), + ('Hmisc', '3.13-0', ext_options), + ('stringr', '0.6.2', ext_options), + ('munsell', '0.4.2', ext_options), + ('labeling', '0.2', ext_options), + ('scales', '0.2.3', ext_options), + ('fastcluster', '1.1.11', ext_options), + ('reshape2', '1.2.2', ext_options), + ('digest', '0.6.3', ext_options), + ('gtable', '0.1.2', ext_options), + ('proto', '0.3-10', ext_options), + ('ggplot2', '0.9.3.1', ext_options), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb index 1f762f49eb..0daaec2313 100644 --- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb @@ -18,7 +18,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ('libpng', '1.6.6'), # for plotting in R - ('Java', '1.7.0_21', '', True), # Java bindings are built if Java is found, might as well provide it + ('Java', '1.7.0_15', '', True), # Java bindings are built if Java is found, might as well provide it ] sanity_check_paths = { @@ -138,6 +138,20 @@ exts_list = [ ('ShortRead', '1.20.0', bioconductor_options), ('graph', '1.40.0', bioconductor_options), ('igraph0', '0.5.7', ext_options), + ('plyr', '1.8', ext_options), + ('dichromat', '2.0-0', ext_options), + ('Formula', '1.1-1', ext_options), + ('Hmisc', '3.13-0', ext_options), + ('stringr', '0.6.2', ext_options), + ('munsell', '0.4.2', ext_options), + ('labeling', '0.2', ext_options), + ('scales', '0.2.3', ext_options), + ('fastcluster', '1.1.11', ext_options), + ('reshape2', '1.2.2', ext_options), + ('digest', '0.6.3', ext_options), + ('gtable', '0.1.2', ext_options), + ('proto', '0.3-10', ext_options), + ('ggplot2', '0.9.3.1', ext_options), ] moduleclass = 'lang' -- GitLab From e9ca73e70aeeae0ae6422d0ed1cffd1e1b9076bb Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 2 Dec 2013 18:32:09 +0100 Subject: [PATCH 386/811] fixed ictce bedtools config --- .../easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb index 57c9ecc225..cd12416d3a 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb @@ -10,6 +10,10 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ["http://bedtools.googlecode.com/files/"] sources = ['%(name)s.%(version)s.tar.gz'] -skipsteps = ['configure'] +dirs = ["bin", "data", "docs", "genomes", 'scripts'] +# copy all directories to the installation directory +files_to_copy = dirs + +sanity_check_paths = {'files': [], 'dirs': dirs} moduleclass = 'bio' -- GitLab From d18b7c3f0592aa1a88151b4aa0ac760f557c132e Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 2 Dec 2013 18:36:26 +0100 Subject: [PATCH 387/811] fixed description --- .../b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb | 7 +++++-- .../b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb index 41345eb68e..8186926dfe 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb @@ -3,8 +3,11 @@ name = 'BEDTools' version = 'v2.17.0' homepage = 'http://code.google.com/p/bedtools/' -description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module - allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" +description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and +computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. +Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" +several BEDTools together. The following are examples of common questions that one can address with BEDTools. +""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb index cd12416d3a..1de87ad34b 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb @@ -2,8 +2,12 @@ name = 'BEDTools' version = 'v2.17.0' homepage = 'http://code.google.com/p/bedtools/' -description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module - allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" +description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and +computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. +Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" +several BEDTools together. The following are examples of common questions that one can address with BEDTools. +""" + toolchain = {'name': 'ictce', 'version': '4.1.13'} -- GitLab From 78110085329026895dbe6be65f56e475962fee71 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 2 Dec 2013 18:39:51 +0100 Subject: [PATCH 388/811] fixed ictce for real now --- .../easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb index 1de87ad34b..adcf9bdf19 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb @@ -1,3 +1,4 @@ +easyblock = 'MakeCp' name = 'BEDTools' version = 'v2.17.0' -- GitLab From 4c194732eccc37ef9670904c03b276df15555563 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 2 Dec 2013 18:56:44 +0100 Subject: [PATCH 389/811] add required patch file for numpy v1.8.0 extension --- .../p/Python/numpy-1.8.0-mkl.patch | 213 ++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch diff --git a/easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch b/easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch new file mode 100644 index 0000000000..f2ffc7677b --- /dev/null +++ b/easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch @@ -0,0 +1,213 @@ +diff -ur numpy-1.8.0.orig/numpy/distutils/fcompiler/__init__.py numpy-1.8.0-2/numpy/distutils/fcompiler/__init__.py +--- numpy-1.8.0.orig/numpy/distutils/fcompiler/__init__.py 2013-10-30 19:31:40.000000000 +0100 ++++ numpy-1.8.0-2/numpy/distutils/fcompiler/__init__.py 2013-11-06 15:40:52.146711618 +0100 +@@ -628,7 +628,10 @@ + return options + + def library_option(self, lib): +- return "-l" + lib ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib + def library_dir_option(self, dir): + return "-L" + dir + +diff -ur numpy-1.8.0.orig/numpy/distutils/system_info.py numpy-1.8.0-2/numpy/distutils/system_info.py +--- numpy-1.8.0.orig/numpy/distutils/system_info.py 2013-10-30 19:31:40.000000000 +0100 ++++ numpy-1.8.0-2/numpy/distutils/system_info.py 2013-11-06 15:42:32.397199094 +0100 +@@ -600,7 +600,7 @@ + if is_string(default): + return [default] + return default +- return [b for b in [a.strip() for a in libs.split(',')] if b] ++ return [b for b in [a.strip().replace(':',',') for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): + return self.get_libs(key, '') +@@ -642,6 +642,23 @@ + lib_dirs) + return info + ++ def check_libs_all(self,lib_dir,libs,opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks for all libraries as shared libraries first, then ++ static (or vice versa if self.search_static_first is True). ++ """ ++ exts = self.library_extensions() ++ info = None ++ for ext in exts: ++ info = self._check_libs_all(lib_dir,libs,opt_libs,[ext]) ++ if info is not None: ++ break ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), lib_dir) ++ return info ++ + def check_libs2(self, lib_dirs, libs, opt_libs=[]): + """If static or shared libraries are available then return + their info dictionary. +@@ -655,6 +672,18 @@ + lib_dirs) + return info + ++ def check_libs2_all(self, lib_dirs, libs, opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks each library for shared or static. ++ """ ++ exts = self.library_extensions() ++ info = self._check_libs_all(lib_dirs,libs,opt_libs,exts) ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), os.pathsep.join(lib_dirs)) ++ return info ++ + def _lib_list(self, lib_dir, libs, exts): + assert is_string(lib_dir) + liblist = [] +@@ -665,6 +694,9 @@ + lib_prefixes = ['lib'] + # for each library name, see if we can find a file for it. + for l in libs: ++ if l[0]=='-': ++ liblist.append(l) ++ continue + for ext in exts: + for prefix in lib_prefixes: + p = self.combine_paths(lib_dir, prefix + l + ext) +@@ -680,6 +712,19 @@ + break + return liblist + ++ def _lib_list_all(self, lib_dirs, libs, exts): ++ assert (type(lib_dirs)==list) ++ if lib_dirs: ++ assert is_string(lib_dirs[0]) ++ liblist=[] ++ for lib_dir in lib_dirs: ++ ls=self._lib_list(lib_dir,libs,exts) ++ for l in ls: ++ log.info("(_lib_list_all) Found %s in %s"%(l,lib_dir)) ++ if l not in liblist: ++ liblist.append(l) ++ return liblist ++ + def _check_libs(self, lib_dirs, libs, opt_libs, exts): + """Find mandatory and optional libs in expected paths. + +@@ -721,6 +766,22 @@ + else: + return None + ++ def _check_libs_all(self, lib_dirs, libs, opt_libs, exts): ++ found_libs_unordered = self._lib_list_all(lib_dirs, libs, exts) ++ # ensure same order as in lib_dirs ++ found_libs = [] ++ for lib_dir in libs: ++ if lib_dir in found_libs_unordered: ++ found_libs.append(lib_dir) ++ if len(found_libs) == len(libs): ++ info = {'libraries' : found_libs, 'library_dirs' : lib_dirs} ++ opt_found_libs = self._lib_list_all(lib_dirs, opt_libs, exts) ++ if len(opt_found_libs) == len(opt_libs): ++ info['libraries'].extend(opt_found_libs) ++ return info ++ else: ++ return ++ + def combine_paths(self, *args): + """Return a list of existing paths composed by all combinations + of items from the arguments. +@@ -956,9 +1017,11 @@ + lib_dirs = self.get_lib_dirs() + incl_dirs = self.get_include_dirs() + mkl_libs = self.get_libs('mkl_libs', self._lib_mkl) +- info = self.check_libs2(lib_dirs, mkl_libs) +- if info is None: ++ mkl = None ++ mkl = self.check_libs2_all(lib_dirs,mkl_libs) ++ if mkl is None: + return ++ info = mkl + dict_append(info, + define_macros=[('SCIPY_MKL_H', None)], + include_dirs=incl_dirs) +@@ -1020,16 +1083,13 @@ + atlas = None + lapack = None + atlas_1 = None +- for d in lib_dirs: +- atlas = self.check_libs2(d, atlas_libs, []) +- lapack_atlas = self.check_libs2(d, ['lapack_atlas'], []) +- if atlas is not None: +- lib_dirs2 = [d] + self.combine_paths(d, ['atlas*', 'ATLAS*']) +- lapack = self.check_libs2(lib_dirs2, lapack_libs, []) +- if lapack is not None: +- break +- if atlas: +- atlas_1 = atlas ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs) ++ lapack_atlas = self.check_libs2_all(lib_dirs, ['lapack_atlas']) ++ if atlas is not None: ++ lib_dirs2 = lib_dirs + self.combine_paths(lib_dirs,['atlas*','ATLAS*']) ++ lapack = self.check_libs2_all(lib_dirs2, lapack_libs) ++ if atlas: ++ atlas_1 = atlas + log.info(self.__class__) + if atlas is None: + atlas = atlas_1 +@@ -1108,7 +1168,8 @@ + info = {} + atlas_libs = self.get_libs('atlas_libs', + self._lib_names + self._lib_atlas) +- atlas = self.check_libs2(lib_dirs, atlas_libs, []) ++ atlas = None ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs) + if atlas is None: + return + include_dirs = self.get_include_dirs() +@@ -1156,8 +1217,10 @@ + lib_dirs = self.get_lib_dirs() + + lapack_libs = self.get_libs('lapack_libs', self._lib_names) +- info = self.check_libs(lib_dirs, lapack_libs, []) +- if info is None: ++ lapack = self.check_libs_all(lib_dirs, lapack_libs, []) ++ if lapack is not None: ++ info = lapack ++ else: + return + info['language'] = 'f77' + self.set_info(**info) +@@ -1549,8 +1612,10 @@ + lib_dirs = self.get_lib_dirs() + + blas_libs = self.get_libs('blas_libs', self._lib_names) +- info = self.check_libs(lib_dirs, blas_libs, []) +- if info is None: ++ blas = self.check_libs_all(lib_dirs, blas_libs, []) ++ if blas is not None: ++ info = blas ++ else: + return + info['language'] = 'f77' # XXX: is it generally true? + self.set_info(**info) +diff -ur numpy-1.8.0.orig/numpy/distutils/unixccompiler.py numpy-1.8.0-2/numpy/distutils/unixccompiler.py +--- numpy-1.8.0.orig/numpy/distutils/unixccompiler.py 2013-10-30 19:31:40.000000000 +0100 ++++ numpy-1.8.0-2/numpy/distutils/unixccompiler.py 2013-11-06 15:38:08.942524314 +0100 +@@ -111,3 +111,12 @@ + + replace_method(UnixCCompiler, 'create_static_lib', + UnixCCompiler_create_static_lib) ++ ++def UnixCCompiler_library_option(self, lib): ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib ++ ++replace_method(UnixCCompiler, 'library_option', ++ UnixCCompiler_library_option) -- GitLab From 17471e7f81aaf90c0f94fc10caf45aa1eedc6a6a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 3 Dec 2013 23:50:10 +0100 Subject: [PATCH 390/811] init Coreutils Signed-off-by: Fotis Georgatos --- .../Coreutils/Coreutils-8.21-goolf-1.4.10.eb | 19 +++++++++++++++++++ .../c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-goolf-1.4.10.eb new file mode 100644 index 0000000000..73aff4d255 --- /dev/null +++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = "Coreutils" +version = "8.21" + +homepage = 'http://www.gnu.org/software/coreutils/' +description = """The GNU Core Utilities are the basic file, shell and text manipulation utilities of the + GNU operating system. These are the core utilities which are expected to exist on every operating system.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True} + +source_urls = ['http://ftp.gnu.org/gnu/coreutils'] +sources = [SOURCELOWER_TAR_XZ] + +sanity_check_paths = { + 'files': ["bin/date", "bin/true"], + 'dirs': [] +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb new file mode 100644 index 0000000000..c61eaf7004 --- /dev/null +++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = "Coreutils" +version = "8.21" + +homepage = 'http://www.gnu.org/software/coreutils/' +description = """The GNU Core Utilities are the basic file, shell and text manipulation utilities of the + GNU operating system. These are the core utilities which are expected to exist on every operating system.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +source_urls = ['http://ftp.gnu.org/gnu/coreutils'] +sources = [SOURCELOWER_TAR_XZ] + +sanity_check_paths = { + 'files': ["bin/date", "bin/true"], + 'dirs': [] +} + +moduleclass = 'tools' -- GitLab From 44d325e7ca224e48689fb89131e542e84f843e91 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 4 Dec 2013 00:21:48 +0100 Subject: [PATCH 391/811] init grep Signed-off-by: Fotis Georgatos --- .../g/grep/grep-2.15-goolf-1.4.10.eb | 19 +++++++++++++++++++ .../g/grep/grep-2.15-ictce-5.3.0.eb | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb b/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb new file mode 100644 index 0000000000..c933f8d1ea --- /dev/null +++ b/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = 'grep' +version = '2.15' + +description = "grep: GNU grep" +homepage = 'http://www.gnu.org/software/grep/grep.html' + +sources = [SOURCELOWER_TAR_XZ] +source_urls = ['http://ftp.gnu.org/gnu/grep'] + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +configopts = ' --disable-perl-regexp ' + +sanity_check_paths = { + 'files': ["bin/grep"], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb new file mode 100644 index 0000000000..c1f2292316 --- /dev/null +++ b/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'grep' +version = '2.15' + +description = "grep: GNU grep" +homepage = 'http://www.gnu.org/software/grep/grep.html' + +sources = [SOURCELOWER_TAR_XZ] +source_urls = ['http://ftp.gnu.org/gnu/grep'] + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +configopts = ' --disable-perl-regexp ' + +sanity_check_paths = { + 'files': ["bin/grep"], + 'dirs': [], +} + +moduleclass = 'tools' -- GitLab From be9cce08b362a0fecfff0589a5bb4fe5ae94b588 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 4 Dec 2013 00:30:05 +0100 Subject: [PATCH 392/811] init XZ Signed-off-by: Fotis Georgatos --- .../easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb | 19 +++++++++++++++++++ .../easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb new file mode 100644 index 0000000000..2393846fce --- /dev/null +++ b/easybuild/easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = 'XZ' +version = '5.0.5' + +homepage = 'http://tukaani.org/xz/' +description = "xz: XZ utilities" + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = ['http://tukaani.org/xz/'] + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +# configopts = ' --disable-assembler ' # may become useful in non-x86 archs + +sanity_check_paths = { + 'files': ["bin/xz", "bin/lzmainfo"], + 'dirs': [] +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb new file mode 100644 index 0000000000..9c4849b2f4 --- /dev/null +++ b/easybuild/easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'XZ' +version = '5.0.5' + +homepage = 'http://tukaani.org/xz/' +description = "xz: XZ utilities" + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = ['http://tukaani.org/xz/'] + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# configopts = ' --disable-assembler ' # may become useful in non-x86 archs + +sanity_check_paths = { + 'files': ["bin/xz", "bin/lzmainfo"], + 'dirs': [] +} + +moduleclass = 'tools' -- GitLab From 18eaf515a1730a432190f2bae23cc44f9a803deb Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 4 Dec 2013 00:45:55 +0100 Subject: [PATCH 393/811] init sed Signed-off-by: Fotis Georgatos --- .../easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb | 17 +++++++++++++++++ .../easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..1aa226aec4 --- /dev/null +++ b/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'sed' +version = '4.2.2' + +homepage = 'http://www.gnu.org/software/sed/sed.html' +description = "sed: GNU implementation of sed, the POSIX stream editor" + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://ftp.gnu.org/gnu/sed'] + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sanity_check_paths = { + 'files': ["bin/sed"], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..cc1b5fc249 --- /dev/null +++ b/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'sed' +version = '4.2.2' + +homepage = 'http://www.gnu.org/software/sed/sed.html' +description = "sed: GNU implementation of sed, the POSIX stream editor" + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://ftp.gnu.org/gnu/sed'] + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sanity_check_paths = { + 'files': ["bin/sed"], + 'dirs': [], +} + +moduleclass = 'tools' -- GitLab From 65207f50ba28bfe380847e89d82307c7091aa6bb Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 4 Dec 2013 17:08:55 +0100 Subject: [PATCH 394/811] Add support for CHARMM CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile and widely used molecular simulation program with broad application to many-particle systems. This is a non free program. You need to buy a license to obtain the source code. --- .../CHARMM-37b2-goalf-1.5.12-no-OFED.eb | 31 +++++++++++++++++++ .../c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb | 29 +++++++++++++++++ .../c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb | 31 +++++++++++++++++++ .../c/CHARMM/main-case-fix-37b2.patch | 13 ++++++++ .../easyconfigs/c/CHARMM/qmmm-pme-37b2.patch | 22 +++++++++++++ .../easyconfigs/c/CHARMM/use-xhost-37b2.patch | 15 +++++++++ 6 files changed, 141 insertions(+) create mode 100644 easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb create mode 100644 easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb create mode 100644 easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch create mode 100644 easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch create mode 100644 easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..75a0e78635 --- /dev/null +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,31 @@ +# Author Ward Poelmans + +name = "CHARMM" +version = "37b2" + +homepage = "http://www.charmm.org" +description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile +and widely used molecular simulation program with broad application to many-particle systems.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'optarch': True, 'usempi': True} + +sources = ["c%(version)s.tar.gz"] + +patches = [ + "qmmm-pme-%(version)s.patch", + "main-case-fix-%(version)s.patch", +] + +# if you specify Gaussian, it will be used for the QM part. +dependencies = [ +# ('Gaussian', 'g09_D.01', '-amd64-gpfs'), +] + +# FFTW will automatically be used because of the toolchain +build_options = ["FULL", "COLFFT", "PIPF"] + +# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce +system_size = "medium" + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb new file mode 100644 index 0000000000..81985c2134 --- /dev/null +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb @@ -0,0 +1,29 @@ +# Authors:: Ward Poelmans + +name = "CHARMM" +version = "37b2" +versionsuffix = "nompi" + +homepage = "http://www.charmm.org" +description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile +and widely used molecular simulation program with broad application to many-particle systems.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'usempi': False} + +sources = ["c%(version)s.tar.gz"] + +patches = [ + "qmmm-pme-%(version)s.patch", + "use-xhost-%(version)s.patch", + "main-case-fix-%(version)s.patch", +] + +#dependencies = [('Gaussian', 'g09_D.01-ictce-5.5.0-amd64-gpfs')] + +# MKL activated automatically when the MKL is found, same for g09 +build_options = ["FULL", "COLFFT", "PIPF"] +# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce +system_size = "medium" + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb new file mode 100644 index 0000000000..14e379742a --- /dev/null +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb @@ -0,0 +1,31 @@ +# Authors:: Ward Poelmans + +name = "CHARMM" +version = "37b2" + +homepage = "http://www.charmm.org" +description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile +and widely used molecular simulation program with broad application to many-particle systems.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'usempi': True} + +sources = ["c%(version)s.tar.gz"] + +patches = [ + "qmmm-pme-%(version)s.patch", + "use-xhost-%(version)s.patch", + "main-case-fix-%(version)s.patch", +] + +# if you specify Gaussian, it will be used for the QM part. +# if you specify FFTW, it will be used instead of the MKL +dependencies = [('Gaussian', 'g09_D.01', '-amd64-gpfs')] + +# MKL activated automatically when the ictce toolchain is used +build_options = ["FULL", "COLFFT", "PIPF"] + +# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce +system_size = "medium" + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch b/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch new file mode 100644 index 0000000000..3ec2563cdb --- /dev/null +++ b/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch @@ -0,0 +1,13 @@ +# fix a error in the main +diff -ur c37b2.orig/source/charmm/charmm_main.src c37b2/source/charmm/charmm_main.src +--- c37b2.orig/source/charmm/charmm_main.src 2013-02-11 06:27:24.000000000 +0100 ++++ c37b2/source/charmm/charmm_main.src 2013-12-03 16:30:45.539579132 +0100 +@@ -1267,7 +1267,7 @@ + + case('PIPF','PFBA') cmds + ##IF PIPF +- if (wrd == 'PIPF') cmds ++ if (wrd == 'PIPF') then + call pfprep(comlyn,comlen) + else if (wrd == 'PFBA') then + call nosepf(comlyn,comlen) diff --git a/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch b/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch new file mode 100644 index 0000000000..2365077555 --- /dev/null +++ b/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch @@ -0,0 +1,22 @@ +# fixes compile error. Always display the warning +diff -ur c37b2.orig/source/squantm/sqnt_qm2_ewald.src c37b2/source/squantm/sqnt_qm2_ewald.src +--- c37b2.orig/source/squantm/sqnt_qm2_ewald.src 2012-07-17 01:08:32.000000000 +0200 ++++ c37b2/source/squantm/sqnt_qm2_ewald.src 2013-12-03 14:11:46.945196858 +0100 +@@ -1876,7 +1878,7 @@ + ##IF COLFFT (colfft) + !==================COLUMN FFT METHOD ============================== + ##IF QUANTUM MNDO97 SQUANTM GAMESS GAMESSUK QCHEM QTURBO G09 +- if(LQMEWD) call wrndie(-5,'','QM/MM-PME do not support COLFFT.') ++ call wrndie(1,'','QM/MM-PME do not support COLFFT.') + ##ENDIF + ##ELSE (colfft) + !.ab.Fix: xnsymm should be set (not 0 !). +@@ -2146,7 +2148,7 @@ + ##IF COLFFT (colfft) + !==================COLUMN FFT METHOD ============================== + ##IF QUANTUM MNDO97 SQUANTM GAMESS GAMESSUK QCHEM QTURBO G09 +- if(LQMEWD) call wrndie(-5,'','QM/MM-PME do not support COLFFT.') ++ call wrndie(1,'','QM/MM-PME do not support COLFFT.') + ##ENDIF + ##ELSE (colfft) + diff --git a/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch b/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch new file mode 100644 index 0000000000..deb270dfb2 --- /dev/null +++ b/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch @@ -0,0 +1,15 @@ +# lets use the flags the EB sets for us +diff -ur c37b2.orig/build/UNX/Makefile_em64t c37b2/build/UNX/Makefile_em64t +--- c37b2.orig/build/UNX/Makefile_em64t 2012-07-10 14:06:18.000000000 +0200 ++++ c37b2/build/UNX/Makefile_em64t 2013-12-03 15:35:18.997245768 +0100 +@@ -39,8 +39,8 @@ + + FC0 = $(FC) -c -O0 -free + FC1 = $(FC) -c -O1 -free +- FC2 = $(FC) -c -O3 -mp1 -axSSE4.1 -free +- FC3 = $(FC) -c -O3 -mp1 -axSSE4.1 -free ++ FC2 = $(FC) -c -O3 -mp1 -free $(F90FLAGS) ++ FC3 = $(FC) -c -O3 -mp1 -free $(F90FLAGS) + FCR = $(FC) -c -u -V -free + FCD = $(FC) -c -g -O0 -u -traceback -free + ifdef DEBUG -- GitLab From c6b15d3c1cd3dc6b191224857dd591fc2ac7205a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 5 Dec 2013 11:59:28 +0100 Subject: [PATCH 395/811] add missing easyconfigs for ictce/5.3.0, series a-e --- .../a/Automake/Automake-1.14-ictce-5.3.0.eb | 31 +++++++++++++++++++ .../arpack-ng-3.1.3-ictce-5.3.0-mt.eb | 27 ++++++++++++++++ .../b/Bison/Bison-2.7-ictce-5.3.0.eb | 20 ++++++++++++ .../Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb | 28 +++++++++++++++++ .../Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb | 26 ++++++++++++++++ .../b/Boost/Boost-1.53.0-ictce-5.3.0.eb | 22 +++++++++++++ .../c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb | 22 +++++++++++++ .../c/CCfits/CCfits-2.4-ictce-5.3.0.eb | 21 +++++++++++++ .../c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb | 20 ++++++++++++ .../c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb | 18 +++++++++++ .../c/CMake/CMake-2.8.11-ictce-5.3.0.eb | 20 ++++++++++++ .../c/CMake/CMake-2.8.12-ictce-5.3.0.eb | 20 ++++++++++++ .../c/CRF++/CRF++-0.57-ictce-5.3.0.eb | 24 ++++++++++++++ .../Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb | 28 +++++++++++++++++ .../c/cURL/cURL-7.28.1-ictce-5.3.0.eb | 22 +++++++++++++ .../c/cURL/cURL-7.33.0-ictce-5.3.0.eb | 22 +++++++++++++ .../d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb | 18 +++++++++++ .../e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb | 26 ++++++++++++++++ .../easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb | 17 ++++++++++ 19 files changed, 432 insertions(+) create mode 100644 easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb new file mode 100644 index 0000000000..8b02799901 --- /dev/null +++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb @@ -0,0 +1,31 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'Automake' +version = "1.14" + +homepage = 'http://www.gnu.org/software/automake/automake.html' +description = "Automake: GNU Standards-compliant Makefile generator" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://ftp.gnu.org/gnu/automake'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('Autoconf', '2.69')] + +sanity_check_paths = { + 'files': ['bin/automake', 'bin/aclocal'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb new file mode 100644 index 0000000000..4abff36b04 --- /dev/null +++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb @@ -0,0 +1,27 @@ +name = 'arpack-ng' +version = '3.1.3' +versionsuffix = '-mt' + +homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/' +description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': False} + +source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/'] +sources = [SOURCELOWER_TAR_GZ] + +# do not change the order of the patches or things will break +patches = [ + 'arpack-ng-3.1.3-update-to-head.patch', + 'arpack-ng-3.1.3-pkgconfig.patch', +] + +configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"' + +sanity_check_paths = { + 'files': ["lib/libarpack.a", "lib/libarpack.so"], + 'dirs': [] +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb new file mode 100644 index 0000000000..c8a635c39e --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.7' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar +into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] + +builddependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..5bff64b1fe --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,28 @@ +name = 'Boost' +version = '1.53.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +patches = ['intellinuxjam_fPIC.patch'] + +pythonversion = '2.7.3' +versionsuffix = '-Python-%s' % pythonversion + +dependencies = [ + ('bzip2', '1.0.6'), + ('Python', pythonversion), +] + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb new file mode 100644 index 0000000000..ef9aaeecb5 --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb @@ -0,0 +1,26 @@ +name = 'Boost' +version = '1.53.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +pythonversion = '2.7.5' +versionsuffix = '-Python-%s' % pythonversion + +dependencies = [ + ('bzip2', '1.0.6'), + ('Python', pythonversion), +] + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..eedc4e5954 --- /dev/null +++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'Boost' +version = '1.53.0' + +homepage = 'http://www.boost.org/' +description = """Boost provides free peer-reviewed portable C++ source libraries.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'usempi': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))] + +dependencies = [('bzip2', '1.0.6')] + +configopts = '--without-libraries=python' + +# also build boost_mpi +boost_mpi = True + +osdependencies = ['zlib-devel'] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb new file mode 100644 index 0000000000..41a61d1d6f --- /dev/null +++ b/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'CBLAS' +version = '20110120' + +homepage = 'http://www.netlib.org/blas/' +description = "C interface to the BLAS" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +source_urls = ['http://www.netlib.org/blas/blast-forum/'] +sources = ['cblas.tgz'] + +patches = ['CBLAS_shared-lib.patch'] + +makeopts = 'all shared' + +# parallel build fails occasionally +parallel = 1 + +runtest = 'runtst' + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..51afa00583 --- /dev/null +++ b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = 'CCfits' +version = '2.4' + +homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/CCfits/' +description = """CCfits is an object oriented interface to the cfitsio library. It is designed to make +the capabilities of cfitsio available to programmers working in C++.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://heasarc.gsfc.nasa.gov/fitsio/CCfits/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [('CFITSIO','3.34')] + +sanity_check_paths = { + 'files': ['bin/cookbook', 'lib/libCCfits.%s' % SHLIB_EXT, 'lib/pkgconfig/CCfits.pc'], + 'dirs': ['include/CCfits'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb new file mode 100644 index 0000000000..28289da109 --- /dev/null +++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'CFITSIO' +version = '3.34' + +homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/' +description = """CFITSIO is a library of C and Fortran subroutines for reading and writing data files in +FITS (Flexible Image Transport System) data format.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +srcversion = '%s0' % version.replace('.', '') +source_urls = ['ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/'] +sources = ['%%(namelower)s%s.tar.gz' % srcversion] + +sanity_check_paths = { + 'files':["lib/libcfitsio.a"], + 'dirs':["include"], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..46545e5ed3 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb @@ -0,0 +1,18 @@ +name = 'CMake' +version = "2.8.10.2" + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb new file mode 100644 index 0000000000..44aa40baa3 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.11' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb new file mode 100644 index 0000000000..99d7f8a098 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb new file mode 100644 index 0000000000..2f6cf7bcd7 --- /dev/null +++ b/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb @@ -0,0 +1,24 @@ +name = 'CRF++' +version = '0.57' + +homepage = 'https://code.google.com/p/crfpp/' +description = """CRF++ is a simple, customizable, and open source implementation of + Conditional Random Fields (CRFs) for segmenting/labeling sequential data. CRF++ is + designed for generic purpose and will be applied to a variety of NLP tasks, such as + Named Entity Recognition, Information Extraction and Text Chunking. """ + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True, 'opt': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['https://crfpp.googlecode.com/files/'] + +configopts = '--with-pic' +makeopts = 'CXXFLAGS="$CXXFLAGS -Wall -finline"' + +sanity_check_paths = { + 'files': ["bin/crf_learn", "bin/crf_test"], + 'dirs': [] +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..3e23a5c022 --- /dev/null +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,28 @@ +easyblock = "PythonPackage" + +name = 'Cython' +version = '0.19.1' + +homepage = 'http://pypi.python.org/pypi/Cython/' +description = """The Cython language makes writing C extensions for the Python language as easy as Python itself. + Cython is a source code translator based on the well-known Pyrex, but supports more cutting edge functionality and optimizations.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.3' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +pylibdir = 'lib/python%s/site-packages' % pythonshortver +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [(python, pythonver)] + +sanity_check_paths = { + 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], + 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..fa10cf6767 --- /dev/null +++ b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'cURL' +version = '7.28.1' + +homepage = 'http://curl.haxx.se' +description = """libcurl is a free and easy-to-use client-side URL transfer library, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports + SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, + proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, + Kerberos), file transfer resume, http proxy tunneling and more.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://curl.haxx.se/download/'] + +sanity_check_paths = { + 'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..65dd20560e --- /dev/null +++ b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'cURL' +version = '7.33.0' + +homepage = 'http://curl.haxx.se' +description = """libcurl is a free and easy-to-use client-side URL transfer library, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports + SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, + proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, + Kerberos), file transfer resume, http proxy tunneling and more.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://curl.haxx.se/download/'] + +sanity_check_paths = { + 'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..f5c2ee7700 --- /dev/null +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb @@ -0,0 +1,18 @@ +name = 'Doxygen' +version = '1.8.3.1' + +homepage = 'http://www.doxygen.org' +description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, +IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = ['%(namelower)s-%(version)s.src.tar.gz'] +source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] + +dependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..0d4662d693 --- /dev/null +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'Eigen' +version = '3.1.4' + +homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' +description = """Eigen is a C++ template library for linear algebra: + matrices, vectors, numerical solvers, and related algorithms.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] +sources = ['%(version)s.tar.bz2'] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb new file mode 100644 index 0000000000..e2bb71d26b --- /dev/null +++ b/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'ed' +version = '1.9' + +homepage = 'http://www.gnu.org/software/ed/ed.html' +description = """GNU ed is a line-oriented text editor.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/%(name)s/'] + +sanity_check_paths = { + 'files' : ['bin/ed'], + 'dirs' : [], +} + +moduleclass = 'tools' -- GitLab From 3359dd976f62e862bd06d06e862d4a8209a806b8 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 5 Dec 2013 12:00:35 +0100 Subject: [PATCH 396/811] add missing easyconfigs for ictce/5.3.0, series f-k --- .../FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb | 34 ++++++++++++++++ .../f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb | 27 +++++++++++++ .../fixesproto/fixesproto-5.0-ictce-5.3.0.eb | 17 ++++++++ .../f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb | 19 +++++++++ .../f/freetype/freetype-2.4.11-ictce-5.3.0.eb | 19 +++++++++ .../freetype/freetype-2.5.0.1-ictce-5.3.0.eb | 21 ++++++++++ .../g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb | 22 ++++++++++ .../g/GLPK/GLPK-4.48-ictce-5.3.0.eb | 21 ++++++++++ .../g/GLib/GLib-2.34.3-ictce-5.3.0.eb | 19 +++++++++ .../g/GMP/GMP-5.1.1-ictce-5.3.0.eb | 20 ++++++++++ .../g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb | 40 +++++++++++++++++++ .../easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb | 16 ++++++++ .../g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb | 18 +++++++++ .../g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb | 20 ++++++++++ .../g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb | 23 +++++++++++ .../g/gzip/gzip-1.6-ictce-5.3.0.eb | 34 ++++++++++++++++ .../h/HDF/HDF-4.2.8-ictce-5.3.0.eb | 21 ++++++++++ .../h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb | 22 ++++++++++ .../h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb | 24 +++++++++++ .../h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb | 22 ++++++++++ .../h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb | 32 +++++++++++++++ .../h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb | 17 ++++++++ .../h/hwloc/hwloc-1.6-ictce-5.3.0.eb | 17 ++++++++ .../h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb | 17 ++++++++ .../h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb | 17 ++++++++ .../i/imake/imake-1.0.5-ictce-5.3.0.eb | 19 +++++++++ .../inputproto/inputproto-2.3-ictce-5.3.0.eb | 17 ++++++++ .../k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb | 17 ++++++++ 28 files changed, 612 insertions(+) create mode 100644 easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb create mode 100644 easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..c1e3ad55f7 --- /dev/null +++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,34 @@ +easyblock = "PythonPackage" + +name = 'FIAT' +version = '1.1' + +homepage = 'https://launchpad.net/fiat' +description = """The FInite element Automatic Tabulator FIAT supports generation of arbitrary order +instances of the Lagrange elements on lines, triangles, and tetrahedra. It is also capable of generating +arbitrary order instances of Jacobi-type quadrature rules on the same element shapes.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('ScientificPython', '2.8', versionsuffix), +] + +options = {'modulename': name} + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/FIAT' % pythonshortversion], +} + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..97c39edc10 --- /dev/null +++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb @@ -0,0 +1,27 @@ +# +# author: Dina Mahmoud Ibrahim ( Cairo University ) +# +name = 'FLTK' +version = '1.3.2' + +homepage = 'http://www.fltk.org' +description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, + and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL + and its built-in GLUT emulation.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = ['%(namelower)s-%(version)s-source.tar.gz'] +source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/'] + +dependencies = [ + ('Tcl', '8.5.12'), + ('Tk', '8.5.12'), +] + +sanity_check_paths = { + 'files': ['bin/fltk-config','bin/fluid'], + 'dirs': ['lib'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..550ddb6d6e --- /dev/null +++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'fixesproto' +version = '5.0' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org FixesProto protocol headers.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..5a15cb7719 --- /dev/null +++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'freeglut' +version = '2.8.1' + +homepage = 'http://freeglut.sourceforge.net/' +description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(name)s'] + +dependencies = [('libXi', '1.7.2')] + +sanity_check_paths = { + 'files': ['lib/libglut.a', 'lib/libglut.so'], + 'dirs': ['include/GL'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb new file mode 100644 index 0000000000..6c789c8bd3 --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'freetype' +version = '2.4.11' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +sources = [SOURCE_TAR_GZ] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..d509fdfff7 --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = 'freetype' +version = '2.5.0.1' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [('libpng', '1.6.6')] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..3cbfbb519a --- /dev/null +++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'GDAL' +version = '1.9.2' + +homepage = 'http://www.gdal.org/' +description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style + Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model + to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for + data translation and processing.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://download.osgeo.org/gdal/'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +sanity_check_paths = { + 'files': ['lib/libgdal.so', 'lib/libgdal.a'], + 'dirs': ['bin', 'include'] +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb new file mode 100644 index 0000000000..c44466fc3b --- /dev/null +++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = 'GLPK' +version = '4.48' + +homepage = 'http://www.gnu.org/software/glpk/' +description = """The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear +programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines +written in ANSI C and organized in the form of a callable library.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True, 'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/%(namelower)s'] + +dependencies = [ + ('GMP', '5.1.1'), +] + +configopts = "--with-gmp" + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb new file mode 100644 index 0000000000..ddeef5db37 --- /dev/null +++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'GLib' +version = '2.34.3' + +homepage = 'http://www.gtk.org/' +description = """GLib is one of the base libraries of the GTK+ project""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/'] +sources = ['glib-%(version)s.tar.xz'] + +dependencies = [ + ('libffi', '3.0.13'), + ('gettext', '0.18.2'), +] +builddependencies = [('Python', '2.7.3')] + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..603803b0a1 --- /dev/null +++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'GMP' +version = '5.1.1' + +homepage = 'http://gmplib.org/' +description = """GMP is a free library for arbitrary precision arithmetic, +operating on signed integers, rational numbers, and floating point numbers. """ + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = ['http://ftp.gnu.org/gnu/gmp'] + +runtest = 'check' + +sanity_check_paths = { + 'files': ['lib/libgmp.so', 'include/gmp.h'], + 'dirs': [], +} + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..6704a1c189 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb @@ -0,0 +1,40 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## + +easyblock = 'CMakeMake' + +name = 'GROMACS' +version = '4.6.1' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] + +builddependencies = [('CMake', '2.8.4')] + +configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" +runtest = 'check' + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb new file mode 100644 index 0000000000..4a05725830 --- /dev/null +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb @@ -0,0 +1,16 @@ +name = 'GSL' +version = '1.16' + +homepage = 'http://www.gnu.org/software/gsl/' +description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. + The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/gsl/'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..f0e6d6e596 --- /dev/null +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb @@ -0,0 +1,18 @@ +name = 'g2clib' +version = '1.4.0' + +homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' +description = """Library contains GRIB2 encoder/decoder ("C" version).""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True} + +dependencies = [('JasPer', '1.900.1')] + +sources = ['%s-%s.tar' % (name, version)] +source_urls = [homepage] + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..5be5a5a476 --- /dev/null +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'g2lib' +version = '1.4.0' + +homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' +description = """Library contains GRIB2 encoder/decoder and search/indexing routines.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True} + +dependencies = [('JasPer', '1.900.1')] + +sources = ['%s-%s.tar' % (name, version)] +source_urls = [homepage] + +patches = ['fix_makefile.patch'] + +# parallel build tends to fail +parallel = 1 + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..071d45e481 --- /dev/null +++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb @@ -0,0 +1,23 @@ +name = 'grib_api' +version = '1.10.0' + +homepage = 'https://software.ecmwf.int/wiki/display/GRIB/Home' +description = """The ECMWF GRIB API is an application program interface accessible from C, FORTRAN and Python + programs developed for encoding and decoding WMO FM-92 GRIB edition 1 and edition 2 messages. A useful set of + command line tools is also provided to give quick access to GRIB messages.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['https://software.ecmwf.int/wiki/download/attachments/3473437/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [ + ('JasPer', '1.900.1'), +] + +preconfigopts = 'FC=$F90' +configopts = '--with-jasper=$EBROOTJASPER' + +parallel = 1 + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb new file mode 100644 index 0000000000..21e29f76c9 --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC +# Authors:: Thekla Loizou +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html +## + +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = ['http://ftpmirror.gnu.org/gzip'] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb new file mode 100644 index 0000000000..6a6f38583d --- /dev/null +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = 'HDF' +version = '4.2.8' + +homepage = 'http://www.hdfgroup.org/products/hdf4/' +description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True, 'pic': True} + +dependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), + ] + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] + +configopts = "--with-szlib=$EBROOTSZIP" + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb new file mode 100644 index 0000000000..4923cec819 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb @@ -0,0 +1,22 @@ +name = 'HDF5' +version = '1.8.10' +versionsuffix = '-serial' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('zlib', '1.2.7'), + ('Szip', '2.1'), +] + +patches = ['configure_libtool.patch'] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb new file mode 100644 index 0000000000..96aaf04223 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb @@ -0,0 +1,24 @@ +name = 'HDF5' +version = '1.8.10-patch1' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'configure_libtool.patch', + 'HDF5-1.8.9_mpi-includes_order_fix.patch', +] + +dependencies = [ + ('zlib', '1.2.7'), + ('Szip', '2.1'), +] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb new file mode 100644 index 0000000000..d1cfae6705 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb @@ -0,0 +1,22 @@ +name = 'HDF5' +version = '1.8.11' +versionsuffix = '-serial' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('zlib', '1.2.7'), + ('Szip', '2.1'), +] + +patches = ['configure_libtool.patch'] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..cd410ed70d --- /dev/null +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,32 @@ +easyblock = "PythonPackage" + +name = 'h5py' +version = '2.1.3' + +homepage = 'http://code.google.com/p/h5py/' +description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library, + version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous + amounts of data.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +source_urls = ['http://h5py.googlecode.com/files/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.3' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('HDF5', '1.8.10'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..4255032ed4 --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = '1.5.1' + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb new file mode 100644 index 0000000000..f1b284038d --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = '1.6' + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..a5fd17b348 --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = '1.6.2' + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..5abd7ea765 --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = "1.7.2" + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb new file mode 100644 index 0000000000..2a9e2558db --- /dev/null +++ b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'imake' +version = '1.0.5' + +homepage = 'http://www.x.org/' +description = """imake is a Makefile-generator that is intended to make it easier to develop software + portably for multiple systems.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/'] + +sanity_check_paths = { + 'files': ['bin/%s' % binfile for binfile in ['ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib', + 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb new file mode 100644 index 0000000000..554430022b --- /dev/null +++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'inputproto' +version = '2.3' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org InputProto protocol headers.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb new file mode 100644 index 0000000000..598911385e --- /dev/null +++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'kbproto' +version = '1.0.6' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org KBProto protocol headers.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']], + 'dirs': [], +} + +moduleclass = 'vis' -- GitLab From 54d3e82cd7b561357abd4a1e5084f25849098f52 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 5 Dec 2013 12:01:37 +0100 Subject: [PATCH 397/811] add missing easyconfigs for ictce/5.3.0, series l-o --- .../l/LWM2/LWM2-1.1-ictce-5.3.0.eb | 46 +++++++++++++++++ .../l/libICE/libICE-1.0.8-ictce-5.3.0.eb | 22 ++++++++ .../l/libSM/libSM-1.2.1-ictce-5.3.0.eb | 26 ++++++++++ .../l/libX11/libX11-1.6.1-ictce-5.3.0.eb | 35 +++++++++++++ .../l/libXau/libXau-1.0.8-ictce-5.3.0.eb | 19 +++++++ .../l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb | 22 ++++++++ .../l/libXext/libXext-1.3.2-ictce-5.3.0.eb | 28 ++++++++++ .../libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb | 22 ++++++++ .../l/libXi/libXi-1.7.2-ictce-5.3.0.eb | 25 +++++++++ .../l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb | 23 +++++++++ .../l/libXp/libXp-1.0.2-ictce-5.3.0.eb | 28 ++++++++++ .../l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb | 20 ++++++++ .../l/libXt/libXt-1.1.4-ictce-5.3.0.eb | 34 +++++++++++++ .../l/libidn/libidn-1.27-ictce-5.3.0.eb | 13 +++++ .../l/libpng/libpng-1.5.14-ictce-5.3.0.eb | 22 ++++++++ .../libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb | 19 +++++++ .../l/libpng/libpng-1.6.3-ictce-5.3.0.eb | 17 +++++++ .../likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb | 27 ++++++++++ .../l/likwid/likwid-3.0.0-ictce-5.3.0.eb | 24 +++++++++ .../l/lynx/lynx-2.8.7-ictce-5.3.0.eb | 17 +++++++ .../MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb | 30 +++++++++++ .../m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb | 13 +++++ ...tplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb | 34 +++++++++++++ ...tplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb | 38 ++++++++++++++ .../molmod-1.0-ictce-5.3.0-Python-2.7.3.eb | 33 ++++++++++++ .../n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb | 22 ++++++++ .../numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb | 26 ++++++++++ .../o/OTF/OTF-1.12.4-ictce-5.3.0.eb | 33 ++++++++++++ .../o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb | 31 +++++++++++ ...OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb | 51 +++++++++++++++++++ ...OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb | 51 +++++++++++++++++++ .../o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb | 21 ++++++++ 32 files changed, 872 insertions(+) create mode 100644 easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb create mode 100644 easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb create mode 100644 easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..18cafee304 --- /dev/null +++ b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb @@ -0,0 +1,46 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +easyblock = 'EB_Score_minus_P' + +name = "LWM2" +version = "1.1" + +homepage = 'http://www.vi-hps.org/Tools/LWM2.html' +description = """The lightweight measurement module (LWM2) is a low overhead profiler developed + during the course of the HOPSA project. It can profile applications without any modification by + a user. The lightweight measurement module uses a hybrid approach to profile an application. It + samples the profiled application at regular intervals to keep track of application activity. To + keep the overhead low, LWM2 avoids stack unwinding at each application sample. Instead, it utilizes + direct instrumentation to earmark regions of interest in an application. When an application is + sampled, the earmarks are checked to identify the region of application execution. As a result, + LWM2 is able to profile application with reasonable knowledge of application activity while + maintaining low overhead. This hybrid approach also allows LWM2 to keep track of the time spent + by an application in different regions of execution without directly measuring the time in these + regions. The hybrid profiling approach is also used to collect additional dat a of interest for + some specific application activities. This includes the MPI communication calls and the amount of + data transfer, the POSIX file I/O calls and associated data transfers, etc.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {"usempi": True} + +# http://www.vi-hps.org/upload/projects/hopsa/lwm2-1.1.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.vi-hps.org/upload/projects/hopsa/'] + +# compiler toolchain depencies +dependencies = [ + ('PAPI', '5.2.0'), +] + +sanity_check_paths = { + 'files': ["bin/l2freader", ("lib64/liblwm2.a", "lib/liblwm2.a")], + 'dirs': [] +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb new file mode 100644 index 0000000000..18f415d55b --- /dev/null +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'libICE' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X Inter-Client Exchange library for freedesktop.org""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('xproto', '7.0.23'), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..a05cea05c8 --- /dev/null +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb @@ -0,0 +1,26 @@ +name = 'libSM' +version = '1.2.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X11 Session Management library, which allows for applications to both manage sessions, + and make use of session managers to save and restore their state for later use.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libICE', '1.0.8'), +] +builddependencies = [ + ('xproto', '7.0.23'), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']], + 'dirs' : [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..0213c75285 --- /dev/null +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb @@ -0,0 +1,35 @@ +name = 'libX11' +version = '1.6.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X11 client-side library""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +pythonversion = '-Python-2.7.3' +builddependencies = [ + ('xextproto', '7.2.1'), + ('xcb-proto', '1.7', pythonversion), + ('kbproto', '1.0.6'), + ('inputproto', '2.3'), + ('xproto', '7.0.23'), +] + +dependencies = [ + ('libxcb', '1.8', pythonversion), + ('xtrans', '1.2'), +] + +sanity_check_paths = { + 'files': ['include/X11/%s' % x for x in [ + 'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h', + 'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h', + ] + ], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb new file mode 100644 index 0000000000..c5876f3234 --- /dev/null +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'libXau' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """The libXau package contains a library implementing the X11 Authorization Protocol. +This is useful for restricting client access to the display.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb new file mode 100644 index 0000000000..7c0ed45c9d --- /dev/null +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'libXaw' +version = '1.0.12' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXaw provides the Athena Widgets toolkit""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libXmu', '1.1.2'), + ('libXpm', '3.5.11'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..0c0daa5834 --- /dev/null +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb @@ -0,0 +1,28 @@ +name = 'libXext' +version = '1.3.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """Common X Extensions library""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('xproto','7.0.23'), + ('libX11', '1.6.1'), + ('xextproto', '7.2.1'), +] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h', + 'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h', + ] + ], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..6bf02a2a5f --- /dev/null +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'libXfixes' +version = '5.0.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X Fixes extension library""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('fixesproto', '5.0'), + ('xextproto', '7.2.1'), +] + +sanity_check_paths = { + 'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..4679a7f203 --- /dev/null +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb @@ -0,0 +1,25 @@ +name = 'libXi' +version = '1.7.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """LibXi provides an X Window System client interface to the XINPUT extension to the X protocol.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('xproto', '7.0.23'), + ('xextproto', '7.2.1'), + ('libXext', '1.3.2'), + ('inputproto', '2.3'), + ('libXfixes', '5.0.1'), +] + +sanity_check_paths = { + 'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..9a94fcab36 --- /dev/null +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb @@ -0,0 +1,23 @@ +name = 'libXmu' +version = '1.1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXmu provides a set of miscellaneous utility convenience functions for X libraries to use. + libXmuu is a lighter-weight version that does not depend on libXt or libXext""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libXt', '1.1.4'), + ('libXpm', '3.5.11'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..29bafbff8b --- /dev/null +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb @@ -0,0 +1,28 @@ +name = 'libXp' +version = '1.0.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXp provides the X print library.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ + ('xextproto', '7.2.1'), + ('printproto', '1.0.5'), +] + +dependencies = [ + ('libX11', '1.6.1'), + ('libXext', '1.3.2'), + ('libXau', '1.0.8'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb new file mode 100644 index 0000000000..08a43f1d0e --- /dev/null +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'libXpm' +version = '3.5.11' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXp provides the X print library.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [('gettext', '0.18.2')] + +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..929c20cbe1 --- /dev/null +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb @@ -0,0 +1,34 @@ +name = 'libXt' +version = '1.1.4' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are + based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation).""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +dependencies = [ + ('libSM', '1.2.1'), + ('libICE', '1.0.8'), + ('libX11', '1.6.1'), + ('kbproto', '1.0.6'), + ('xproto', '7.0.23'), +] + +sanity_check_paths = { + 'files' : ['include/X11/%s' % x for x in [ + 'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h', + 'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h', + 'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h', + 'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h', + 'ThreadsI.h', 'VarargsI.h', 'VendorP.h', + ] + ], + 'dirs' : [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb new file mode 100644 index 0000000000..cc1ae26187 --- /dev/null +++ b/easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb @@ -0,0 +1,13 @@ +name = 'libidn' +version = '1.27' + +homepage = 'http://www.gnu.org/software/libidn' +description = """GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. +Libidn's purpose is to encode and decode internationalized domain names.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +sources = [SOURCELOWER_TAR_GZ] + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb new file mode 100644 index 0000000000..4ef2e44f4a --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'libpng' +version = '1.5.14' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +toolchainopts = {'optarch': True} +configopts = "--with-pic" + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +sanity_check_paths = { + 'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.so', 'lib/pkgconfig/libpng.pc'], + 'dirs': ['include'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb new file mode 100644 index 0000000000..fb9f32baf9 --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb @@ -0,0 +1,19 @@ +name = 'libpng' +version = '1.6.3' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +zlibver = '1.2.8' +versionsuffix = '-zlib-%s' % zlibver +dependencies = [('zlib', zlibver)] + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb new file mode 100644 index 0000000000..2701d0d2b6 --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'libpng' +version = '1.6.3' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb new file mode 100644 index 0000000000..3561d3e5e5 --- /dev/null +++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb @@ -0,0 +1,27 @@ +name = 'likwid' +version = '3.0.0' +versionsuffix = '-pinomp' + +homepage = 'http://code.google.com/p/likwid/' +description = """Likwid stands for Like I knew what I am doing. This project contributes easy to use + command line tools for Linux to support programmers in developing high performance multi threaded programs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = [GOOGLECODE_SOURCE] + +patches = ['pinomp-pthread-overload.patch'] + +skipsteps = ['configure'] +makeopts='CC="$CC" CFLAGS="$CFLAGS"' +installopts = 'PREFIX=%(installdir)s' + +sanity_check_paths = { + 'files': ["bin/likwid-features", "bin/likwid-memsweeper", "bin/likwid-mpirun", "bin/likwid-perfctr", + "bin/likwid-perfscope", "bin/likwid-pin", "bin/likwid-powermeter", "bin/likwid-topology", + "lib/liblikwidpin.so", "lib/liblikwid.a"], + 'dirs': ["man/man1"] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..b3687e8cba --- /dev/null +++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb @@ -0,0 +1,24 @@ +name = 'likwid' +version = '3.0.0' + +homepage = 'http://code.google.com/p/likwid/' +description = """Likwid stands for Like I knew what I am doing. This project contributes easy to use + command line tools for Linux to support programmers in developing high performance multi threaded programs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = [GOOGLECODE_SOURCE] + +skipsteps = ['configure'] +makeopts='CC="$CC" CFLAGS="$CFLAGS"' +installopts = 'PREFIX=%(installdir)s' + +sanity_check_paths = { + 'files': ["bin/likwid-features", "bin/likwid-memsweeper", "bin/likwid-mpirun", "bin/likwid-perfctr", + "bin/likwid-perfscope", "bin/likwid-pin", "bin/likwid-powermeter", "bin/likwid-topology", + "lib/liblikwidpin.so", "lib/liblikwid.a"], + 'dirs': ["man/man1"] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb new file mode 100644 index 0000000000..8935b8374f --- /dev/null +++ b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'lynx' +version = '2.8.7' + +description = "lynx is an alphanumeric display oriented World-Wide Web Client" +homepage = 'http://lynx.isc.org/' + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://lynx.isc.org/release/'] +sources = ['%(name)s%(version)s.tar.bz2'] + +sanity_check_paths = { + 'files': ['bin/lynx'], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb new file mode 100644 index 0000000000..9d63283dc3 --- /dev/null +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb @@ -0,0 +1,30 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'MUMmer' +version = '3.23' + +homepage = 'http://mummer.sourceforge.net/' +description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = ['%s%s.tar.gz' % (name, version)] +source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] + +perl = 'Perl' +perlver = '5.16.3' +versionsuffix = '-%s-%s' % (perl, perlver) +dependencies = [(perl, perlver)] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb b/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..26a922fdfd --- /dev/null +++ b/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb @@ -0,0 +1,13 @@ +name = 'Mesquite' +version = '2.3.0' + +homepage = 'http://software.sandia.gov/~bktidwe/mesquite.html' +description = """Mesh-Quality Improvement Library""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +source_urls = ['http://software.sandia.gov/~bktidwe/'] +sources = [SOURCELOWER_TAR_GZ] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..ab81bf895d --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,34 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.2.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.7'), + ('freetype', '2.4.11'), + ('libpng', '1.5.13'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb new file mode 100644 index 0000000000..08450f7881 --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb @@ -0,0 +1,38 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.0' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of +hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python +and ipython shell, web application servers, and six graphical user interface toolkits. +""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pyshortver = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +zlibver = '1.2.8' +dependencies = [ + (python, pythonversion), + ('zlib', zlibver), + ('freetype', '2.4.10'), + ('libpng', '1.6.3', '-zlib-%s' % zlibver), +] + +pyprefix = 'lib/python%s/site-packages' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver +sanity_check_paths = { + 'files': [], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..42b1105348 --- /dev/null +++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,33 @@ +easyblock = "PythonPackage" + +name = 'molmod' +version = '1.0' + +homepage = 'http://molmod.github.io/molmod/' +description = """MolMod is a Python library with many compoments that are useful to write molecular modeling programs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://users.ugent.be/~tovrstra/molmod'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('matplotlib', '1.2.1', versionsuffix), +] + +# disable tests that require X11 by specifying "backend: agg" in matplotlibrc +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/molmod' % pythonshortversion], +} + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..1f5199fe78 --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb @@ -0,0 +1,22 @@ +name = 'netCDF-C++' +version = '4.2' + +homepage = 'http://www.unidata.ucar.edu/software/netcdf/' +description = """NetCDF (network Common Data Form) is a set of software libraries + and machine-independent data formats that support the creation, access, and sharing of array-oriented + scientific data.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +sources = ['netcdf-cxx-%(version)s.tar.gz'] +source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] + +dependencies = [('netCDF', '4.2.1.1')] + +sanity_check_paths = { + 'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'], + 'dirs': [], +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb new file mode 100644 index 0000000000..c5d0574900 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb @@ -0,0 +1,26 @@ +name = 'numpy' +version = '1.8.0' + +homepage = 'http://www.numpy.org' +description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things: + a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran + code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses, + NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be + defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCE_TAR_GZ] + +patches = ['numpy-1.8.0-mkl.patch'] + +python = 'Python' +pyver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..34d46acb15 --- /dev/null +++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb @@ -0,0 +1,33 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "OTF" +version = "1.12.4" +majorsuffix = 'salmon' + +homepage = 'http://www.tu-dresden.de/zih/otf/' +description = """The Open Trace Format is a highly scalable, memory efficient event + trace data format plus support library. It is the standard trace format + for Vampir, and is open for other tools. [NOW OBSOLETE: use OTF2]""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz +sources = ['%%(name)s-%%(version)s%s.tar.gz' % majorsuffix] +source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get='] + +# name change in version 1.12.3: "open-trace-format" was "otf" in older versions +# "open-trace-format" => "otf" for versions until 1.12.2 +sanity_check_paths = { + 'files': ["bin/otfconfig", "include/open-trace-format/otf.h", + # note by Bernd Mohr: on some systems libraries end up in lib/ + ("lib64/libopen-trace-format.a", "lib/libopen-trace-format.a")], + 'dirs': [], +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..341f324efb --- /dev/null +++ b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb @@ -0,0 +1,31 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +easyblock = 'EB_Score_minus_P' + +name = "OTF2" +version = "1.2.1" + +homepage = 'http://www.score-p.org' +description = """The Open Trace Format 2 is a highly scalable, memory efficient event + trace data format plus support library. It will become the new standard trace format + for Scalasca, Vampir, and Tau and is open for other tools.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# http://www.vi-hps.org/upload/packages/otf2/otf2-1.2.1.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.vi-hps.org/upload/packages/otf2/'] + +sanity_check_paths = { + # note by Bernd Mohr: on some systems libraries end up in lib/ + 'files': ["bin/otf2-config", "include/otf2/otf2.h", ("lib64/libotf2.a", "lib/libotf2.a")], + 'dirs': [], +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..c32ddbd8d2 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb @@ -0,0 +1,51 @@ +name = 'OpenBLAS' +version = '0.2.6' + +lapackver = '3.4.2' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..1ea6e6468c --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb @@ -0,0 +1,51 @@ +name = 'OpenBLAS' +version = '0.2.8' + +lapackver = '3.4.2' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..0d17976392 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = 'OpenSSL' +version = '1.0.0' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' -- GitLab From a40e13d37bbece2ae0dafec1a25940bd37011a56 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 5 Dec 2013 12:02:25 +0100 Subject: [PATCH 398/811] add missing easyconfigs for ictce/5.3.0, series p-z --- .../p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb | 44 +++++++++++++++++ .../easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb | 48 +++++++++++++++++++ .../p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb | 30 ++++++++++++ .../p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb | 30 ++++++++++++ .../p/PSI/PSI-4.0b4-ictce-5.3.0.eb | 28 +++++++++++ .../p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb | 31 ++++++++++++ .../p/PSI/PSI-4.0b5-ictce-5.3.0.eb | 30 ++++++++++++ .../p/Python/Python-2.5.6-ictce-5.3.0-bare.eb | 23 +++++++++ .../phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb | 35 ++++++++++++++ .../p/pixman/pixman-0.28.2-ictce-5.3.0.eb | 18 +++++++ .../printproto-1.0.5-ictce-5.3.0.eb | 17 +++++++ ...pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb | 32 +++++++++++++ .../easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb | 20 ++++++++ .../SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb | 14 ++++++ .../SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb | 26 ++++++++++ .../s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb | 35 ++++++++++++++ .../s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb | 34 +++++++++++++ .../Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb | 21 ++++++++ .../s/Silo/Silo-4.9.1-ictce-5.3.0.eb | 20 ++++++++ .../s/Stacks/Stacks-1.03-ictce-5.3.0.eb | 29 +++++++++++ .../s/Stride/Stride-1.0-ictce-5.3.0.eb | 24 ++++++++++ ...kit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb | 28 +++++++++++ .../scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb | 19 ++++++++ .../sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb | 32 +++++++++++++ .../t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb | 19 ++++++++ .../w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb | 25 ++++++++++ .../w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb | 28 +++++++++++ .../w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb | 29 +++++++++++ .../w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb | 29 +++++++++++ .../w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb | 37 ++++++++++++++ .../w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb | 36 ++++++++++++++ ...i2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb | 44 +++++++++++++++++ ...L-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb | 25 ++++++++++ ...XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb | 25 ++++++++++ .../x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb | 17 +++++++ .../xextproto/xextproto-7.2.1-ictce-5.3.0.eb | 23 +++++++++ .../x/xtrans/xtrans-1.2-ictce-5.3.0.eb | 24 ++++++++++ .../YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb | 35 ++++++++++++++ .../yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb | 36 ++++++++++++++ .../z/zsh/zsh-5.0.2-ictce-5.3.0.eb | 16 +++++++ 40 files changed, 1116 insertions(+) create mode 100644 easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb create mode 100644 easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb create mode 100644 easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb create mode 100644 easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb create mode 100644 easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb create mode 100644 easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb create mode 100644 easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb create mode 100644 easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..0376287c5e --- /dev/null +++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb @@ -0,0 +1,44 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html +## + +name = 'PAPI' +version = '5.2.0' + +homepage = 'http://icl.cs.utk.edu/projects/papi/' +description = """PAPI provides the tool designer and application engineer with a consistent interface and + methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables + software engineers to see, in near real time, the relation between software performance and processor events. + In addition Component PAPI provides access to a collection of components + that expose performance measurement opportunites across the hardware and software stack.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# Example download URL, for reference: http://icl.cs.utk.edu/projects/papi/downloads/papi-5.0.0.tar.gz +source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/'] +sources = [SOURCELOWER_TAR_GZ] + +start_dir = 'src' + +# parallel build doesn't always work +parallel = 1 + +runtest = 'fulltest' + +sanity_check_paths = { + 'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail", + "cost", "decode", "error_codes", "event_chooser", + "mem_info", "multiplex_cost", "native_avail", "version", + "xml_event_info"]], + 'dirs': [], +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb new file mode 100644 index 0000000000..d5d52a3127 --- /dev/null +++ b/easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb @@ -0,0 +1,48 @@ +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany +# Authors:: Bernd Mohr +# License:: New BSD +# +# This work is based from experiences from the UNITE project +# http://apps.fz-juelich.de/unite/ +## +name = "PDT" +version = "3.19" + +homepage = 'http://www.cs.uoregon.edu/research/pdt/' +description = """Program Database Toolkit (PDT) is a framework for analyzing source + code written in several programming languages and for making rich program knowledge + accessible to developers of static and dynamic analysis tools. PDT implements a standard + program representation, the program database (PDB), that can be accessed in a uniform way + through a class library supporting common PDB operations.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# http://tau.uoregon.edu/pdt_releases/pdtoolkit-3.19.tar.gz +sources = ['pdtoolkit-%(version)s.tar.gz'] +source_urls = ['http://tau.uoregon.edu/pdt_releases/'] + +prefix_opt = '-prefix=' + +# notes by Bernd Mohr +# Compiler suite should always be specified -- MUCH quicker and SAVER than autodetect +# -KAI|-KCC|-GNU|-CC|-c++|-cxx|-xlC|-pgCC|-icpc|-ecpc +configopts = '-GNU' + +keeppreviousinstall = True + +# notes by Bernd Mohr +# Use hardcoded x86_64 or "import platform; machine = platform.machine()" here? +sanity_check_paths = { + 'files': ["x86_64/bin/cparse", "x86_64/include/pdb.h", "x86_64/lib/libpdb.a"], + 'dirs': [], +} + +skipsteps = ['build'] + +modextrapaths = { + 'PATH': "x86_64/bin", + 'LD_LIBRARY_PATH': "x86_64/lib", +} + +moduleclass = 'perf' diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb new file mode 100644 index 0000000000..3d4858dc19 --- /dev/null +++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb @@ -0,0 +1,30 @@ +easyblock = "PythonPackage" + +name = 'PP' +version = '1.6.4' + +homepage = 'http://www.parallelpython.com/' +description = """PP is a python module which provides mechanism for parallel execution of python code on SMP + (systems with multiple processors or cores) and clusters (computers connected via network).""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.parallelpython.com/downloads/pp/'] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), +] + +sanity_check_paths = { + 'files': ['lib/python%s/site-packages/%%(namelower)s.py' % pythonshortversion], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb new file mode 100644 index 0000000000..d9bf4f7fd5 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb @@ -0,0 +1,30 @@ +name = 'PSI' +version = '4.0b4' +versionsuffix = '-mt' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +# not using MPI results in a build relying on multithreaded BLAS solely +toolchainopts = {'usempi': False} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b4-mpi.patch', + 'PSI-4.0b4-thread-pool.patch', +] + +python = 'Python' +pyver = '2.7.3' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb new file mode 100644 index 0000000000..55585c69df --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb @@ -0,0 +1,28 @@ +name = 'PSI' +version = '4.0b4' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b4-mpi.patch', + 'PSI-4.0b4-thread-pool.patch', +] + +python = 'Python' +pyver = '2.7.3' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb new file mode 100644 index 0000000000..5e2d6e7d5e --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb @@ -0,0 +1,31 @@ +name = 'PSI' +version = '4.0b5' +versionsuffix = '-mt' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +# not using MPI results in a build relying on multithreaded BLAS solely +toolchainopts = {'usempi': False} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-thread-pool.patch', + 'PSI-4.0b5-new-plugin.patch', +] + +python = 'Python' +pyver = '2.7.5' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb new file mode 100644 index 0000000000..324e93c116 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb @@ -0,0 +1,30 @@ +name = 'PSI' +version = '4.0b5' + +homepage = 'http://www.psicode.org/' +description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for +efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform +computations with more than 2500 basis functions running serially or in parallel.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'usempi': True} + +source_urls = ['http://download.sourceforge.net/psicode/'] +sources = ['%(namelower)s%(version)s.tar.gz'] + +patches = [ + 'PSI-4.0b5-mpi-memcpy.patch', + 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-thread-pool.patch', + 'PSI-4.0b5-new-plugin.patch', +] + +python = 'Python' +pyver = '2.7.5' + +dependencies = [ + (python, pyver), + ('Boost', '1.53.0', '-%s-%s' % (python, pyver)), +] + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb new file mode 100644 index 0000000000..68a4b58e99 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb @@ -0,0 +1,23 @@ +name = 'Python' +version = '2.5.6' +versionsuffix = '-bare' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python_libffi_int128_icc.patch'] + +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..c9d54a15dd --- /dev/null +++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,35 @@ +easyblock = "PythonPackage" + +name = 'phonopy' +version = '1.6.4' + +homepage = 'http://phonopy.sourceforge.net/' +description = """Phonopy is an open source package of phonon calculations based on the supercell approach.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonversion = '2.7.3' +pythonshortversion = '.'.join(pythonversion.split('.')[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('matplotlib', '1.2.1', versionsuffix), + ('lxml', '3.1.2', versionsuffix), + ('PyYAML', '3.10', versionsuffix), +] + +pylibdir = "lib/python%s/site-packages/%%(name)s" % pythonshortversion + +sanity_check_paths = { + 'files': [], + 'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion), pylibdir)], +} + +moduleclass = 'lib' + diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..f27088d0c8 --- /dev/null +++ b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb @@ -0,0 +1,18 @@ +name = "pixman" +version = '0.28.2' + +homepage = 'http://www.pixman.org/' +description = """Pixman is a low-level software library for pixel manipulation, providing features such as image +compositing and trapezoid rasterization. Important users of pixman are the cairo graphics library and the X server.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://cairographics.org/releases/'] +sources = [SOURCE_TAR_GZ] + +sanity_check_paths = { + 'files': ['lib/libpixman-1.so'], + 'dirs': [] +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb new file mode 100644 index 0000000000..bc10ad3e08 --- /dev/null +++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'printproto' +version = '1.0.5' + +homepage = 'http://xorg.freedesktop.org/' +description = """X.org PrintProto protocol headers.""" + +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] +sources = [SOURCELOWER_TAR_GZ] + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sanity_check_paths = { + 'files': ['include/X11/extensions/Print.h', 'include/X11/extensions/Printstr.h'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..bf06ddc40b --- /dev/null +++ b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,32 @@ +easyblock = "PythonPackage" + +name = 'pysqlite' +version = '2.6.3' + +homepage = 'https://pypi.python.org/pypi/pysqlite' +description = """pysqlite is an interface to the SQLite 3.x embedded relational database engine. + It is almost fully compliant with the Python database API version 2.0 also exposes the unique features of SQLite.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['https://pypi.python.org/packages/source/p/pysqlite/'] +sources = [SOURCELOWER_TAR_GZ] + +python = 'Python' +pyver = '2.7.3' +pyshortver = '2.7' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), + ('SQLite', '3.8.1'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(name)s%%(version_major)s' % pyshortver], +} + +options = {'modulename': '%(name)s%(version_major)s'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb new file mode 100644 index 0000000000..e712e4c5a2 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'Qt' +version = '4.8.5' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://download.qt-project.org/official_releases/qt/4.8/4.8.5/'] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +configopts="-confirm-license -opensource -silent" + +sanity_check_paths = { + 'files': ['lib/libQtCore.so'], + 'dirs': [], +} +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb new file mode 100644 index 0000000000..7bad11e6da --- /dev/null +++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb @@ -0,0 +1,14 @@ +name = 'SCOTCH' +version = '6.0.0_esmumps' + +homepage = 'http://www.labri.fr/perso/pelegrin/scotch/' +description = """Software package and libraries for sequential and parallel graph partitioning, +static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +source_urls = ['https://gforge.inria.fr/frs/download.php/31832/'] +sources = ['%(namelower)s_%(version)s.tar.gz'] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb new file mode 100644 index 0000000000..35beebb612 --- /dev/null +++ b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb @@ -0,0 +1,26 @@ +easyblock = 'PythonPackage' + +name = 'SCons' +version = '2.3.0' + +homepage = 'http://www.scons.org/' +description = "SCons is a software construction tool." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +python = 'Python' +pyver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pyver) +dependencies = [(python, pyver)] + +sanity_check_paths = { + 'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'], + 'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'], +} + +options = {'modulename': False} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..2d87802022 --- /dev/null +++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb @@ -0,0 +1,35 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'SQLite' +version = '3.8.1' + +homepage = 'http://www.hwaci.com/sw/sqlite/' +description = "SQLite: SQL Database Engine in a C Library" + +# eg. http://www.hwaci.com/sw/sqlite/2013/sqlite-autoconf-3080100.tar.gz +source_urls = ['http://www.hwaci.com/sw/sqlite/2013'] +sources = ['sqlite-autoconf-%s0%s0%s00.tar.gz' % tuple(version.split('.'))] # very weird way to calculate your filename + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +dependencies = [ + ('libreadline', '6.2'), + ('Tcl', '8.6.1'), +] + +sanity_check_paths = { + 'files': ['bin/sqlite3'], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb b/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb new file mode 100644 index 0000000000..711aeda3a7 --- /dev/null +++ b/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb @@ -0,0 +1,34 @@ +# +# author: Dina Mahmoud Ibrahim ( Cairo University ) +# +easyblock = 'MakeCp' + +name = 'SURF' +version = '1.0' +ARCH = 'LINUXAMD64' +versionsuffix = '-%s' % ARCH + +homepage = 'http://www.ks.uiuc.edu/Research/vmd/vmd-1.7/ug/node65.html' +description = "A molecular surface solver, which can be used as rendering method in VMD." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.ks.uiuc.edu/Research/vmd/extsrcs'] +sources = [('%(namelower)s.tar.Z', 'tar -xzf %s')] + +builddependencies = [ + ('makedepend', '1.0.4'), + ('ed', '1.9'), +] + +premakeopts = 'make INCLUDE="-I. -I$EBROOTGCC/lib/gcc/x86_64-unknown-linux-gnu/$EBVERSIONGCC/include" depend && ' +makeopts = ' && mv surf surf_%s' % ARCH + +files_to_copy = [(['surf_%s' % ARCH], "bin")] + +sanity_check_paths = { + 'files': ['bin/surf_%s' % ARCH], + 'dirs': [], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb new file mode 100644 index 0000000000..12bb8bfb6e --- /dev/null +++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = 'Sablotron' +version = '1.0.3' + +homepage = 'http://sablotron.sourceforge.net/' +description = """Sablotron XML processor""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['Sablot-%(version)s.tar.gz'] + +patches = ['%(name)s-%(version)s_recent-icpc.patch'] + +dependencies = [('expat', '2.1.0')] + +sanity_check_paths = { + 'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.so'], + 'dirs': ['share/doc/html/sablot', 'man'], +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..672084b8d3 --- /dev/null +++ b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb @@ -0,0 +1,20 @@ +name = 'Silo' +version = '4.9.1' + +homepage = 'https://wci.llnl.gov/codes/silo/' +description = """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True, 'pic': True, 'usempi': True} + +sources = ['%(namelower)s-%(version)s.tar.gz'] +source_urls = ['https://wci.llnl.gov/codes/silo/silo-%(version)s'] + +configopts = '--disable-silex' + +sanity_check_paths = { + 'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a'], + 'dirs': [], +} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb new file mode 100644 index 0000000000..196d2c22e4 --- /dev/null +++ b/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb @@ -0,0 +1,29 @@ +name = 'Stacks' +version = '1.03' + +homepage = 'http://creskolab.uoregon.edu/stacks/' +description = """Stacks is a software pipeline for building loci from short-read sequences, such as those generated on + the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose + of building genetic maps and conducting population genomics and phylogeography. +""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://creskolab.uoregon.edu/stacks/source/'] +sources = [SOURCELOWER_TAR_GZ] + +runtest = "check" + +sanity_check_paths = { + 'files': [ + 'bin/%s' % binfile for binfile in [ + 'clone_filter', 'denovo_map.pl', 'exec_velvet.pl', 'genotypes', 'index_radtags.pl', 'load_radtags.pl', + 'populations', 'process_shortreads', 'ref_map.pl', 'sstacks', 'ustacks', 'cstacks', 'estacks', + 'export_sql.pl', 'hstacks', 'kmer_filter', 'load_sequences.pl', 'process_radtags', 'pstacks', + 'sort_read_pairs.pl', 'stacks_export_notify.pl', + ] + ], + 'dirs': [], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb new file mode 100644 index 0000000000..da61249bcf --- /dev/null +++ b/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb @@ -0,0 +1,24 @@ +# +# author: Dina Mahmoud Ibrahim ( Cairo University ) +# +easyblock = 'MakeCp' + +name = "Stride" +version = "1.0" + +homepage = 'http://structure.usc.edu/stride/' +description = "STRIDE is a program to recognize secondary structural elements in proteins from their atomic coordinates" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://ftp.ebi.ac.uk/pub/software/unix/stride/src/'] +sources = ['%(namelower)s.tar.gz' ] + +files_to_copy = [(['stride'], "bin")] + +sanity_check_paths = { + 'files': ['bin/stride'], + 'dirs': [], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb new file mode 100644 index 0000000000..fb08bf0088 --- /dev/null +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb @@ -0,0 +1,28 @@ +easyblock = "PythonPackage" + +name = "scikit-learn" +version = "0.14" + +homepage = 'http://scikit-learn.org/stable/index.html' +description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world, +building upon numpy, scipy, and matplotlib. As a machine-learning module, +it provides versatile tools for data mining and analysis in any field of science and engineering. +It strives to be simple and efficient, accessible to everybody, and reusable in various contexts.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) +dependencies = [ + (python, pythonversion), + ('matplotlib', '1.3.0', versionsuffix), +] + +options = {'modulename': "sklearn"} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..a44fd73413 --- /dev/null +++ b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,19 @@ +name = 'scipy' +version = '0.12.0' +versionsuffix = '-Python-2.7.3' + +homepage = 'http://www.scipy.org' +description = """SciPy is a collection of mathematical algorithms and convenience + functions built on the Numpy extension for Python.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} + +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] +sources = [SOURCE_TAR_GZ] + +dependencies = [ + ('numpy', '1.6.2', versionsuffix), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..1328146b8e --- /dev/null +++ b/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,32 @@ +easyblock = "PythonPackage" + +name = 'sympy' +version = '0.7.2' + +homepage = 'http://sympy.org/' +description = """SymPy is a Python library for symbolic mathematics. It aims to + become a full-featured computer algebra system (CAS) while keeping the code as + simple as possible in order to be comprehensible and easily extensible. SymPy + is written entirely in Python and does not require any external libraries.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['https://sympy.googlecode.com/files'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [(python, pythonversion)] + +runtest = 'python setup.py test' + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/sympy' % pythonshortversion], +} + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..fa866637b3 --- /dev/null +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = 'Tcl' +version = '8.6.1' + +homepage = 'http://www.tcl.tk/' +description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, +suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ["http://prdownloads.sourceforge.net/tcl"] +sources = ['%(namelower)s%(version)s-src.tar.gz'] + +configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' + +runtest = 'test' + +start_dir = 'unix' + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb new file mode 100644 index 0000000000..eaf41baf93 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb @@ -0,0 +1,25 @@ +name = 'WPS' +version = '3.3.1' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True} + +sources = ['%(name)sV%(version)s.TAR.gz'] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.1.3'), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1') + ] + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb new file mode 100644 index 0000000000..3dfc001558 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb @@ -0,0 +1,28 @@ +name = 'WPS' +version = '3.4.1' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True} + +sources = ['%(name)sV%(version)s.TAR.gz'] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +patches = ['WPS_netCDF-Fortran_seperate_path.patch'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('libpng', '1.5.14'), + ('JasPer','1.900.1') + ] + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb new file mode 100644 index 0000000000..daef6c10e6 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb @@ -0,0 +1,29 @@ +name = 'WPS' +version = '3.5' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True} + +sources = ['%(name)sV%(version)s.TAR.gz'] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +patches = ['WPS_netCDF-Fortran_seperate_path.patch'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('zlib', '1.2.7'), + ('libpng', '1.6.3'), + ('JasPer', '1.900.1'), +] + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb new file mode 100644 index 0000000000..66eecfdfed --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb @@ -0,0 +1,29 @@ +name = 'WPS' +version = '3.5.1' + +homepage = 'http://www.wrf-model.org' +description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is + a next-generation mesoscale numerical weather prediction system designed to serve both operational + forecasting and atmospheric research needs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': True} + +sources = ['%(name)sV%(version)s.TAR.gz'] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +patches = ['WPS_netCDF-Fortran_seperate_path.patch'] + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +dependencies = [ + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('zlib', '1.2.7'), + ('libpng', '1.6.3'), + ('JasPer', '1.900.1'), +] + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb new file mode 100644 index 0000000000..227be5752c --- /dev/null +++ b/easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb @@ -0,0 +1,37 @@ +name = 'WRF' +version = '3.4.1' + +homepage = 'http://www.wrf-model.org' +description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale + numerical weather prediction system designed to serve both operational forecasting and atmospheric + research needs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 + +sources = ['%(name)sV%(version)s.TAR.gz'] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +# csh is used by WRF install scripts +builddependencies = [('tcsh', '6.18.01')] + +dependencies = [ + ('JasPer', '1.900.1'), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), +] + +patches = [ + 'WRF_parallel_build_fix.patch', + 'WRF-3.4.1_netCDF-Fortran_separate_path.patch', + 'WRF_FC-output-spec_fix.patch', + 'WRF_tests_limit-runtimes.patch', +] + +# limit parallel build to 20 +maxparallel = 20 + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb new file mode 100644 index 0000000000..f02edb4567 --- /dev/null +++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb @@ -0,0 +1,36 @@ +name = 'WRF' +version = '3.5.1' + +homepage = 'http://www.wrf-model.org' +description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale + numerical weather prediction system designed to serve both operational forecasting and atmospheric + research needs.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 + +sources = ['%(name)sV%(version)s.TAR.gz'] +source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] + +# csh is used by WRF install scripts +builddependencies = [('tcsh', '6.18.01')] + +dependencies = [ + ('JasPer', '1.900.1'), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), +] + +patches = [ + 'WRF_parallel_build_fix.patch', + 'WRF-3.5_netCDF-Fortran_separate_path.patch', + 'WRF_tests_limit-runtimes.patch', +] + +# limit parallel build to 20 +maxparallel = 20 + +buildtype = "dmpar" +versionsuffix = '-%s' % buildtype + +moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..3e35384c19 --- /dev/null +++ b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,44 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/index.html +## + +easyblock = "PythonPackage" + +name = 'wiki2beamer' +version = '0.9.5' + +homepage = 'http://wiki2beamer.sourceforge.net/' +description = """wiki2beamer converts a simple wiki-like syntax to complex LaTeX beamer code. + It's written in python and should run on all *nix platforms. Afraid to loose some LaTeX powers? + Don't worry: you can always fall back to plain LaTeX as wiki2beamer is just a preprocessor.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +# eg. http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5/wiki2beamer-0.9.5.zip/download +sources = ['wiki2beamer-0.9.5.zip'] +source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5','download'] + +python = 'Python' +pyver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [(python, pyver)] + +start_dir = 'code' + +options = {'modulename': False} + +sanity_check_paths = { + 'files': ["bin/wiki2beamer"], + 'dirs': ["."] + } + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb new file mode 100644 index 0000000000..f91b2703dc --- /dev/null +++ b/easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb @@ -0,0 +1,25 @@ +easyblock = 'PerlModule' + +name = 'XML-LibXML' +version = '2.0018' + +homepage = 'http://search.cpan.org/src/SHLOMIF/XML-LibXML-2.0018/' +description = """Perl binding for libxml2""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.cpan.org/modules/by-module/XML/SHLOMIF/'] +sources = [SOURCE_TAR_GZ] + +perl = 'Perl' +perlver = '5.16.3' +versionsuffix = '-%s-%s' % (perl, perlver) + +dependencies = [ + (perl, perlver), + ("libxml2", "2.9.0"), +] + +options = {'modulename': 'XML::LibXML'} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb new file mode 100644 index 0000000000..e61280523c --- /dev/null +++ b/easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb @@ -0,0 +1,25 @@ +easyblock = 'PerlModule' + +name = 'XML-Simple' +version = '2.20' + +homepage = 'http://search.cpan.org/src/GRANTM/XML-Simple-2.20/' +description = """Easily read/write XML in Perl""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.cpan.org/modules/by-module/XML/GRANTM/'] +sources = [SOURCE_TAR_GZ] + +perl = 'Perl' +perlver = '5.16.3' +versionsuffix = '-%s-%s' % (perl, perlver) + +dependencies = [ + (perl, perlver), + ("XML-LibXML", "2.0018", versionsuffix), +] + +options = {'modulename': 'XML::Simple'} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..b3d975a744 --- /dev/null +++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb @@ -0,0 +1,17 @@ +name = 'xbitmaps' +version = '1.1.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """provides bitmaps for x""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/data/'] + +sanity_check_paths = { + 'files' : ['include/X11/bitmaps/gray'], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..b6a0c15993 --- /dev/null +++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb @@ -0,0 +1,23 @@ +name = 'xextproto' +version = '7.2.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """XExtProto protocol headers.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h', + 'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h', + 'xtestconst.h', 'xtestext1proto.h' + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..11eabbd405 --- /dev/null +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb @@ -0,0 +1,24 @@ +name = 'xtrans' +version = '1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """xtrans includes a number of routines to make X implementations transport-independent; + at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. +""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +sanity_check_paths = { + 'files' : ['include/X11/Xtrans/%s' % x for x in [ + 'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', + 'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c' + ] + ], + 'dirs' : [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb new file mode 100644 index 0000000000..30d441b40a --- /dev/null +++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb @@ -0,0 +1,35 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Nils Christian +# License:: MIT/GPL +# $Id$ +# +## +easyblock = 'PerlModule' + +name = 'YAML-Syck' +version = '1.27' + +homepage = 'http://search.cpan.org/perldoc?YAML%3A%3ASyck' +description = """Fast, lightweight YAML loader and dumper. + This module provides a Perl interface to the libsyck data serialization library.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://www.cpan.org/modules/by-module/YAML'] +sources = [SOURCE_TAR_GZ] + +perl = 'Perl' +perlver = '5.16.3' +perlverextra = '' +versionsuffix = '-%s-%s%s' % (perl, perlver,perlverextra) + +dependencies = [ + (perl, perlver, perlverextra), +] + +options = {'modulename': 'YAML::Syck'} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb new file mode 100644 index 0000000000..e0ef7ac9a4 --- /dev/null +++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb @@ -0,0 +1,36 @@ +easyblock = "PythonPackage" + +name = 'yaff' +version = '1.0' + +homepage = 'http://molmod.github.io/yaff/' +description = """Yaff stands for 'Yet another force field'. It is a pythonic force-field code.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://users.ugent.be/~tovrstra/yaff'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('h5py', '2.1.3', versionsuffix), + ('matplotlib', '1.2.1', versionsuffix), + ('Cython', '0.19.1', versionsuffix), + ('molmod', '1.0', versionsuffix), +] + +# disable tests that require X11 by specifying "backend: agg" in matplotlibrc +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortversion], +} + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb new file mode 100644 index 0000000000..942cf2610b --- /dev/null +++ b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb @@ -0,0 +1,16 @@ +name = 'zsh' +version = '5.0.2' + +homepage = 'http://www.zsh.org/' +description = "Zsh is a shell designed for interactive use, although it is also a powerful scripting language." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +# skip test that fails when zsh is built in non-terminal environment +# see http://www.zsh.org/mla/users/2003/msg00852.html +configopts = '--with-tcsetpgrp' + +moduleclass = 'tools' -- GitLab From b3f250e9e192d959055192e58f92e7b48f100fb8 Mon Sep 17 00:00:00 2001 From: "Wiktor Jurkowski Wiktor.Jurkowski@uni.lu" Date: Thu, 5 Dec 2013 13:57:27 +0100 Subject: [PATCH 399/811] add GATK-2.6-5 & GATK-2.7-4 --- .../g/GATK/GATK-2.6-5-Java-1.7.0_10.eb | 40 +++++++++++++++++++ .../g/GATK/GATK-2.7-4-Java-1.7.0_10.eb | 40 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb create mode 100644 easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb new file mode 100644 index 0000000000..cd3b27bab6 --- /dev/null +++ b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb @@ -0,0 +1,40 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB +# Authors:: George Tsouloupas , Fotis Georgatos , Kenneth Hoste (UGent) +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +easyblock = 'Tarball' + +name = 'GATK' +version = '2.6-5' + +homepage = 'http://www.broadinstitute.org/gatk/' +description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute + to analyse next-generation resequencing data. The toolkit offers a wide variety of tools, + with a primary focus on variant discovery and genotyping as well as strong emphasis on + data quality assurance. Its robust architecture, powerful processing engine and + high-performance computing features make it capable of taking on projects of any size.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# download manually from http://www.broadinstitute.org/gatk/download +sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)] + +java = 'Java' +javaver = '1.7.0_10' +versionsuffix = '-%s-%s' % (java, javaver) +dependencies = [(java, javaver)] + +sanity_check_paths = { + 'files': ["GenomeAnalysisTK.jar"], + 'dirs': ["resources"], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb new file mode 100644 index 0000000000..e9bb8a2fb7 --- /dev/null +++ b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb @@ -0,0 +1,40 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB +# Authors:: George Tsouloupas , Fotis Georgatos , Kenneth Hoste (UGent) +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +easyblock = 'Tarball' + +name = 'GATK' +version = '2.7-4' + +homepage = 'http://www.broadinstitute.org/gatk/' +description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute + to analyse next-generation resequencing data. The toolkit offers a wide variety of tools, + with a primary focus on variant discovery and genotyping as well as strong emphasis on + data quality assurance. Its robust architecture, powerful processing engine and + high-performance computing features make it capable of taking on projects of any size.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# download manually from http://www.broadinstitute.org/gatk/download +sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)] + +java = 'Java' +javaver = '1.7.0_10' +versionsuffix = '-%s-%s' % (java, javaver) +dependencies = [(java, javaver)] + +sanity_check_paths = { + 'files': ["GenomeAnalysisTK.jar"], + 'dirs': ["resources"], +} + +moduleclass = 'bio' -- GitLab From b6aff27f783dff81b8697e4496251d7b9bbc1a33 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 5 Dec 2013 14:35:22 +0100 Subject: [PATCH 400/811] add easyconfig for SAMtools with ictce/5.5.0, clean up corresponding goolf easyconfig --- .../SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb | 6 +- .../s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb | 33 ++++++++ .../SAMtools-0.1.19_Makefile-ncurses.patch | 81 +++++++++++++++++++ .../SAMtools_0.1.19_Makefile-ncurses.patch | 46 ----------- .../s/SAMtools/SAMtools_0.1.19_misc.patch | 49 ----------- 5 files changed, 117 insertions(+), 98 deletions(-) create mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch delete mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch delete mode 100644 easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb index 06c8c4d00c..3f46ced5c1 100644 --- a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb @@ -21,13 +21,13 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_BZ2] -source_urls = [('http://sourceforge.net/projects/samtools/files/%s/%s' % (name.lower(), version), 'download')] +source_urls = [('http://sourceforge.net/projects/samtools/files/%(namelower)s/%(version)s', 'download')] -patches = ['SAMtools_0.1.19_Makefile-ncurses.patch','SAMtools_0.1.19_misc.patch'] +patches = ['SAMtools-%(version)s_Makefile-ncurses.patch'] dependencies = [ ('ncurses', '5.9'), - ('zlib', '1.2.8'), + ('zlib', '1.2.7'), ] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb new file mode 100644 index 0000000000..dd1a4bc9dd --- /dev/null +++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb @@ -0,0 +1,33 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'SAMtools' +version = '0.1.19' + +homepage = 'http://samtools.sourceforge.net/' +description = """SAM (Sequence Alignment/Map) format is a generic format +for storing large nucleotide sequence alignments.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [('http://sourceforge.net/projects/samtools/files/%(namelower)s/%(version)s', 'download')] + +patches = ['SAMtools-0.1.19_Makefile-ncurses.patch'] + +dependencies = [ + ('ncurses', '5.9'), + ('zlib', '1.2.7'), +] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch new file mode 100644 index 0000000000..c750681820 --- /dev/null +++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch @@ -0,0 +1,81 @@ +--- samtools-0.1.19/Makefile.orig 2013-03-19 08:48:09.000000000 +0100 ++++ samtools-0.1.19/Makefile 2013-12-05 11:39:20.167885410 +0100 +@@ -12,10 +12,10 @@ + cut_target.o phase.o bam2depth.o padding.o bedcov.o bamshuf.o \ + bam_tview_curses.o bam_tview_html.o + PROG= samtools +-INCLUDES= -I. ++INCLUDES= -I$(EBROOTNCURSES)/include -I$(EBROOTZLIB)/include -I. + SUBDIRS= . bcftools misc +-LIBPATH= +-LIBCURSES= -lcurses # -lXCurses ++LIBPATH= -L$(EBROOTZLIB)/lib ++LIBCURSES= -L$(EBROOTNCURSES)/lib -lcurses -L$(EBROOTZLIB)/lib -lz # -lXCurses + + .SUFFIXES:.c .o + .PHONY: all lib +@@ -47,10 +47,10 @@ + $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread + + razip:razip.o razf.o $(KNETFILE_O) +- $(CC) $(CFLAGS) -o $@ $^ -lz ++ $(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz + + bgzip:bgzip.o bgzf.o $(KNETFILE_O) +- $(CC) $(CFLAGS) -o $@ $^ -lz -lpthread ++ $(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz -lpthread + + bgzf.o:bgzf.c bgzf.h + $(CC) -c $(CFLAGS) $(DFLAGS) -DBGZF_CACHE $(INCLUDES) bgzf.c -o $@ +@@ -81,10 +81,10 @@ + + + libbam.1.dylib-local:$(LOBJS) +- libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -lz ++ libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -L$(EBROOTZLIB)/lib -lz + + libbam.so.1-local:$(LOBJS) +- $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -lz ++ $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -L$(EBROOTZLIB)/lib -lz + + dylib: + @$(MAKE) cleanlocal; \ +--- samtools-0.1.19/misc/Makefile.orig 2013-03-19 08:48:09.000000000 +0100 ++++ samtools-0.1.19/misc/Makefile 2013-12-05 11:40:21.979700133 +0100 +@@ -28,19 +28,19 @@ + lib: + + bamcheck:bamcheck.o +- $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -lz ++ $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -L$(EBROOTZLIB)/lib -lz + + bamcheck.o:bamcheck.c ../faidx.h ../khash.h ../sam.h ../razf.h + $(CC) $(CFLAGS) -c -I.. -o $@ bamcheck.c + + ace2sam:ace2sam.o +- $(CC) $(CFLAGS) -o $@ ace2sam.o -lz ++ $(CC) $(CFLAGS) -o $@ ace2sam.o -L$(EBROOTZLIB)/lib -lz + + wgsim:wgsim.o +- $(CC) $(CFLAGS) -o $@ wgsim.o -lm -lz ++ $(CC) $(CFLAGS) -o $@ wgsim.o -lm -L$(EBROOTZLIB)/lib -lz + + md5fa:md5.o md5fa.o md5.h ../kseq.h +- $(CC) $(CFLAGS) -o $@ md5.o md5fa.o -lz ++ $(CC) $(CFLAGS) -o $@ md5.o md5fa.o -L$(EBROOTZLIB)/lib -lz + + md5sum-lite:md5sum-lite.o + $(CC) $(CFLAGS) -o $@ md5sum-lite.o +@@ -49,10 +49,10 @@ + $(CC) -c $(CFLAGS) -DMD5SUM_MAIN -o $@ md5.c + + maq2sam-short:maq2sam.c +- $(CC) $(CFLAGS) -o $@ maq2sam.c -lz ++ $(CC) $(CFLAGS) -o $@ maq2sam.c -L$(EBROOTZLIB)/lib -lz + + maq2sam-long:maq2sam.c +- $(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -lz ++ $(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -L$(EBROOTZLIB)/lib -lz + + md5fa.o:md5.h md5fa.c + $(CC) $(CFLAGS) -c -I.. -o $@ md5fa.c diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch deleted file mode 100644 index 98fd2203b8..0000000000 --- a/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_Makefile-ncurses.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- samtools-0.1.19.orig/Makefile 2013-03-19 08:48:09.000000000 +0100 -+++ samtools-0.1.19/Makefile 2013-11-29 13:17:00.210306930 +0100 -@@ -12,10 +12,10 @@ - cut_target.o phase.o bam2depth.o padding.o bedcov.o bamshuf.o \ - bam_tview_curses.o bam_tview_html.o - PROG= samtools --INCLUDES= -I. -+INCLUDES= -I$(EBROOTNCURSES)/include -I$(EBROOTZLIB)/include -I. - SUBDIRS= . bcftools misc --LIBPATH= --LIBCURSES= -lcurses # -lXCurses -+LIBPATH= -L$(EBROOTZLIB)/lib -+LIBCURSES= -L$(EBROOTNCURSES)/lib -lcurses -L$(EBROOTZLIB)/lib -lz # -lXCurses - - .SUFFIXES:.c .o - .PHONY: all lib -@@ -44,13 +44,13 @@ - $(AR) -csru $@ $(LOBJS) - - samtools:lib-recur $(AOBJS) -- $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -L$(EBROOTZLIB)/lib -lz -lpthread - - razip:razip.o razf.o $(KNETFILE_O) -- $(CC) $(CFLAGS) -o $@ $^ -lz -+ $(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz - - bgzip:bgzip.o bgzf.o $(KNETFILE_O) -- $(CC) $(CFLAGS) -o $@ $^ -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz -lpthread - - bgzf.o:bgzf.c bgzf.h - $(CC) -c $(CFLAGS) $(DFLAGS) -DBGZF_CACHE $(INCLUDES) bgzf.c -o $@ -@@ -81,10 +81,10 @@ - - - libbam.1.dylib-local:$(LOBJS) -- libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -lz -+ libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -L$(EBROOTZLIB)/lib -lz - - libbam.so.1-local:$(LOBJS) -- $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -lz -+ $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -L$(EBROOTZLIB)/lib -lz - - dylib: - @$(MAKE) cleanlocal; \ diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch deleted file mode 100644 index b3f2a74519..0000000000 --- a/easybuild/easyconfigs/s/SAMtools/SAMtools_0.1.19_misc.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- samtools-0.1.19.orig/misc/Makefile 2013-03-19 08:48:09.000000000 +0100 -+++ samtools-0.1.19/misc/Makefile 2013-11-29 13:34:10.250913354 +0100 -@@ -5,7 +5,8 @@ - DFLAGS= -D_FILE_OFFSET_BITS=64 - OBJS= - PROG= md5sum-lite md5fa maq2sam-short maq2sam-long ace2sam wgsim bamcheck --INCLUDES= -I.. -+INCLUDES= -I$(EBROOTNCURSES)/include -I$(EBROOTZLIB)/include -I.. -+LIBPATH= -L$(EBROOTZLIB)/lib - SUBDIRS= . - - .SUFFIXES:.c .o -@@ -28,19 +29,19 @@ - lib: - - bamcheck:bamcheck.o -- $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -lz -+ $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -L$(EBROOTZLIB)/lib -lz - - bamcheck.o:bamcheck.c ../faidx.h ../khash.h ../sam.h ../razf.h - $(CC) $(CFLAGS) -c -I.. -o $@ bamcheck.c - - ace2sam:ace2sam.o -- $(CC) $(CFLAGS) -o $@ ace2sam.o -lz -+ $(CC) $(CFLAGS) -o $@ ace2sam.o -L$(EBROOTZLIB)/lib -lz - - wgsim:wgsim.o -- $(CC) $(CFLAGS) -o $@ wgsim.o -lm -lz -+ $(CC) $(CFLAGS) -o $@ wgsim.o -lm -L$(EBROOTZLIB)/lib -lz - - md5fa:md5.o md5fa.o md5.h ../kseq.h -- $(CC) $(CFLAGS) -o $@ md5.o md5fa.o -lz -+ $(CC) $(CFLAGS) -o $@ md5.o md5fa.o -L$(EBROOTZLIB)/lib -lz - - md5sum-lite:md5sum-lite.o - $(CC) $(CFLAGS) -o $@ md5sum-lite.o -@@ -49,10 +50,10 @@ - $(CC) -c $(CFLAGS) -DMD5SUM_MAIN -o $@ md5.c - - maq2sam-short:maq2sam.c -- $(CC) $(CFLAGS) -o $@ maq2sam.c -lz -+ $(CC) $(CFLAGS) -o $@ maq2sam.c -L$(EBROOTZLIB)/lib -lz - - maq2sam-long:maq2sam.c -- $(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -lz -+ $(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -L$(EBROOTZLIB)/lib -lz - - md5fa.o:md5.h md5fa.c - $(CC) $(CFLAGS) -c -I.. -o $@ md5fa.c -- GitLab From a203b011be7ed6128f74909abf90b8f09613a3c4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 5 Dec 2013 14:58:36 +0100 Subject: [PATCH 401/811] add missing zlib easyconfig for ictce/5.5.0 --- .../z/zlib/zlib-1.2.7-ictce-5.5.0.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb new file mode 100644 index 0000000000..fd81470bdd --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb @@ -0,0 +1,20 @@ +name = 'zlib' +version = '1.2.7' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, + not covered by any patents -- lossless data-compression library for use on virtually any + computer hardware and operating system.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From acd1bb013f7146f999951ed41b4b41065675b7fc Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 5 Dec 2013 21:28:51 +0100 Subject: [PATCH 402/811] init gperftools Signed-off-by: Fotis Georgatos --- .../gperftools/gperftools-2.1-goolf-1.4.10.eb | 26 +++++++++++++++++++ .../gperftools/gperftools-2.1-ictce-5.3.0.eb | 26 +++++++++++++++++++ .../l/libunwind/libunwind-1.1-goolf-1.4.10.eb | 21 +++++++++++++++ .../l/libunwind/libunwind-1.1-ictce-5.3.0.eb | 21 +++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..a532d7cc6b --- /dev/null +++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb @@ -0,0 +1,26 @@ +name = "gperftools" +version = "2.1" + +homepage = 'http://code.google.com/p/gperftools/' +description = """gperftools are for use by developers so that they can create more robust applications. + Especially of use to those developing multi-threaded applications in C++ with templates. + Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler.""" + +toolchain = {'version': '1.4.10', 'name': 'goolf'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://gperftools.googlecode.com/files'] + +dependencies = [ + ('Automake', '1.13.4'), + ('Autoconf', '2.69'), + ('libtool', '2.4.2'), + ('libunwind', '1.1'), +] + +sanity_check_paths = { + 'files': ["bin/pprof"], + 'dirs': [] +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..e7a1a41118 --- /dev/null +++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb @@ -0,0 +1,26 @@ +name = "gperftools" +version = "2.1" + +homepage = 'http://code.google.com/p/gperftools/' +description = """gperftools are for use by developers so that they can create more robust applications. + Especially of use to those developing multi-threaded applications in C++ with templates. + Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://gperftools.googlecode.com/files'] + +dependencies = [ + ('Automake', '1.13.4'), + ('Autoconf', '2.69'), + ('libtool', '2.4.2'), + ('libunwind', '1.1'), +] + +sanity_check_paths = { + 'files': ["bin/pprof"], + 'dirs': [] +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..83cc56ad97 --- /dev/null +++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb @@ -0,0 +1,21 @@ +name = "libunwind" +version = "1.1" + +homepage = 'http://www.nongnu.org/libunwind/' +description = """The primary goal of libunwind is to define a portable and efficient C programming interface + (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the + preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain + (non-local goto). The API supports both local (same-process) and remote (across-process) operation. + As such, the API is useful in a number of applications""" + +toolchain = {'version': '1.4.10', 'name': 'goolf'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://download.savannah.gnu.org/releases/libunwind/'] + +sanity_check_paths = { + 'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT], + 'dirs': [] +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..d8952f399c --- /dev/null +++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb @@ -0,0 +1,21 @@ +name = "libunwind" +version = "1.1" + +homepage = 'http://www.nongnu.org/libunwind/' +description = """The primary goal of libunwind is to define a portable and efficient C programming interface + (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the + preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain + (non-local goto). The API supports both local (same-process) and remote (across-process) operation. + As such, the API is useful in a number of applications""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://download.savannah.gnu.org/releases/libunwind/'] + +sanity_check_paths = { + 'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT], + 'dirs': [] +} + +moduleclass = 'lib' -- GitLab From b775329a88d4d797f19c949e63a7016161fa62dd Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 5 Dec 2013 22:19:10 +0100 Subject: [PATCH 403/811] init NEdit, Molekel, h4toh5 Signed-off-by: Fotis Georgatos --- .../h4toh5-2.2.2-linux-x86_64-static.eb | 20 +++++++++++++ .../m/Molekel/Molekel-5.4.0_Linux_x86_64.eb | 20 +++++++++++++ .../n/NEdit/NEdit-5.5-Linux-x86.eb | 28 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb create mode 100644 easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb create mode 100644 easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb diff --git a/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb b/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb new file mode 100644 index 0000000000..ba4c7ce505 --- /dev/null +++ b/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb @@ -0,0 +1,20 @@ +easyblock = 'Tarball' + +name = 'h4toh5' +version = '2.2.2' +versionsuffix = '-linux-x86_64-static' + +homepage = 'http://www.hdfgroup.org/h4toh5/' +description = """The h4toh5 software consists of the h4toh5 and h5toh4 command-line utilities, + as well as a conversion library for converting between individual HDF4 and HDF5 objects.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# fi. http://www.hdfgroup.org/ftp/HDF5/tools/h4toh5/bin/h4h5tools-2.2.1-linux-x86_64-static.tar.gz +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/tools/%s/bin' % name] +sources = ['%s-%s%s.tar.gz' % ('h4h5tools', version, versionsuffix)] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['h5toh4', 'h5toh4']], + 'dirs': [], +} diff --git a/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb b/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb new file mode 100644 index 0000000000..4d43f45e84 --- /dev/null +++ b/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb @@ -0,0 +1,20 @@ +easyblock = "Tarball" + +name = "Molekel" +version = "5.4.0" +versionsuffix = "-Linux_x86_64" + +homepage = "http://molekel.cscs.ch/" +description = """Molekel is an open-source multi-platform molecular visualization program.""" + +toolchain = {'version': 'dummy', 'name': 'dummy'} + +sources = ['molekel_%s_%s.tar.gz' % (version.replace('.', '_'), versionsuffix.lower()[1:])] +source_urls = ['ftp://ftp.cscs.ch/out/molekel/molekel_%(version_major_minor)s'] + +sanity_check_paths = { + 'files': ["bin/Molekel"], + 'dirs': [] +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb new file mode 100644 index 0000000000..a94cde2423 --- /dev/null +++ b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb @@ -0,0 +1,28 @@ +easyblock = "Tarball" + +name = "NEdit" +version = "5.5" +versionsuffix = "-Linux-x86" + +homepage = "http://www.nedit.org" +description = """NEdit is a multi-purpose text editor for the X Window System, + which combines a standard, easy to use, graphical user interface with the thorough + functionality and stability required by users who edit text eight hours a day.""" + +toolchain = {'version': 'dummy', 'name': 'dummy'} + +subdir = '_'.join(version.split('-')[0].split('.')) +source_urls = ['http://ftp.vim.org/editors/NEdit/v%s/executables' % subdir ] +sources = ["nedit-%s%s.tar.gz" % (version, versionsuffix)] + +sanity_check_paths = { + 'files': ["nc", "nedit"], + 'dirs': [] +} + +modextrapaths = { + 'PATH': '', + 'MANPATH': '', +} + +moduleclass = 'tools' -- GitLab From e9a462c360a2259ad5397952df78dc0b78978731 Mon Sep 17 00:00:00 2001 From: Toon Verstraelen Date: Thu, 5 Dec 2013 22:42:31 +0100 Subject: [PATCH 404/811] A few more packages needed for the nano course --- .../p/packmol/packmol-13.234-ictce-4.1.13.eb | 25 +++++++++ .../easyconfigs/p/packmol/packmol-ictce.patch | 51 +++++++++++++++++++ .../TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb | 36 +++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/p/packmol/packmol-ictce.patch create mode 100644 easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb b/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb new file mode 100644 index 0000000000..edf4eb9e27 --- /dev/null +++ b/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb @@ -0,0 +1,25 @@ +easyblock = "MakeCp" + +name = 'packmol' +version = '13.243' + +homepage = 'http://www.cmbi.ru.nl/molden/' +description = "Packing Optimization for Molecular Dynamics Simulations" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['https://packmol.googlecode.com/files'] + +patches = [ + 'packmol-ictce.patch' +] + +files_to_copy = [(['packmol'],'bin'), 'COPYING', 'AUTHORS', 'LICENSE'] + +sanity_check_paths={ + 'files': ['bin/packmol', 'COPYING', 'AUTHORS', 'LICENSE'], + 'dirs': [], +} + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/p/packmol/packmol-ictce.patch b/easybuild/easyconfigs/p/packmol/packmol-ictce.patch new file mode 100644 index 0000000000..78904b7b4c --- /dev/null +++ b/easybuild/easyconfigs/p/packmol/packmol-ictce.patch @@ -0,0 +1,51 @@ +--- Makefile 2011-08-02 20:21:59.000000000 +0200 ++++ ../Makefile 2013-12-05 12:23:41.941714435 +0100 +@@ -19,7 +19,7 @@ + # below to the path of your fortran compiler. The parallel version + # must be compiled with gfortran version 4.2 or greater. + # +-FORTRAN = /usr/bin/gfortran ++FORTRAN = /apps/gent/SL6/sandybridge/software/ifort/2011.13.367/bin/intel64/ifort + # + FORTRAN_PARALLEL = gfortran + # +@@ -35,6 +35,7 @@ + # + # Change the flags of the compilation if you want: + # ++ + SERIALFLAGS = -O3 -ffast-math + # + # Flags for the compilation of the parallel version +@@ -49,6 +50,7 @@ + # + # Get the default fortran compiler + # ++ + ifeq ($(FORTRAN),AUTO) + FORTRAN = $(FC) + endif +@@ -69,7 +71,6 @@ + @echo " Flags: $(SERIALFLAGS) " + @echo " ------------------------------------------------------ " + @$(FORTRAN) $(SERIALFLAGS) $(srcall) $(srcserial) -o packmol +- @chmod +x solvate.tcl + @echo " Packmol succesfully built." + @echo " ------------------------------------------------------ " + # +@@ -83,7 +84,6 @@ + @$(FORTRAN_PARALLEL) $(PARALLELFLAGS) $(srcall) $(srcparallel)\ + -o packmol + @chmod +x ppackmol +- @chmod +x solvate.tcl + @echo " ------------------------------------------------------ " + @echo " Packmol succesfully built. Paralell version available. " + @echo " ------------------------------------------------------ " +@@ -96,7 +96,6 @@ + @echo " Flags: -Wunused" + @echo " ------------------------------------------------------ " + @$(FORTRAN) -Wunused $(srcall) $(srcserial) -o packmol +- @chmod +x solvate.tcl + @echo " ------------------------------------------------------ " + @echo " Packmol succesfully built. " + @echo " ------------------------------------------------------ " diff --git a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb new file mode 100644 index 0000000000..4a6e691309 --- /dev/null +++ b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb @@ -0,0 +1,36 @@ +easyblock = "PythonPackage" + +name = 'TAMkin' +version = '1.0.0' + +homepage = 'http://molmod.github.io/tamkin/' +description = """TAMkin is a post-processing toolkit for normal mode analysis, + thermochemistry and reaction kinetics. It uses a Hessian computation from a + standard computational chemistry program as its input.""" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = ['https://github.com/molmod/tamkin/releases/download/v%s' % version] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.3' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('matplotlib', '1.2.1', versionsuffix), + ('molmod', '1.0', versionsuffix), +] + +# disable tests that require X11 by specifying "backend: agg" in matplotlibrc +runtest = 'export MATPLOTLIBRC=$PWD; export OMP_NUM_THREADS=1; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; nosetests -v test' + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pythonshortversion], +} + +moduleclass = 'chem' -- GitLab From d740a03c13e4f3eca8d41f550cb9de54473f9c62 Mon Sep 17 00:00:00 2001 From: Andreas Panteli Date: Fri, 6 Dec 2013 14:38:53 +0200 Subject: [PATCH 405/811] Contribute HPL compiled with iomkl toolchain --- .../easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb new file mode 100644 index 0000000000..bf12551602 --- /dev/null +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb @@ -0,0 +1,19 @@ +name = 'HPL' +version = '2.0' + +homepage = 'http://www.netlib.org/benchmark/hpl/' +description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic + on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the + High Performance Computing Linpack Benchmark.""" + + +toolchain = {'name': 'iomkl', 'version': '4.6.13'} +toolchainopts = {'optarch': True, 'usempi': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.netlib.org/benchmark/%(namelower)s'] + +# fix Make dependencies, so parallel build also works +patches = ['HPL_parallel-make.patch'] + +moduleclass = 'tools' -- GitLab From 07ae2978876ef405b527bf03e3668e51212637ff Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 6 Dec 2013 16:09:36 +0100 Subject: [PATCH 406/811] Bison: update to 2.7 with ictce-5.5.0 --- .../b/Bison/Bison-2.7-ictce-5.5.0.eb | 20 ++++++++++++++++ .../easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb | 23 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb new file mode 100644 index 0000000000..5224af1090 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.7' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar + into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] + +builddependencies = [('M4', '1.4.17')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb new file mode 100644 index 0000000000..a66d14fe08 --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb @@ -0,0 +1,23 @@ +name = 'M4' +version = '1.4.17' + +homepage = 'http://www.gnu.org/software/m4/m4.html' +description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible + although it has some extensions (for example, handling more than 9 positional parameters to macros). + GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/m4'] + +patches = ['M4-%(version)s-no-gets.patch'] + +configopts = "--enable-cxx" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From 0b194f9191ca461bdba8948eacb8cd4de90f8341 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 6 Dec 2013 16:10:01 +0100 Subject: [PATCH 407/811] Flex: updated to 2.5.37 with ictce-5.5.0 --- .../easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb b/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb new file mode 100644 index 0000000000..add73d9286 --- /dev/null +++ b/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb @@ -0,0 +1,14 @@ +name = 'flex' +version = '2.5.37' + +homepage = 'http://flex.sourceforge.net/' +description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, + sometimes called a tokenizer, is a program which recognizes lexical patterns in text.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s'] + +moduleclass = 'lang' -- GitLab From 2157087f4e8f7658b41ca664f4bbd881d2e69da5 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 6 Dec 2013 16:10:31 +0100 Subject: [PATCH 408/811] libxc: update to 2.0.1 with ictce-5.5.0 CP2K needs version 2.0.1 --- .../l/libxc/libxc-2.0.1-ictce-5.5.0.eb | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..53b0b9a430 --- /dev/null +++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb @@ -0,0 +1,31 @@ +name = 'libxc' +version = '2.0.1' + +homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc' +description = """Libxc is a library of exchange-correlation functionals for density-functional theory. + The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals.""" + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.tddft.org/programs/octopus/down.php?file=libxc/'] + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True} + +configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="$F77 -E" --enable-shared' + +# From the libxc mailing list +# To summarize: expect less tests to fail in libxc 2.0.2, but don't expect +# a fully working testsuite soon (unless someone wants to volunteer to do +# it, of course ) In the meantime, unless the majority of the tests +# fail, your build should be fine. +#runtest = 'check' + +sanity_check_paths = { + 'files': ['lib/libxc.a', 'lib/libxc.so'], + 'dirs': ['include'], +} + +parallel = 1 + +moduleclass = 'chem' + -- GitLab From 15ef08a0a811f36122ce695bd86e051efece9492 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 6 Dec 2013 16:10:59 +0100 Subject: [PATCH 409/811] FFTW: updated to 3.3.3 with ictce-5.5.0 --- .../f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..0ae947ce7f --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +# no quad precision, requires GCC v4.6 or higher +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' -- GitLab From 6213c487ee673ba31d56528911f2a7c24c452a95 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 7 Dec 2013 01:37:09 +0100 Subject: [PATCH 410/811] init PRACE Signed-off-by: Fotis Georgatos --- .../p/PRACE/PRACE-20130605-goolf-1.4.10.eb | 36 +++++++++++++++++++ .../p/PRACE/PRACE-20130605-ictce-5.3.0.eb | 36 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb new file mode 100644 index 0000000000..dedd3bb32d --- /dev/null +++ b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb @@ -0,0 +1,36 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of HPCBIOS project: +# http://hpcbios.readthedocs.org/en/latest/ +## + +easyblock = "Toolchain" + +name = 'PRACE' +version = '20130605' + +homepage = 'http://www.prace-ri.eu/PRACE-Common-Production' +description = """The PRACE Common Production Environment (PCPE) is a set of software tools and libraries + that are planned to be available on all PRACE execution sites. The PCPE also defines a set of environment + variables that try to make compilation on all sites as homogeneous and simple as possible.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +dependencies = [ + ('make', '3.82'), + ('Java', '1.7.0_10', '', True), + ('Bash', '4.2'), + ('tcsh', '6.18.01'), + ('Tcl', '8.5.12'), + ('Tk', '8.5.12'), + ('netCDF', '4.1.3'), # this one will also bring in HDF5 + ('Perl', '5.16.3'), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb new file mode 100644 index 0000000000..a795cc27ab --- /dev/null +++ b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb @@ -0,0 +1,36 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of HPCBIOS project: +# http://hpcbios.readthedocs.org/en/latest/ +## + +easyblock = "Toolchain" + +name = 'PRACE' +version = '20130605' + +homepage = 'http://www.prace-ri.eu/PRACE-Common-Production' +description = """The PRACE Common Production Environment (PCPE) is a set of software tools and libraries + that are planned to be available on all PRACE execution sites. The PCPE also defines a set of environment + variables that try to make compilation on all sites as homogeneous and simple as possible.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +dependencies = [ + ('make', '3.82'), + ('Java', '1.7.0_10', '', True), + ('Bash', '4.2'), + ('tcsh', '6.18.01'), + ('Tcl', '8.5.12'), + ('Tk', '8.5.12'), + ('netCDF', '4.1.3'), # this one will also bring in HDF5 + ('Perl', '5.16.3'), +] + +moduleclass = 'toolchain' -- GitLab From 815637d56fd231109d73e11170be7f1024c3dcb7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 7 Dec 2013 11:53:24 +0100 Subject: [PATCH 411/811] init Lua --- .../l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb | 24 +++++++++++++++++++ .../lua-5.1.4.5_Makefile-static-linking.patch | 12 ++++++++++ 2 files changed, 36 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb new file mode 100644 index 0000000000..b5e1297c18 --- /dev/null +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb @@ -0,0 +1,24 @@ +name = "Lua" +version = "5.1.4-5" + +homepage = "http://www.lua.org/" +description = """Lua is a powerful, fast, lightweight, embeddable scripting language. + Lua combines simple procedural syntax with powerful data description constructs based + on associative arrays and extensible semantics. Lua is dynamically typed, + runs by interpreting bytecode for a register-based virtual machine, + and has automatic memory management with incremental garbage collection, + making it ideal for configuration, scripting, and rapid prototyping.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = ['lua-%s.tar.gz' % version.replace('-', '.')] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +# patches = ['lua-5.1.4.5_Makefile-static-linking.patch'] # buggy on Debian? + +sanity_check_paths = { + 'files': ["bin/lua"], + 'dirs': [] +} + +moduleclass = "lang" diff --git a/easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch b/easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch new file mode 100644 index 0000000000..761bb38436 --- /dev/null +++ b/easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch @@ -0,0 +1,12 @@ +diff -ru lua-5.1.4.5.orig/lua/src/Makefile.in lua-5.1.4.5/lua/src/Makefile.in +--- lua-5.1.4.5.orig/lua/src/Makefile.in 2011-02-18 19:49:01.000000000 +0100 ++++ lua-5.1.4.5/lua/src/Makefile.in 2013-06-02 13:22:28.601496000 +0200 +@@ -98,7 +98,7 @@ + $(MAKE) all MYCFLAGS= + + linux: +- $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl @LIBS@ -lncurses" ++ $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -Wl,-Bstatic @LIBS@ -lncurses -Wl,-Bdynamic" + + macosx: + # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX -- GitLab From a2c54f59e9897c874e29ae533ae61b198cac01e1 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 7 Dec 2013 11:53:35 +0100 Subject: [PATCH 412/811] init Lmod --- .../l/Lmod/Lmod-5.2-goolf-1.4.10.eb | 22 +++++++++++++++++++ easybuild/easyconfigs/l/Lmod/sourceme | 18 +++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/l/Lmod/sourceme diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..113bfdc903 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb @@ -0,0 +1,22 @@ +name = "Lmod" +version = "5.2" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +dependencies = [("Lua", "5.1.4-5")] + +sanity_check_paths = { + 'files': ["lmod/%s/init/profile" % version], + 'dirs': [] +} + +moduleclass = "tools" diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme new file mode 100644 index 0000000000..4d8c0c4fe7 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -0,0 +1,18 @@ +## Contributed by Fotis Georgatos, as means to help others wishing to ride on Lmod + +PREFIX=/home/users/fgeorgatos/.local/easybuild +PREFIXLUA=$PREFIX/software/lua/5.1.4-5-goolf-1.4.10 +PREFIXLMOD=$PREFIX/software/Lmod/5.2-goolf-1.4.10/lmod/5.2 + +export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH + +## Uncommend this if things don't work as expected +# lua -v +# ls -las `which lua` +# ls -las $PREFIXLMOD/init/profile + +source $PREFIXLMOD/init/profile + +export PAGER=cat # Keep it simple, for a start +export LMOD_IGNORE_CACHE=OHYES # Keep it simple, for a start +export LMOD_COLORIZE=YES # YMMV -- GitLab From 6f4374a17788cb5df8e12d41ae7e12ffbfb247c4 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 7 Dec 2013 12:00:37 +0100 Subject: [PATCH 413/811] finalize script to help transition to Lmod --- easybuild/easyconfigs/l/Lmod/sourceme | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 4d8c0c4fe7..9f5c723975 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -1,6 +1,7 @@ -## Contributed by Fotis Georgatos, as means to help others wishing to ride on Lmod +## Contributed by Fotis Georgatos , as means to help others wishing to ride on Lmod -PREFIX=/home/users/fgeorgatos/.local/easybuild +## Remember to change the following, as per individual case +PREFIX=${PREFIX:-"/home/users/fgeorgatos/.local/easybuild"} PREFIXLUA=$PREFIX/software/lua/5.1.4-5-goolf-1.4.10 PREFIXLMOD=$PREFIX/software/Lmod/5.2-goolf-1.4.10/lmod/5.2 @@ -16,3 +17,5 @@ source $PREFIXLMOD/init/profile export PAGER=cat # Keep it simple, for a start export LMOD_IGNORE_CACHE=OHYES # Keep it simple, for a start export LMOD_COLORIZE=YES # YMMV + +echo "Now, try fi. `module avail -d compiler` and observe output`" -- GitLab From 85ca49764c8907f002f4fab46a521211e2733f29 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sat, 7 Dec 2013 18:41:06 +0100 Subject: [PATCH 414/811] CP2K: updated to version 20131205 --- ...2K-20131205-fix_compile_date_lastcvs.patch | 11 ++++++ .../c/CP2K/CP2K-20131205-ictce-5.5.0.eb | 38 +++++++++++++++++++ .../c/CP2K/ifort-compiler-bug-fix.patch | 12 ++++++ 3 files changed, 61 insertions(+) create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20131205-fix_compile_date_lastcvs.patch create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/c/CP2K/ifort-compiler-bug-fix.patch diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-fix_compile_date_lastcvs.patch b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-fix_compile_date_lastcvs.patch new file mode 100644 index 0000000000..05fe24dd1d --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-fix_compile_date_lastcvs.patch @@ -0,0 +1,11 @@ +--- cp2k.orig/cp2k/makefiles/Makefile 2012-08-21 14:35:17.000000000 +0300 ++++ cp2k/cp2k/makefiles/Makefile 2013-11-12 12:41:29.361582641 +0200 +@@ -194,7 +194,7 @@ + # + ifeq ($(CPPSHELL),) + CPPSHELL := -D__COMPILE_ARCH="\"$(ARCH)\""\ +- -D__COMPILE_DATE="\"$(shell date)\""\ ++ -D__COMPILE_DATE="\"$(shell date | sed 's/ /_/g')\""\ + -D__COMPILE_HOST="\"$(shell hostname)\""\ + -D__COMPILE_REVISION="\"$(strip $(REVISION))\"" + endif diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb new file mode 100644 index 0000000000..a4d400d6d0 --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb @@ -0,0 +1,38 @@ +name = 'CP2K' +version = '20131205' + +homepage = 'http://cp2k.berlios.de/index.html' +description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular +simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different +methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and +classical pair and many-body potentials. """ + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +sources = ['CP2K-%(version)s.tar.gz'] + +patches = [ + 'ifort-compiler-bug-fix.patch', + 'CP2K-%(version)s-fix_compile_date_lastcvs.patch', +] + +## use FFTW, with FFTACML there are extra failures in regtests +dependencies = [ + ('Libint', '1.1.4'), + ('libxc', '2.0.1'), +] + +builddependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +# don't use parallel make, results in compilation failure +# because Fortran module files aren't created before they are needed +parallel = 1 + +# regression test reports failures: 13/2450 segfault +ignore_regtest_fails = True + +moduleclass = 'chem' diff --git a/easybuild/easyconfigs/c/CP2K/ifort-compiler-bug-fix.patch b/easybuild/easyconfigs/c/CP2K/ifort-compiler-bug-fix.patch new file mode 100644 index 0000000000..20b595d455 --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/ifort-compiler-bug-fix.patch @@ -0,0 +1,12 @@ +# workaround for ifort bug +# https://groups.google.com/forum/#!topic/cp2k/LorI2Z4pQgc +--- cp2k.orig/cp2k/src/dbcsr_lib/dbcsr_error_handling.F 2013-12-05 11:46:53.201980584 +0100 ++++ cp2k/cp2k/src/dbcsr_lib/dbcsr_error_handling.F 2013-12-05 16:28:45.572524631 +0100 +@@ -20,7 +20,6 @@ + !$ USE OMP_LIB + + IMPLICIT NONE +- PRIVATE + + ! procedures + PUBLIC :: dbcsr_error_set, dbcsr_error_stop, dbcsr_error_print_stack -- GitLab From 33219003c04a1300cf40e869632b2bbe5e19b13b Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sat, 7 Dec 2013 18:41:32 +0100 Subject: [PATCH 415/811] CP2K: added version 2.4.0 with ictce-5.5.0 --- .../c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb new file mode 100644 index 0000000000..037d12025a --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb @@ -0,0 +1,40 @@ +name = 'CP2K' +version = '2.4.0' + +homepage = 'http://cp2k.berlios.de/index.html' +description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular +simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different +methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and +classical pair and many-body potentials. """ + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [SOURCEFORGE_SOURCE] + +patches = [ + 'do_regtest_nocompile.patch', + 'ifort-compiler-bug-fix.patch', + 'CP2K-20131205-fix_compile_date_lastcvs.patch', +] + +## use FFTW, with FFTACML there are extra failures in regtests +dependencies = [ + ('Libint', '1.1.4'), + ('libxc', '2.0.1'), +] + +builddependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +# don't use parallel make, results in compilation failure +# because Fortran module files aren't created before they are needed +parallel = 1 + +# regression test reports failures +ignore_regtest_fails = True + +moduleclass = 'chem' -- GitLab From 24dc3f1aa69e531db601e8a2c7a25a2260eb1689 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sat, 7 Dec 2013 22:04:02 +0100 Subject: [PATCH 416/811] M4: remove old patch from 1.4.17 --- easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb index a66d14fe08..bd161358d2 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb @@ -11,8 +11,6 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftpmirror.gnu.org/m4'] -patches = ['M4-%(version)s-no-gets.patch'] - configopts = "--enable-cxx" sanity_check_paths = { -- GitLab From 9d40ffed5bebce469b47a83db4676b9084660e70 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 7 Dec 2013 23:02:08 +0100 Subject: [PATCH 417/811] rewire defaults for Lmod towards GCC-4.8.2 --- .../easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb | 22 +++++++++++++++++ easybuild/easyconfigs/l/Lmod/sourceme | 10 ++++---- .../l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb | 24 +++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb new file mode 100644 index 0000000000..37839b6a29 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb @@ -0,0 +1,22 @@ +name = "Lmod" +version = "5.2" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +dependencies = [("Lua", "5.1.4-5")] + +sanity_check_paths = { + 'files': ["lmod/%s/init/profile" % version], + 'dirs': [] +} + +moduleclass = "tools" diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 9f5c723975..c0d80e79d7 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -1,9 +1,11 @@ ## Contributed by Fotis Georgatos , as means to help others wishing to ride on Lmod +# +# prereq: Lmod/5.2-GCC-4.8.2 ## Remember to change the following, as per individual case -PREFIX=${PREFIX:-"/home/users/fgeorgatos/.local/easybuild"} -PREFIXLUA=$PREFIX/software/lua/5.1.4-5-goolf-1.4.10 -PREFIXLMOD=$PREFIX/software/Lmod/5.2-goolf-1.4.10/lmod/5.2 +PREFIX=${PREFIX:-"$HOME/.local/easybuild"} +PREFIXLUA=$PREFIX/software/lua/5.1.4-5-GCC-4.8.2 +PREFIXLMOD=$PREFIX/software/Lmod/5.2-GCC-4.8.2/lmod/5.2 export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH @@ -18,4 +20,4 @@ export PAGER=cat # Keep it simple, for a start export LMOD_IGNORE_CACHE=OHYES # Keep it simple, for a start export LMOD_COLORIZE=YES # YMMV -echo "Now, try fi. `module avail -d compiler` and observe output`" +echo 'Now, try fi. `module avail -d compiler` and observe output`' diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb new file mode 100644 index 0000000000..536d1c4346 --- /dev/null +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb @@ -0,0 +1,24 @@ +name = "Lua" +version = "5.1.4-5" + +homepage = "http://www.lua.org/" +description = """Lua is a powerful, fast, lightweight, embeddable scripting language. + Lua combines simple procedural syntax with powerful data description constructs based + on associative arrays and extensible semantics. Lua is dynamically typed, + runs by interpreting bytecode for a register-based virtual machine, + and has automatic memory management with incremental garbage collection, + making it ideal for configuration, scripting, and rapid prototyping.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = ['lua-%s.tar.gz' % version.replace('-', '.')] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +# patches = ['lua-5.1.4.5_Makefile-static-linking.patch'] # buggy on Debian? + +sanity_check_paths = { + 'files': ["bin/lua"], + 'dirs': [] +} + +moduleclass = "lang" -- GitLab From 8a95ad43ec51dd182e6c21cfaa39e7f3b08b5916 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Mon, 9 Dec 2013 11:26:41 +0100 Subject: [PATCH 418/811] libffi patch is needed after all --- .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 ++ .../python-2.7.6_libffi_int128_icc.patch | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index adc6635723..b27de9a63f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -13,6 +13,8 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] +patches = ['python-%(version)s_libffi_int128_icc.patch'] + # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), diff --git a/easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch b/easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch new file mode 100644 index 0000000000..c639c75c09 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch @@ -0,0 +1,27 @@ +diff -ur Python-2.7.4.orig/Modules/_ctypes/libffi/src/x86/ffi64.c Python-2.7.4/Modules/_ctypes/libffi/src/x86/ffi64.c +--- Python-2.7.4.orig/Modules/_ctypes/libffi/src/x86/ffi64.c 2013-04-06 16:02:35.000000000 +0200 ++++ Python-2.7.4/Modules/_ctypes/libffi/src/x86/ffi64.c 2013-05-13 10:28:22.935090082 +0200 +@@ -56,6 +56,8 @@ + UINT128 i128; + }; + ++typedef struct { int64_t m[2]; } __int128_t; ++ + struct register_args + { + /* Registers for argument passing. */ +@@ -507,10 +509,12 @@ + break; + case X86_64_SSE_CLASS: + case X86_64_SSEDF_CLASS: +- reg_args->sse[ssecount++].i64 = *(UINT64 *) a; ++ reg_args->sse[ssecount++].m[0] = *(UINT64 *) a; ++ reg_args->sse[ssecount++].m[1] = 0; + break; + case X86_64_SSESF_CLASS: +- reg_args->sse[ssecount++].i32 = *(UINT32 *) a; ++ reg_args->sse[ssecount++].m[0] = *(UINT32 *) a; ++ reg_args->sse[ssecount++].m[1] = 0; + break; + default: + abort(); -- GitLab From 35c504622aa5e0a784bcdcd93eb5497ab14ef625 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 9 Dec 2013 15:03:40 +0100 Subject: [PATCH 419/811] init ispc & mcpp Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb | 29 ++++++++++++++++++++++ easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb | 29 ++++++++++++++++++++++ easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb | 20 +++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb create mode 100644 easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb create mode 100644 easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb new file mode 100644 index 0000000000..eed358ec55 --- /dev/null +++ b/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb @@ -0,0 +1,29 @@ + +easyblock = 'Tarball' + +name = 'ispc' +version = '1.3.0' + +homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/' +description = """Intel SPMD Program Compilers; An open-source compiler for high-performance + SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language, + with extensions for "single program, multiple data" (SPMD) programming. + Under the SPMD model, the programmer writes a program that generally appears + to be a regular serial program, though the execution model is actually that + a number of program instances execute in parallel on the hardware.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# eg. https://github.com/downloads/ispc/ispc/ispc-v1.3.0-linux.tar.gz +# or better for later: https://github.com/ispc/ispc/tarball/v1.3.0 +sources = ['ispc-v%(version)s-linux.tar.gz'] +source_urls = ['https://github.com/downloads/ispc/ispc/'] + +sanity_check_paths = { + 'files': ["ispc"], + 'dirs': [] +} + +modextrapaths = {'PATH': ''} + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb new file mode 100644 index 0000000000..1cb61c35ec --- /dev/null +++ b/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb @@ -0,0 +1,29 @@ + +easyblock = 'Tarball' + +name = 'ispc' +version = '1.5.0' + +homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/' +description = """Intel SPMD Program Compilers; An open-source compiler for high-performance + SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language, + with extensions for "single program, multiple data" (SPMD) programming. + Under the SPMD model, the programmer writes a program that generally appears + to be a regular serial program, though the execution model is actually that + a number of program instances execute in parallel on the hardware.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# eg. https://github.com/downloads/ispc/ispc/ispc-v1.5.0-linux.tar.gz +# or better for later: https://github.com/ispc/ispc/tarball/v1.5.0 +sources = ['ispc-v%(version)s-linux.tar.gz'] +source_urls = [('http://sourceforge.net/projects/ispcmirror/files/v%(version)s', 'download')] + +sanity_check_paths = { + 'files': ["ispc"], + 'dirs': [] +} + +modextrapaths = {'PATH': ''} + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb b/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb new file mode 100644 index 0000000000..60b167dc2a --- /dev/null +++ b/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb @@ -0,0 +1,20 @@ + +name = 'mcpp' +version = '2.7.2' + +homepage = 'http://mcpp.sourceforge.net/' +description = """MCPP is a portable C/C++ preprocessor, supporting GCC, Visual C++, etc. + Its source is highly configurable and can generate executables of various specs. + It accompanies a validation suite to check preprocessor's conformance and quality exhaustively.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} # rewire towards your favourite compiler + +sources = [SOURCE_TAR_GZ] +source_urls = [SOURCEFORGE_SOURCE] + +sanity_check_paths = { + 'files': ["bin/mcpp"], + 'dirs': [] +} + +moduleclass = 'tools' -- GitLab From 8bcb6cf5d05a27a02f46f9a41dca8ec3070f6e06 Mon Sep 17 00:00:00 2001 From: admin6 Date: Mon, 9 Dec 2013 15:14:11 +0100 Subject: [PATCH 420/811] libffi was fixed but has a different problem, so switched the patch --- .../easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb | 2 +- .../easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 5 ++++- .../p/Python/libffi-3.0.13_include-xmmintrin.patch | 11 +++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/p/Python/libffi-3.0.13_include-xmmintrin.patch diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index 7031a25f57..214f9caf18 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -13,7 +13,7 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] +patches = ['libffi-3.0.13_include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index 3f66b26c69..43582a47e8 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -13,7 +13,7 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] +patches = ['libffi-3.0.13_include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index a7284262e3..9a2a8fbdbb 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -13,7 +13,7 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] +patches = ['libffi-3.0.13_include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 671d704218..a621200714 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -13,7 +13,10 @@ scipyversion = '0.13.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] +# libffi build in python is still broken, see http://bugs.python.org/issue4130 +patches = [ + 'libffi-3.0.13_include-xmmintrin.patch', +] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/libffi-3.0.13_include-xmmintrin.patch b/easybuild/easyconfigs/p/Python/libffi-3.0.13_include-xmmintrin.patch new file mode 100644 index 0000000000..6b03e80c46 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/libffi-3.0.13_include-xmmintrin.patch @@ -0,0 +1,11 @@ +diff -ru Modules/_ctypes/libffi/src/x86/ffi64.c libffi-3.0.13/src/x86/ffi64.c +--- Modules.orig/_ctypes/libffi/src/x86/ffi64.c 2013-03-16 12:19:39.000000000 +0100 ++++ Modules/_ctypes/libffi/src/x86/ffi64.c 2013-08-14 14:42:38.000000000 +0200 +@@ -39,6 +39,7 @@ + #define MAX_SSE_REGS 8 + + #if defined(__INTEL_COMPILER) ++#include "xmmintrin.h" + #define UINT128 __m128 + #else + #if defined(__SUNPRO_C) -- GitLab From 4294153a5db6943ea1d5c528c9a3d4c671e24241 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 9 Dec 2013 22:35:22 +0100 Subject: [PATCH 421/811] add Lua & Lmod for GCC/4.7.2 Signed-off-by: Fotis Georgatos --- .../easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb | 22 +++++++++++++++++++ .../l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb create mode 100644 easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb new file mode 100644 index 0000000000..5567974299 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb @@ -0,0 +1,22 @@ +name = "Lmod" +version = "5.2" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +dependencies = [("Lua", "5.1.4-5")] + +sanity_check_paths = { + 'files': ["lmod/%s/init/profile" % version], + 'dirs': [] +} + +moduleclass = "tools" diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb new file mode 100644 index 0000000000..a877d56895 --- /dev/null +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb @@ -0,0 +1,22 @@ +name = "Lua" +version = "5.1.4-5" + +homepage = "http://www.lua.org/" +description = """Lua is a powerful, fast, lightweight, embeddable scripting language. + Lua combines simple procedural syntax with powerful data description constructs based + on associative arrays and extensible semantics. Lua is dynamically typed, + runs by interpreting bytecode for a register-based virtual machine, + and has automatic memory management with incremental garbage collection, + making it ideal for configuration, scripting, and rapid prototyping.""" + +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +sources = ['lua-%s.tar.gz' % version.replace('-', '.')] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +sanity_check_paths = { + 'files': ["bin/lua"], + 'dirs': [] +} + +moduleclass = "lang" -- GitLab From e28f79c5eedae6c6575e97cff9e40ccf81ba75ca Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 9 Dec 2013 23:05:57 +0100 Subject: [PATCH 422/811] add ncurses as Lua dep Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb index a877d56895..6089259852 100644 --- a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb @@ -14,6 +14,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = ['lua-%s.tar.gz' % version.replace('-', '.')] source_urls = ['http://sourceforge.net/projects/lmod/files/'] +dependencies = [('ncurses', '5.9')] + sanity_check_paths = { 'files': ["bin/lua"], 'dirs': [] -- GitLab From e7ac98ba8e16a3b58c18b2b9b5873ec45b50ecb5 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 10 Dec 2013 06:15:54 +0100 Subject: [PATCH 423/811] Revert "add ncurses as Lua dep" This reverts commit e28f79c5eedae6c6575e97cff9e40ccf81ba75ca. --- easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb index 6089259852..a877d56895 100644 --- a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb @@ -14,8 +14,6 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = ['lua-%s.tar.gz' % version.replace('-', '.')] source_urls = ['http://sourceforge.net/projects/lmod/files/'] -dependencies = [('ncurses', '5.9')] - sanity_check_paths = { 'files': ["bin/lua"], 'dirs': [] -- GitLab From 413dc7f439069e691eac60b5640c3851f29e1bc0 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 10 Dec 2013 14:24:52 +0100 Subject: [PATCH 424/811] CP2K: small change to be compatible with bash 3.x --- .../CP2K/CP2K-20131205-bash-3-comp-fix.patch | 39 +++++++++++++++++++ .../c/CP2K/CP2K-20131205-ictce-5.5.0.eb | 1 + 2 files changed, 40 insertions(+) create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch new file mode 100644 index 0000000000..68932901df --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch @@ -0,0 +1,39 @@ +diff -urN cp2k.orig/cp2k/tools/regtesting/do_regtest cp2k/cp2k/tools/regtesting/do_regtest +--- cp2k.orig/cp2k/tools/regtesting/do_regtest 2013-12-05 11:45:55.804241967 +0100 ++++ cp2k/cp2k/tools/regtesting/do_regtest 2013-12-10 14:19:56.913623248 +0100 +@@ -381,7 +381,7 @@ + # echo "cp2k is now ${cp2k_lines} lines .F" + + # Using svn2cl.pl to generate GNU like ChangeLog +- ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_new} &>>${error_description_file} ++ ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_new} 2>&1 >>${error_description_file} + + line1="$(head -n 1 ${changelog})" + nline=$(grep -n "${line1}" ${changelog_new} | head -n 1 | cut -f 1 -d:) +@@ -421,7 +421,7 @@ + echo "svn update tests went fine" + + # Using svn2cl.pl to generate GNU like ChangeLog +- ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_tests_new} &>>${error_description_file} ++ ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_tests_new} 2>&1 >>${error_description_file} + + line1="$(head -n 1 ${changelog_tests})" + nline=$(grep -n "${line1}" ${changelog_tests_new} | head -n 1 | cut -f 1 -d:) +@@ -464,7 +464,7 @@ + # make realclean + if [[ ${quick} != "quick" ]]; then + cd ${dir_base}/${cp2k_dir}/makefiles +- ${make} realclean ${ARCH_SPEC} VERSION=${cp2k_version} &>>${make_out} ++ ${make} realclean ${ARCH_SPEC} VERSION=${cp2k_version} 2>&1 >>${make_out} + if (( $? )); then + echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >>${error_description_file} + cat ${make_out} >>${error_description_file} +@@ -485,7 +485,7 @@ + echo "${make} -j $((maxtasks)) ${ARCH_SPEC} VERSION=${cp2k_version}" + echo "(make output is written to ${make_out})" + cd ${dir_base}/${cp2k_dir}/makefiles +- ${make} -j $((maxtasks)) ${ARCH_SPEC} VERSION=${cp2k_version} &>>${make_out} ++ ${make} -j $((maxtasks)) ${ARCH_SPEC} VERSION=${cp2k_version} 2>&1 >>${make_out} + if (( $? )); then + echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >>${error_description_file} + cat ${make_out} >>${error_description_file} diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb index a4d400d6d0..c42685d01d 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb @@ -15,6 +15,7 @@ sources = ['CP2K-%(version)s.tar.gz'] patches = [ 'ifort-compiler-bug-fix.patch', 'CP2K-%(version)s-fix_compile_date_lastcvs.patch', + 'CP2K-%(version)s-bash-3-comp-fix.patch', ] ## use FFTW, with FFTACML there are extra failures in regtests -- GitLab From 634f9f1daac41b2d1622f281e4e842ddcf885efb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Dec 2013 18:20:54 +0100 Subject: [PATCH 425/811] explicitly enable MPI in GROMACS goolf(c) easyconfigs, indicate to use external BLAS/LAPACK (?) --- .../easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb | 7 +++++-- .../easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb index 86275344ab..02fb60a067 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb @@ -21,6 +21,7 @@ description = """GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'usempi': True} # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz sources = [ @@ -34,11 +35,13 @@ source_urls = [ builddependencies = [('CMake', '2.8.4')] -configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" -runtest = 'check' +configopts = '-DGMX_EXTERNAL_BLAS=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_MPI=ON -DGMX_X11=OFF ' # explicitely disable CUDA support, i.e. avoid that GROMACS find and uses a system-wide CUDA compiler # CUDA and GCC v4.7 don't play well together configopts += ' -DGMX_GPU=OFF' +configopts += "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" +runtest = 'check' + moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb index 07428ab1c0..256c0d975a 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb @@ -21,6 +21,7 @@ description = """GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" toolchain = {'name': 'goolfc', 'version': '1.3.12'} +toolchainopts = {'usempi': True} # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz sources = [ @@ -34,7 +35,9 @@ source_urls = [ builddependencies = [('CMake', '2.8.4')] -configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" +configopts = '-DGMX_EXTERNAL_BLAS=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_MPI=ON -DGMX_X11=OFF ' + +configopts += "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" runtest = 'check' moduleclass = 'bio' -- GitLab From 161c74eefb69948788b3424b1d378d525973cfff Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Dec 2013 18:21:13 +0100 Subject: [PATCH 426/811] add ictce-5.5.0 easyconfig for GROMACS v4.6.5 --- .../g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb new file mode 100644 index 0000000000..3e5a3d3c07 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb @@ -0,0 +1,50 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## + +easyblock = 'CMakeMake' + +name = 'GROMACS' +version = '4.6.5' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +configopts = '-DGMX_FFT_LIBRARY=mkl -DMKL_INCLUDE_DIR="$EBROOTMKL/mkl/include" ' +configopts += '-DMKL_LIBRARIES="$EBROOTMKL/mkl/lib/intel64/libmkl.a;$EBROOTMKL/mkl/lib/intel64/libmkl_lapack.a" ' +configopts += '-DGMX_EXTERNAL_BLAS=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_MPI=ON -DGMX_X11=OFF ' + +# explicitely disable CUDA support, i.e. avoid that GROMACS find and uses a system-wide CUDA compiler +configopts += '-DGMX_GPU=OFF ' + +configopts += '-DREGRESSIONTEST_PATH="%(builddir)s/regressiontests-%(version)s" ' +runtest = 'check' + +moduleclass = 'bio' -- GitLab From 363a30273d1521bb31e1192f86cc4b7418718c54 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Dec 2013 18:58:24 +0100 Subject: [PATCH 427/811] add easyconfig file for EB v1.9.0 --- .../e/EasyBuild/EasyBuild-1.9.0.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb new file mode 100644 index 0000000000..30a0e1cfd6 --- /dev/null +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb @@ -0,0 +1,29 @@ +easyblock = 'EB_EasyBuildMeta' + +name = 'EasyBuild' +version = '1.9.0' + +homepage = 'http://hpcugent.github.com/easybuild/' +description = """EasyBuild is a software build and installation framework + written in Python that allows you to install software in a structured, +repeatable and robust way.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://pypi.python.org/packages/source/e/easybuild-framework/', + 'http://pypi.python.org/packages/source/e/easybuild-easyblocks/', + 'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/', +] +# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?) +sources = [ + 'easybuild-framework-%(version)s.tar.gz', + 'easybuild-easyblocks-%(version)s.tar.gz', + 'easybuild-easyconfigs-%(version)s.0.tar.gz', +] + +# EasyBuild is a (set of) Python packages, so it depends on Python +# usually, we want to use the system Python, so no actual Python dependency is listed +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] + +moduleclass = 'tools' -- GitLab From b5377b769e14a97069891281a1e7387c5c5a40b3 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 11 Dec 2013 16:06:08 +0100 Subject: [PATCH 428/811] Update CP2K to 20131205 and delete 20131205 The bash fix has already been accepted upstream, so upgrade version to that svn. --- .../CP2K/CP2K-20131205-bash-3-comp-fix.patch | 39 ------------------- ...K-20131211-fix_compile_date_lastcvs.patch} | 0 ...-5.5.0.eb => CP2K-20131211-ictce-5.5.0.eb} | 5 +-- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch rename easybuild/easyconfigs/c/CP2K/{CP2K-20131205-fix_compile_date_lastcvs.patch => CP2K-20131211-fix_compile_date_lastcvs.patch} (100%) rename easybuild/easyconfigs/c/CP2K/{CP2K-20131205-ictce-5.5.0.eb => CP2K-20131211-ictce-5.5.0.eb} (91%) diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch b/easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch deleted file mode 100644 index 68932901df..0000000000 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-bash-3-comp-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN cp2k.orig/cp2k/tools/regtesting/do_regtest cp2k/cp2k/tools/regtesting/do_regtest ---- cp2k.orig/cp2k/tools/regtesting/do_regtest 2013-12-05 11:45:55.804241967 +0100 -+++ cp2k/cp2k/tools/regtesting/do_regtest 2013-12-10 14:19:56.913623248 +0100 -@@ -381,7 +381,7 @@ - # echo "cp2k is now ${cp2k_lines} lines .F" - - # Using svn2cl.pl to generate GNU like ChangeLog -- ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_new} &>>${error_description_file} -+ ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_new} 2>&1 >>${error_description_file} - - line1="$(head -n 1 ${changelog})" - nline=$(grep -n "${line1}" ${changelog_new} | head -n 1 | cut -f 1 -d:) -@@ -421,7 +421,7 @@ - echo "svn update tests went fine" - - # Using svn2cl.pl to generate GNU like ChangeLog -- ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_tests_new} &>>${error_description_file} -+ ${dir_base}/${cp2k_dir}/tools/svn2cl/svn2cl.sh --limit 100 -i -o ${changelog_tests_new} 2>&1 >>${error_description_file} - - line1="$(head -n 1 ${changelog_tests})" - nline=$(grep -n "${line1}" ${changelog_tests_new} | head -n 1 | cut -f 1 -d:) -@@ -464,7 +464,7 @@ - # make realclean - if [[ ${quick} != "quick" ]]; then - cd ${dir_base}/${cp2k_dir}/makefiles -- ${make} realclean ${ARCH_SPEC} VERSION=${cp2k_version} &>>${make_out} -+ ${make} realclean ${ARCH_SPEC} VERSION=${cp2k_version} 2>&1 >>${make_out} - if (( $? )); then - echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >>${error_description_file} - cat ${make_out} >>${error_description_file} -@@ -485,7 +485,7 @@ - echo "${make} -j $((maxtasks)) ${ARCH_SPEC} VERSION=${cp2k_version}" - echo "(make output is written to ${make_out})" - cd ${dir_base}/${cp2k_dir}/makefiles -- ${make} -j $((maxtasks)) ${ARCH_SPEC} VERSION=${cp2k_version} &>>${make_out} -+ ${make} -j $((maxtasks)) ${ARCH_SPEC} VERSION=${cp2k_version} 2>&1 >>${make_out} - if (( $? )); then - echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >>${error_description_file} - cat ${make_out} >>${error_description_file} diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-fix_compile_date_lastcvs.patch b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-fix_compile_date_lastcvs.patch similarity index 100% rename from easybuild/easyconfigs/c/CP2K/CP2K-20131205-fix_compile_date_lastcvs.patch rename to easybuild/easyconfigs/c/CP2K/CP2K-20131211-fix_compile_date_lastcvs.patch diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb similarity index 91% rename from easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb rename to easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb index c42685d01d..b04e8859be 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131205-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb @@ -1,5 +1,5 @@ name = 'CP2K' -version = '20131205' +version = '20131211' homepage = 'http://cp2k.berlios.de/index.html' description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular @@ -10,12 +10,11 @@ classical pair and many-body potentials. """ toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'pic': True} -sources = ['CP2K-%(version)s.tar.gz'] +sources = [SOURCE_TAR_BZ2] patches = [ 'ifort-compiler-bug-fix.patch', 'CP2K-%(version)s-fix_compile_date_lastcvs.patch', - 'CP2K-%(version)s-bash-3-comp-fix.patch', ] ## use FFTW, with FFTACML there are extra failures in regtests -- GitLab From 7f8834f06e3a46a0dfc3d367c4d0db561aab15fd Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 16:28:04 +0100 Subject: [PATCH 429/811] get rid of patch files for Molden, just use makeopts --- .../m/Molden/Molden-5.0-ictce-4.1.13.eb | 5 +---- .../easyconfigs/m/Molden/Molden-5.0-ictce.patch | 15 --------------- .../m/Molden/Molden-5.0-molden-only.patch | 13 ------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 easybuild/easyconfigs/m/Molden/Molden-5.0-ictce.patch delete mode 100644 easybuild/easyconfigs/m/Molden/Molden-5.0-molden-only.patch diff --git a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb index 76a1b7f50f..ea8f241450 100644 --- a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb @@ -13,10 +13,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['%(namelower)s%(version)s.tar.gz'] source_urls = ['ftp://ftp.cmbi.ru.nl/pub/molgraph/molden'] -patches = [ - 'Molden-%(version)s-ictce.patch', - 'Molden-%(version)s-molden-only.patch', -] +makeopts = 'CC="$CC" FC="$F90" molden' files_to_copy = [(['molden'],'bin'), 'CopyRight', 'README', 'REGISTER'] diff --git a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce.patch b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce.patch deleted file mode 100644 index 2897b802f0..0000000000 --- a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Because there is no configure script, one has to specify the compiler manually. -# By Toon Verstraelen ---- molden5.0-orig/makefile 2013-11-28 16:02:04.563545000 +0100 -+++ molden5.0/makefile 2013-11-28 16:08:13.606238000 +0100 -@@ -13,8 +13,8 @@ - # Disregard compiler warnings on rdmolf.f - # - # --CC = cc --FC = gfortran -+CC = icc -+FC = ifort - LIBS = -lX11 -lm - LDR = ${FC} - LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm diff --git a/easybuild/easyconfigs/m/Molden/Molden-5.0-molden-only.patch b/easybuild/easyconfigs/m/Molden/Molden-5.0-molden-only.patch deleted file mode 100644 index feffc8a8e0..0000000000 --- a/easybuild/easyconfigs/m/Molden/Molden-5.0-molden-only.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Only compile the molden binary to keep things simple -# By Toon Verstraelen (toon.verstraelen@ugent.be) ---- molden5.0-orig/makefile 2013-11-28 16:02:04.563545000 +0100 -+++ molden5.0/makefile 2013-11-28 16:08:13.606238000 +0100 -@@ -252,7 +252,7 @@ - # - #LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm - --all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf -+all: molden - - - molden: $(OBJS) mpdum.o xwin.o -- GitLab From d632babf1656576780732d9df4907a9aa00817e1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 16:28:21 +0100 Subject: [PATCH 430/811] fix typo/style --- .../n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb index 6bd0ab86b5..6f22931653 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb @@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] -patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] +patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch'] python = 'Python' pyver = '2.7.3' diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb index b50e725a50..94e60465eb 100644 --- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb @@ -22,7 +22,7 @@ patches = [ builddependencies = [('CMake', '2.8.12')] python = "Python" -pythonversion = '2.7.7' +pythonversion = '2.7.5' pythonshortversion = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -- GitLab From f2304be427ea5d223449077317dfb02f42433329 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 16:29:23 +0100 Subject: [PATCH 431/811] get rid of patch file for packmol, use makeopts instead --- .../p/packmol/packmol-13.234-ictce-4.1.13.eb | 4 +- .../easyconfigs/p/packmol/packmol-ictce.patch | 51 ------------------- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 easybuild/easyconfigs/p/packmol/packmol-ictce.patch diff --git a/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb b/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb index edf4eb9e27..839e36a38e 100644 --- a/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb @@ -11,9 +11,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] source_urls = ['https://packmol.googlecode.com/files'] -patches = [ - 'packmol-ictce.patch' -] +makeopts = 'FORTRAN="$F90"' files_to_copy = [(['packmol'],'bin'), 'COPYING', 'AUTHORS', 'LICENSE'] diff --git a/easybuild/easyconfigs/p/packmol/packmol-ictce.patch b/easybuild/easyconfigs/p/packmol/packmol-ictce.patch deleted file mode 100644 index 78904b7b4c..0000000000 --- a/easybuild/easyconfigs/p/packmol/packmol-ictce.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- Makefile 2011-08-02 20:21:59.000000000 +0200 -+++ ../Makefile 2013-12-05 12:23:41.941714435 +0100 -@@ -19,7 +19,7 @@ - # below to the path of your fortran compiler. The parallel version - # must be compiled with gfortran version 4.2 or greater. - # --FORTRAN = /usr/bin/gfortran -+FORTRAN = /apps/gent/SL6/sandybridge/software/ifort/2011.13.367/bin/intel64/ifort - # - FORTRAN_PARALLEL = gfortran - # -@@ -35,6 +35,7 @@ - # - # Change the flags of the compilation if you want: - # -+ - SERIALFLAGS = -O3 -ffast-math - # - # Flags for the compilation of the parallel version -@@ -49,6 +50,7 @@ - # - # Get the default fortran compiler - # -+ - ifeq ($(FORTRAN),AUTO) - FORTRAN = $(FC) - endif -@@ -69,7 +71,6 @@ - @echo " Flags: $(SERIALFLAGS) " - @echo " ------------------------------------------------------ " - @$(FORTRAN) $(SERIALFLAGS) $(srcall) $(srcserial) -o packmol -- @chmod +x solvate.tcl - @echo " Packmol succesfully built." - @echo " ------------------------------------------------------ " - # -@@ -83,7 +84,6 @@ - @$(FORTRAN_PARALLEL) $(PARALLELFLAGS) $(srcall) $(srcparallel)\ - -o packmol - @chmod +x ppackmol -- @chmod +x solvate.tcl - @echo " ------------------------------------------------------ " - @echo " Packmol succesfully built. Paralell version available. " - @echo " ------------------------------------------------------ " -@@ -96,7 +96,6 @@ - @echo " Flags: -Wunused" - @echo " ------------------------------------------------------ " - @$(FORTRAN) -Wunused $(srcall) $(srcserial) -o packmol -- @chmod +x solvate.tcl - @echo " ------------------------------------------------------ " - @echo " Packmol succesfully built. " - @echo " ------------------------------------------------------ " -- GitLab From d1c3a0b404985cd9c9d32c7590872507c99474ae Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 16:35:55 +0100 Subject: [PATCH 432/811] fix minor style remarks --- .../s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 6be5a1f63a..12ff2e5188 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """SciPy is a collection of mathematical algorithms and convenienc toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} -source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] dependencies = [('numpy', '1.6.2', versionsuffix)] diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb index 1e2a06545e..afedbc1537 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """SciPy is a collection of mathematical algorithms and convenienc toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} -source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] dependencies = [('numpy', '1.6.2', versionsuffix)] diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb index ace3c72316..93184d4eaf 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """SciPy is a collection of mathematical algorithms and convenienc toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'pic': True} -source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] dependencies = [('numpy', '1.6.2', versionsuffix)] diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb index b80ca9d761..f76c775805 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """SciPy is a collection of mathematical algorithms and convenienc toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True} -source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] dependencies = [('numpy', '1.6.2', versionsuffix)] diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb index aaa6f260b9..5c1e324243 100644 --- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """SciPy is a collection of mathematical algorithms and convenienc toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'pic': True} -source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')] +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] dependencies = [('numpy', '1.6.2', versionsuffix)] diff --git a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb index 4a6e691309..bdf51643a2 100644 --- a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb @@ -10,7 +10,7 @@ description = """TAMkin is a post-processing toolkit for normal mode analysis, toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['https://github.com/molmod/tamkin/releases/download/v%s' % version] +source_urls = ['https://github.com/molmod/tamkin/releases/download/v%(version)s'] sources = [SOURCE_TAR_GZ] python = "Python" @@ -26,7 +26,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; export OMP_NUM_THREADS=1; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; nosetests -v test' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'export OMP_NUM_THREADS=1; nosetests -v test' sanity_check_paths = { 'files': [], -- GitLab From c4ba7faba27116d2f6a49f7d2660bf26cd0efd31 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 18:18:07 +0100 Subject: [PATCH 433/811] fix typos w.r.t. 2013_sp1 versioning in icc/imkl easyconfigs --- easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb | 2 +- easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb index af863bb54e..be5072e46d 100644 --- a/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb +++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb @@ -6,7 +6,7 @@ description = "C and C++ compiler from Intel" toolchain = {'name': 'dummy', 'version': 'dummy'} -sources = ['l_ccompxe_2013_%(version)s.tgz'] +sources = ['l_ccompxe_%(version)s.tgz'] dontcreateinstalldir = 'True' diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb index a835fca22a..ca26f636cc 100644 --- a/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb @@ -12,7 +12,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mkl_%(version)s.tgz'] # deps for interface build -compver = '2013.sp1.080' +compver = '2013_sp1.0.080' dependencies = [ ('icc', compver), ('ifort', compver), -- GitLab From f3a89d2fa61f8f278f7dc54a187aa5788bbcf4eb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 19:41:15 +0100 Subject: [PATCH 434/811] add easyconfigs for recent icc/ifort/imkl/impi versions --- .../easyconfigs/i/icc/icc-2013_sp1.1.106.eb | 18 +++++++++++ .../i/ifort/ifort-2013_sp1.1.106.eb | 18 +++++++++++ .../easyconfigs/i/imkl/imkl-11.1.1.106.eb | 30 +++++++++++++++++++ .../easyconfigs/i/impi/impi-4.1.2.040.eb | 19 ++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb create mode 100644 easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb create mode 100644 easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb create mode 100644 easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb new file mode 100644 index 0000000000..2e5244fe91 --- /dev/null +++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb @@ -0,0 +1,18 @@ +name = 'icc' +version = '2013_sp1.1.106' + +homepage = 'http://software.intel.com/en-us/intel-compilers/' +description = "C and C++ compiler from Intel" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_ccompxe_%(version)s.tgz'] + +# compiler class +moduleclass = 'compiler' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb new file mode 100644 index 0000000000..8d50c3c460 --- /dev/null +++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb @@ -0,0 +1,18 @@ +name = 'ifort' +version = '2013_sp1.1.106' + +homepage = 'http://software.intel.com/en-us/intel-compilers/' +description = "Fortran compiler from Intel" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_fcompxe_%(version)s.tgz'] + +# compiler class +moduleclass = 'compiler' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb new file mode 100644 index 0000000000..3a8d833067 --- /dev/null +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb @@ -0,0 +1,30 @@ +name = 'imkl' +version = '11.1.1.106' + +homepage = 'http://software.intel.com/en-us/intel-mkl/' +description = """Intel Math Kernel Library is a library of highly optimized, + extensively threaded math routines for science, engineering, and financial + applications that require maximum performance. Core math functions include + BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mkl_%(version)s.tgz'] + +# deps for interface build +compver = '2013_sp1.1.106' +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.2.040') +] + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +interfaces = True + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb b/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb new file mode 100644 index 0000000000..95c8b09cb5 --- /dev/null +++ b/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb @@ -0,0 +1,19 @@ +name = 'impi' +version = '4.1.2.040' + +homepage = 'http://software.intel.com/en-us/intel-mpi-library/' +description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message + passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for + Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mpi_p_%(version)s.tgz'] + +moduleclass = 'mpi' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") -- GitLab From e60093ea903f0f42b93134c814578feff37a14bc Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 20:48:58 +0100 Subject: [PATCH 435/811] add easyconfigs for ictce 6.0.0 and 6.1.0 --- easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb | 21 ++++++++++++++++++++ easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb | 21 ++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb create mode 100644 easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb b/easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb new file mode 100644 index 0000000000..343a214a2c --- /dev/null +++ b/easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb @@ -0,0 +1,21 @@ +easyblock = "Toolchain" + +name = 'ictce' +version = '6.0.0' + +homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' +description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +suff = '0.080' +compver = '2013_sp1.%s' % suff + +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.1.036'), + ('imkl', '11.1.%s' % suff), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb b/easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb new file mode 100644 index 0000000000..29381078a5 --- /dev/null +++ b/easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb @@ -0,0 +1,21 @@ +easyblock = "Toolchain" + +name = 'ictce' +version = '6.1.0' + +homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' +description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +suff = '1.106' +compver = '2013_sp1.%s' % suff + +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.2.040'), + ('imkl', '11.1.%s' % suff), +] + +moduleclass = 'toolchain' -- GitLab From 8e0c0a2ad7b1743f47b805682cf3021de7b294a9 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 11 Dec 2013 21:10:32 +0100 Subject: [PATCH 436/811] add example easyconfigs for HPL with ictce/6.x.0 --- .../easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb | 18 ++++++++++++++++++ .../easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb create mode 100644 easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb new file mode 100644 index 0000000000..dad098f322 --- /dev/null +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb @@ -0,0 +1,18 @@ +name = 'HPL' +version = '2.0' + +homepage = 'http://www.netlib.org/benchmark/hpl/' +description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic + on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the + High Performance Computing Linpack Benchmark.""" + +toolchain = {'name': 'ictce', 'version': '6.0.0'} +toolchainopts = {'optarch': True, 'usempi': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.netlib.org/benchmark/%(namelower)s'] + +# fix Make dependencies, so parallel build also works +patches = ['HPL_parallel-make.patch'] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb new file mode 100644 index 0000000000..d3a5822e94 --- /dev/null +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb @@ -0,0 +1,18 @@ +name = 'HPL' +version = '2.0' + +homepage = 'http://www.netlib.org/benchmark/hpl/' +description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic + on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the + High Performance Computing Linpack Benchmark.""" + +toolchain = {'name': 'ictce', 'version': '6.1.0'} +toolchainopts = {'optarch': True, 'usempi': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.netlib.org/benchmark/%(namelower)s'] + +# fix Make dependencies, so parallel build also works +patches = ['HPL_parallel-make.patch'] + +moduleclass = 'tools' -- GitLab From 3f5fefe7116e8b108eb669f732588bf387c373db Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 12 Dec 2013 11:25:47 +0100 Subject: [PATCH 437/811] Added GMP 5.1.3 with ictce-5.5.0 and c++ support --- .../g/GMP/GMP-5.1.3-ictce-5.5.0.eb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..bbaacb631c --- /dev/null +++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb @@ -0,0 +1,23 @@ +name = 'GMP' +version = '5.1.3' + +homepage = 'http://gmplib.org/' +description = """GMP is a free library for arbitrary precision arithmetic, +operating on signed integers, rational numbers, and floating point numbers. """ + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = ['http://ftp.gnu.org/gnu/gmp'] + +# enable C++ interface +configopts = '--enable-cxx' + +runtest = 'check' + +sanity_check_paths = { + 'files': ['lib/libgmp.so', 'include/gmp.h'], + 'dirs': [], +} + +moduleclass = 'math' -- GitLab From 0bf1cfb225b4065241e2e396f36465eb3c8a5de7 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 12 Dec 2013 13:29:40 +0100 Subject: [PATCH 438/811] CP2k: fixed name of patch, should work now --- easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb | 2 +- easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb | 2 +- ...ompile_date_lastcvs.patch => fix_compile_date_lastsvn.patch} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/c/CP2K/{CP2K-20131211-fix_compile_date_lastcvs.patch => fix_compile_date_lastsvn.patch} (100%) diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb index 037d12025a..b1ca163f20 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb @@ -16,7 +16,7 @@ source_urls = [SOURCEFORGE_SOURCE] patches = [ 'do_regtest_nocompile.patch', 'ifort-compiler-bug-fix.patch', - 'CP2K-20131205-fix_compile_date_lastcvs.patch', + 'fix_compile_date_lastsvn.patch', ] ## use FFTW, with FFTACML there are extra failures in regtests diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb index b04e8859be..61301c6ae4 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb @@ -14,7 +14,7 @@ sources = [SOURCE_TAR_BZ2] patches = [ 'ifort-compiler-bug-fix.patch', - 'CP2K-%(version)s-fix_compile_date_lastcvs.patch', + 'fix_compile_date_lastsvn.patch', ] ## use FFTW, with FFTACML there are extra failures in regtests diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-fix_compile_date_lastcvs.patch b/easybuild/easyconfigs/c/CP2K/fix_compile_date_lastsvn.patch similarity index 100% rename from easybuild/easyconfigs/c/CP2K/CP2K-20131211-fix_compile_date_lastcvs.patch rename to easybuild/easyconfigs/c/CP2K/fix_compile_date_lastsvn.patch -- GitLab From f99fdf880b9ad1669b0aebe02f5244a3eee9ec28 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 12 Dec 2013 13:32:25 +0100 Subject: [PATCH 439/811] CHARMM: fixed small errors in easyconfigs --- .../easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb | 5 ++++- easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb index 81985c2134..25b23807a7 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb @@ -19,10 +19,13 @@ patches = [ "main-case-fix-%(version)s.patch", ] -#dependencies = [('Gaussian', 'g09_D.01-ictce-5.5.0-amd64-gpfs')] +dependencies = [ +# ('Gaussian', 'g09_D.01-ictce-5.5.0-amd64-gpfs') +] # MKL activated automatically when the MKL is found, same for g09 build_options = ["FULL", "COLFFT", "PIPF"] + # Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce system_size = "medium" diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb index 14e379742a..ca44f64f49 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb @@ -20,7 +20,9 @@ patches = [ # if you specify Gaussian, it will be used for the QM part. # if you specify FFTW, it will be used instead of the MKL -dependencies = [('Gaussian', 'g09_D.01', '-amd64-gpfs')] +dependencies = [ +# ('Gaussian', 'g09_D.01', '-amd64-gpfs') +] # MKL activated automatically when the ictce toolchain is used build_options = ["FULL", "COLFFT", "PIPF"] -- GitLab From f851678ad9d6bcfa2e482ce19d08d5d2d4edf8f1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 12 Dec 2013 14:13:54 +0100 Subject: [PATCH 440/811] add easyconfig for old impi v3.2.2 --- .../easyconfigs/i/impi/impi-3.2.2.006.eb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb diff --git a/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb new file mode 100755 index 0000000000..af378447b9 --- /dev/null +++ b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb @@ -0,0 +1,19 @@ +name = 'impi' +version = '3.2.2.006' + +homepage = 'http://software.intel.com/en-us/intel-mpi-library/' +description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message + passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for + Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mpi_p_%(version)s.tgz'] + +moduleclass = 'mpi' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") -- GitLab From f9a2b04b98a5299524c6acec4e93eef5e1a68718 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 13 Dec 2013 00:43:58 +0100 Subject: [PATCH 441/811] cosmetic changes --- easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb | 3 ++- easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb index d2d1de373c..41829c8d56 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb @@ -16,10 +16,11 @@ version = '3.1.4' homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page' description = """Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb index a703fdda55..0c368ea41a 100644 --- a/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb @@ -21,5 +21,4 @@ dependencies = [ ('GSL', '1.15'), ] - moduleclass = 'lib' -- GitLab From d7c1a7fb408bbef09309b308f319ab799e2d834e Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 13 Dec 2013 00:53:21 +0100 Subject: [PATCH 442/811] cosmetic changes replacing %(version)s as suggested by @fgeorgatos --- .../easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb | 2 +- .../easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb index 13621d0cd0..2b998a05e2 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb @@ -21,6 +21,6 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb index 3d05ff2d7e..958a558f7d 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb @@ -21,6 +21,6 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb index 9722706459..1b2199f7ad 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb @@ -21,6 +21,6 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb index 8827e2e91a..3c1a34a84a 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb @@ -22,6 +22,6 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb index fae87489f0..5eb47f9b01 100644 --- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb @@ -21,6 +21,6 @@ toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get'] -sources = ['%s.tar.bz2' % version] +sources = ['%(version)s.tar.bz2'] moduleclass = 'math' -- GitLab From ef6e3f80b487ec4624df50e00d3b88f344a9871e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 00:32:29 +0100 Subject: [PATCH 443/811] promote Coreutils to v8.22 Signed-off-by: Fotis Georgatos --- ...eutils-8.21-goolf-1.4.10.eb => Coreutils-8.22-goolf-1.4.10.eb} | 0 ...oreutils-8.21-ictce-5.3.0.eb => Coreutils-8.22-ictce-5.3.0.eb} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/c/Coreutils/{Coreutils-8.21-goolf-1.4.10.eb => Coreutils-8.22-goolf-1.4.10.eb} (100%) rename easybuild/easyconfigs/c/Coreutils/{Coreutils-8.21-ictce-5.3.0.eb => Coreutils-8.22-ictce-5.3.0.eb} (100%) diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb similarity index 100% rename from easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-goolf-1.4.10.eb rename to easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb similarity index 100% rename from easybuild/easyconfigs/c/Coreutils/Coreutils-8.21-ictce-5.3.0.eb rename to easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb -- GitLab From d281a18d69141894592acaf73e0a7ba1e8e9ff9e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 10:21:17 +0100 Subject: [PATCH 444/811] ini patch Signed-off-by: Fotis Georgatos --- .../Coreutils/Coreutils-8.22-goolf-1.4.10.eb | 6 +++--- .../c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb | 6 +++--- .../c/Coreutils/patch-2.7.1-goolf-1.4.10.eb | 19 +++++++++++++++++++ .../c/Coreutils/patch-2.7.1-ictce-5.3.0.eb | 19 +++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb index 73aff4d255..71347c1b3f 100644 --- a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb @@ -1,14 +1,14 @@ name = "Coreutils" -version = "8.21" +version = "8.22" homepage = 'http://www.gnu.org/software/coreutils/' description = """The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'pic': True} +toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftp.gnu.org/gnu/coreutils'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_XZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb index c61eaf7004..3a81592a70 100644 --- a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb @@ -1,14 +1,14 @@ name = "Coreutils" -version = "8.21" +version = "8.22" homepage = 'http://www.gnu.org/software/coreutils/' description = """The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'pic': True} +toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftp.gnu.org/gnu/coreutils'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_XZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..21419abe8d --- /dev/null +++ b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb @@ -0,0 +1,19 @@ +name = "patch" +version = "2.7.1" + +homepage = 'http://www.gnu.org/software/coreutils/' +description = """Patch takes a patch file containing a difference listing produced by the diff + program and applies those differences to one or more original files, producing patched versions.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = [GNU_SOURCE] +sources = [SOURCELOWER_TAR_XZ] + +sanity_check_paths = { + 'files': ["bin/patch"], + 'dirs': [] +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb new file mode 100644 index 0000000000..f8da2a6e5b --- /dev/null +++ b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb @@ -0,0 +1,19 @@ +name = "patch" +version = "2.7.1" + +homepage = 'http://www.gnu.org/software/coreutils/' +description = """Patch takes a patch file containing a difference listing produced by the diff + program and applies those differences to one or more original files, producing patched versions.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = [GNU_SOURCE] +sources = [SOURCELOWER_TAR_XZ] + +sanity_check_paths = { + 'files': ["bin/patch"], + 'dirs': [] +} + +moduleclass = 'tools' -- GitLab From c980e3cb03b506a31e49994dbfba0a326430468f Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 10:41:01 +0100 Subject: [PATCH 445/811] improve Coreutils & patch Signed-off-by: Fotis Georgatos --- .../easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb index 71347c1b3f..bd182d78c1 100644 --- a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb @@ -12,7 +12,7 @@ source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_XZ] sanity_check_paths = { - 'files': ["bin/date", "bin/true"], + 'files': ['bin/sort', 'bin/echo', 'bin/du', 'bin/date', 'bin/true'], 'dirs': [] } diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb index 3a81592a70..3eae868790 100644 --- a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb @@ -12,7 +12,7 @@ source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_XZ] sanity_check_paths = { - 'files': ["bin/date", "bin/true"], + 'files': ['bin/sort', 'bin/echo', 'bin/du', 'bin/date', 'bin/true'], 'dirs': [] } diff --git a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb index 21419abe8d..2bd4cf1e84 100644 --- a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb @@ -16,4 +16,4 @@ sanity_check_paths = { 'dirs': [] } -moduleclass = 'tools' +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb index f8da2a6e5b..d40dfa96e1 100644 --- a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb @@ -16,4 +16,4 @@ sanity_check_paths = { 'dirs': [] } -moduleclass = 'tools' +moduleclass = 'devel' -- GitLab From f3acc0a34847cac5cf2084c24a7eecd703105c5a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 13:32:27 +0100 Subject: [PATCH 446/811] relocate patch easyconfigs where they belong Signed-off-by: Fotis Georgatos --- .../{c/Coreutils => p/patch}/patch-2.7.1-goolf-1.4.10.eb | 0 .../{c/Coreutils => p/patch}/patch-2.7.1-ictce-5.3.0.eb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/{c/Coreutils => p/patch}/patch-2.7.1-goolf-1.4.10.eb (100%) rename easybuild/easyconfigs/{c/Coreutils => p/patch}/patch-2.7.1-ictce-5.3.0.eb (100%) diff --git a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/patch/patch-2.7.1-goolf-1.4.10.eb similarity index 100% rename from easybuild/easyconfigs/c/Coreutils/patch-2.7.1-goolf-1.4.10.eb rename to easybuild/easyconfigs/p/patch/patch-2.7.1-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/patch/patch-2.7.1-ictce-5.3.0.eb similarity index 100% rename from easybuild/easyconfigs/c/Coreutils/patch-2.7.1-ictce-5.3.0.eb rename to easybuild/easyconfigs/p/patch/patch-2.7.1-ictce-5.3.0.eb -- GitLab From b150879a76107dd13b1b219c9d2c1cd455cd7b86 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 14:21:30 +0100 Subject: [PATCH 447/811] replace with GNU_SOURCE where needed, round #1 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb | 2 +- .../easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb | 2 +- easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb | 2 +- .../easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb | 2 +- .../l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb | 2 +- .../l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb | 2 +- .../l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb | 2 +- .../l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb | 2 +- .../l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb | 2 +- easybuild/easyconfigs/m/M4/M4-1.4.16.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb | 2 +- .../easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb | 2 +- easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb index fcd7007494..39d449ebf4 100755 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb @@ -6,7 +6,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'GCC', 'version': '4.7.2'} -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb index 5211af2bb2..231ec6e1b8 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb @@ -10,7 +10,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'GCC', 'version': '4.8.2'} -source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb index 7b68488129..e0b581ce3d 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb index 82a404f023..a25b326d59 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb @@ -6,7 +6,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb index 749be4325e..0a829a5bd2 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb @@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb index a41534f1d8..e304f4b331 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb @@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb index 22f54366ee..c9ccb7d911 100644 --- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb index 69549d1d6f..1a58cb138e 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb index 30eaae1636..dd1af5cd2f 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb index 1670d6477e..5954b4a580 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb index d46be8f544..cbdb121a82 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb index 9dcd73edef..6cb5d154df 100644 --- a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """GNU ed is a line-oriented text editor.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/%(name)s/'] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files' : ['bin/ed'], diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb index 9ff5eb806d..7e1027f357 100644 --- a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.2.0'} toolchainopts = {'opt': True, 'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/%(namelower)s'] +source_urls = [GNU_SOURCE] dependencies = [ ('GMP', '5.1.1'), diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb index 4390cf21c4..aa9ed9d6e0 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/gsl/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb index fe17508924..8fbb3b8253 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb @@ -7,7 +7,7 @@ The library provides a wide range of mathematical routines such as random number toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/gsl/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb index acfba35290..d1b3c6c699 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/gsl/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb index 46fb6c2c19..75d1c9681c 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/gsl/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb index 3279101aeb..f649ead9a5 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb @@ -8,7 +8,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/gsl/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] configopts = "--with-pic" diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb index 6e1f6d8d88..72bf9736f8 100644 --- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ description = """GNU gperf is a perfect hash function generator. For a given lis toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://ftpmirror.gnu.org/%s' % name] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb index 2bbf67ad0e..bad261c98a 100644 --- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb @@ -8,7 +8,7 @@ function is perfect, which means that the hash table has no collisions, and the string comparison only.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://ftpmirror.gnu.org/%s' % name] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb index 63b3d924c1..3a83b14550 100644 --- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb @@ -9,7 +9,7 @@ description = """GNU gperf is a perfect hash function generator. For a given lis toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://ftpmirror.gnu.org/%s' % name] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb index 09e7025757..18fd84fe28 100644 --- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb @@ -10,7 +10,7 @@ description = """GNU gperf is a perfect hash function generator. For a given lis toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://ftpmirror.gnu.org/%s' % name] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb index ae0e87fc42..5457e6d892 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'cgoolf', 'version': '1.1.7'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb index ab8b1bc75e..7949d851ed 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'gmpolf', 'version': '1.4.8'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb index ccba8d9338..acb7e90d49 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb index 5302cfd659..78ba032893 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'goolf', 'version': '1.4.10'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb index 829726e985..5cff62f0ca 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'ictce', 'version': '4.0.6'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb index fe8de65ddb..2fe7409a9e 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'ictce', 'version': '4.1.13'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb index dcb790826e..42edcfbbc8 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb @@ -20,7 +20,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'ictce', 'version': '5.3.0'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb index bb3ec5eed9..8aefa658eb 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb @@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'goolf', 'version': '1.6.10'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb index 890fe517c0..359b660e46 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb index 388a3e580b..18fe4059db 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb index ba6d6b6505..b64442d4ef 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb @@ -10,7 +10,7 @@ and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline'] +source_urls = [GNU_SOURCE] dependencies = [ ('ncurses', '5.9-20130406'), diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb index 497a7d18be..7c6b657fe5 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgoolf', 'version': '1.1.7'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb index d664c36f04..9dab8be0f9 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb index 7f81da5c1f..0bf8fe1872 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb @@ -10,7 +10,7 @@ and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gmvolf', 'version': '1.7.12'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb index b157f2cf21..1eebe810d9 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb index 19e8a88ef4..a7db566606 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb index 641658be88..1c868a1400 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb index 30f278107c..d3fdc7906c 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb index 5b76aa7d0e..5740dd60f2 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb index 54747712bc..e93ffff0df 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.0.10'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb index 14784ff7b9..438d259161 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb index d2bc153da5..ad79306c27 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb index 7b174c8d4d..bc74b8856b 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb @@ -10,7 +10,7 @@ to recall and perhaps reedit those lines, and perform csh-like history expansion toolchain = {'name': 'ictce', 'version' : '5.2.0'} sources = ['readline-%s.tar.gz' % version] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb index d309434705..be1364c6ff 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb index f2d1625f9b..5a97406731 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '5.5.0'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb index 7f487221c1..cc11d206f2 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iomkl', 'version': '4.6.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb index d46fc3ce87..bb973d3cf6 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iqacml', 'version': '3.7.3'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb index e96333ad7a..68860b70ee 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iqacml', 'version': '4.4.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = ['http://ftpmirror.gnu.org/readline/'] +source_urls = [GNU_SOURCE] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb index 286c9ae8c7..a48c5487ad 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb index 5f1bea4076..06b9044ce0 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'ClangGCC', 'version': '1.2.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] configopts = "--enable-cxx" diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb index 264b599862..607e6bd0b5 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'GCC', 'version': '4.6.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb index 10a60472cd..0560144686 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb index c26aa03e7c..5bb719ac95 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'GCC', 'version': '4.7.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb index ddb33422fd..55cba29b68 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'GCC', 'version': '4.8.1'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb index 5f6973dba4..679d0186cd 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb @@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] configopts = "--enable-cxx" diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb index 8e168f546e..81a49cdbe3 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb @@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'gmacml', 'version': '1.7.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb index 945533570d..410fbc75ce 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb @@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'goalf', 'version' : '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb index 60c923740e..d66d8b9e4e 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb index b5c20dbd5d..925e8c70e6 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb @@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb index 6953b94347..c344494bc3 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb @@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb index c970130d7f..3c8fbd6746 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb @@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb index 7b14418a3d..7915e22d2e 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb @@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb index 1c34adaa26..98f82e41c4 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb @@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'iqacml', 'version': '3.7.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16.eb index 97181f8563..50af850a5a 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16.eb @@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands, toolchain = {'name': 'dummy', 'version': 'dummy'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] patches = ['M4-%(version)s-no-gets.patch'] diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb index bd58d4c9be..ad58285a85 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'GCC', 'version': '4.7.2'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb index edddf1e97a..f972b6a4ff 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'GCC', 'version': '4.7.3'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb index 910be3e324..5f56a55621 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'GCC', 'version': '4.8.1'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb index edda66f1dc..15745294d9 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'gmpolf', 'version': '1.4.8'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb index fbc61c03f9..38b356d5e1 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb index ec0e28d989..947e8e3afa 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb index 82a5ffa96a..4084c938c1 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb index 246b288ce1..33bb21037f 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb index e4ac4f446a..5a698183f4 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'goolfc', 'version': '1.3.12'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb index c5f6b9a107..c0284ad94f 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb index 0d526d6fbb..95388cfc5b 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'ictce', 'version': '4.0.10'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb index 523dca81d9..731485e77b 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb index 4cc75a29d9..8cb79c351b 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb index ab29dec4fe..fb1f4e9935 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb @@ -8,7 +8,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'ictce', 'version': '5.2.0'} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb index 60209824d7..020778b318 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb index c4b928cee8..a81155369d 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb index 6648a8a7ab..9963e053c2 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'iomkl', 'version': '4.6.13'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb index 2b469fedf6..decfe9bc04 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb @@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb index 0395e1a010..f4b42632c9 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb @@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o toolchain = {'name': 'iqacml', 'version': '4.4.13'} toolchainopts = {'optarch': True, 'pic': True} -source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] moduleclass = 'devel' -- GitLab From f8e71d864378a2e24f613e7e31edc1237acc75d1 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 14:22:29 +0100 Subject: [PATCH 448/811] replace with GNU_SOURCE where needed, round #2 Signed-off-by: Fotis Georgatos --- .../easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb | 2 +- .../easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb | 2 +- easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb | 2 +- easybuild/easyconfigs/b/Bison/Bison-2.7.eb | 2 +- .../easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb | 2 +- .../b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb | 2 +- easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb | 2 +- .../easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb | 2 +- .../easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb | 2 +- easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb | 2 +- .../easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb | 2 +- .../easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb | 2 +- .../easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb | 2 +- .../g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb | 2 +- easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb | 2 +- .../easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb | 2 +- .../l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb | 2 +- .../l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb | 2 +- .../l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb | 2 +- .../l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb | 2 +- .../p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb | 2 +- .../easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb | 2 +- .../easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb | 2 +- 97 files changed, 97 insertions(+), 97 deletions(-) diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb index 5708912031..8dced5a5fc 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb @@ -16,7 +16,7 @@ version = '1.13.4' homepage = 'http://www.gnu.org/software/automake/automake.html' description = "Automake: GNU Standards-compliant Makefile generator" -source_urls = ['http://ftp.gnu.org/gnu/automake'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb index e6a35fdebc..4ce71128df 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb @@ -16,7 +16,7 @@ version = '1.13.4' homepage = 'http://www.gnu.org/software/automake/automake.html' description = "Automake: GNU Standards-compliant Makefile generator" -source_urls = ['http://ftp.gnu.org/gnu/automake'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'ictce', 'version': '4.1.13'} diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb index a6aed31760..e10d946779 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb @@ -16,7 +16,7 @@ version = '1.13.4' homepage = 'http://www.gnu.org/software/automake/automake.html' description = "Automake: GNU Standards-compliant Makefile generator" -source_urls = ['http://ftp.gnu.org/gnu/automake'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb index 38cd369b16..6a66db0401 100644 --- a/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb @@ -18,7 +18,7 @@ description = "Automake: GNU Standards-compliant Makefile generator" toolchain = {'name': 'GCC', 'version': '4.8.2'} -source_urls = ['http://ftp.gnu.org/gnu/automake'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] dependencies = [('Autoconf', '2.69')] diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb index aae867d2af..f1ed26f41e 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb @@ -16,7 +16,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/a2ps'] +source_urls = [GNU_SOURCE] dependencies = [ ('gettext', '0.18.2'), diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb index 85c12af224..85a8aac89e 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb @@ -16,7 +16,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/a2ps'] +source_urls = [GNU_SOURCE] dependencies = [ ('gettext', '0.18.2'), diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb index 5f8b190cff..1a8b5ec4d6 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb @@ -16,7 +16,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p toolchain = {'version': '4.0.6', 'name': 'ictce'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/a2ps'] +source_urls = [GNU_SOURCE] dependencies = [ ('gettext', '0.18.2'), diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb index 442f9c380e..8b4d01b9b2 100644 --- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb @@ -17,7 +17,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/a2ps'] +source_urls = [GNU_SOURCE] dependencies = [ ('gettext', '0.18.2'), diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb index 359650da74..8ffbecad50 100644 --- a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb @@ -21,7 +21,7 @@ description = """Bash is an sh-compatible command language interpreter that exec toolchain = {'name' : 'goalf', 'version' : '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files': ["bin/bash"], diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb index ebae0731f4..d4a53daa14 100644 --- a/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb @@ -21,7 +21,7 @@ description = """Bash is an sh-compatible command language interpreter that exec toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files': ["bin/bash"], diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb index 953596556a..0863522494 100644 --- a/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb @@ -21,7 +21,7 @@ description = """Bash is an sh-compatible command language interpreter that exec toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files': ["bin/bash"], diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb index b06f0de448..4422c069ef 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'GCC', 'version': '4.6.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb index 07ff8400be..31520c710c 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'gmacml', 'version': '1.7.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb index aa3f8448b3..f26bcc8110 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb index 827c4f0330..aba6ec1fef 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb index c6a21e310e..10fc9ef68a 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb index eeb7f3e8bb..9c14def61f 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb index 8e67117ad4..8744cbb56a 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb index 42be6e0154..ec2d8ec231 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'ClangGCC', 'version': '1.2.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb index 8db1f625f0..585ea2ac96 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb index c713bcbe68..e3ee605bb0 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'GCC', 'version': '4.7.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb index e24eef4f7e..f8873239d9 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'GCC', 'version': '4.8.1'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb index a770800fdf..8be6a9e305 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb index f26e4c67a1..8043e00d5c 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb index 82ddbeb0ac..9cbcbb84e1 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'iqacml', 'version': '3.7.3'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7.eb index e6eb380e33..e1f74e5158 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7.eb @@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser toolchain = {'name': 'dummy', 'version': ''} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.16')] diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb index add5f24592..24e4efa236 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb @@ -17,7 +17,7 @@ homepage = 'http://directory.fsf.org/project/binutils/' description = "binutils-2.22: GNU binary utilities" sources = ['binutils-%s.tar.bz2' % version] -source_urls = ['http://ftp.gnu.org/gnu/binutils'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb index 17866810c4..bf43692811 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb @@ -17,7 +17,7 @@ homepage = 'http://directory.fsf.org/project/binutils/' description = "binutils-2.22: GNU binary utilities" sources = ['binutils-%s.tar.bz2' % version] -source_urls = ['http://ftp.gnu.org/gnu/binutils'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} toolchainopts = {'pic': True} diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb index 9ccfe20342..e7bcf8437d 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb @@ -17,7 +17,7 @@ homepage = 'http://directory.fsf.org/project/binutils/' description = "binutils-2.22: GNU binary utilities" sources = ['binutils-%s.tar.bz2' % version] -source_urls = ['http://ftp.gnu.org/gnu/binutils'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb index c5754639f5..59124fc81f 100644 --- a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb @@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/' description = """cflow-1.4: Code-path flow analyzer for C""" sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/cflow'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb index ec677bbfc5..2fa549427b 100644 --- a/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb @@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/' description = """cflow-1.4: Code-path flow analyzer for C""" sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/cflow'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb index 48b62c0de5..626c573418 100644 --- a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb @@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/' description = """cflow-1.4: Code-path flow analyzer for C""" sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/cflow'] +source_urls = [GNU_SOURCE] toolchain = {'version': '4.0.6', 'name': 'ictce'} diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb index 1dadcc0504..a6c4166eee 100644 --- a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb @@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/' description = """cflow-1.4: Code-path flow analyzer for C""" sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/cflow'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb index 5371caa2fa..5c1247c5f6 100644 --- a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb @@ -16,7 +16,7 @@ version = '3.2' description = """Diffutils: GNU diff utilities - find the differences between files""" homepage = 'http://www.gnu.org/software/diffutils/diffutils.html' -source_urls = ['http://ftp.gnu.org/gnu/diffutils'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb index 216a96d6a7..182d829f0f 100644 --- a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb @@ -16,7 +16,7 @@ version = '3.2' description = """Diffutils: GNU diff utilities - find the differences between files""" homepage = 'http://www.gnu.org/software/diffutils/diffutils.html' -source_urls = ['http://ftp.gnu.org/gnu/diffutils'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb index 7d2ab705af..0160acc4c4 100644 --- a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb @@ -16,7 +16,7 @@ version = '4.2.33' homepage = 'http://www.gnu.org/software/findutils/findutils.html' description = "findutils: The GNU find, locate, updatedb, and xargs utilities" -source_urls = ['http://ftp.gnu.org/gnu/findutils'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb index 6baac60dd5..b2d360c185 100644 --- a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb @@ -16,7 +16,7 @@ version = '4.2.33' homepage = 'http://www.gnu.org/software/findutils/findutils.html' description = "findutils: The GNU find, locate, updatedb, and xargs utilities" -source_urls = ['http://ftp.gnu.org/gnu/findutils'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb index c9c21b7554..add5752ac7 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb index d398023614..1825890778 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb index 058c22bab1..db088b8956 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb index 0d0649160d..14dca7818e 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'cgoolf', 'version': '1.1.7'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb index 3c952396b7..e54d658dee 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb @@ -18,7 +18,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'gmvolf', 'version': '1.7.12'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb index ee93ab0e55..bb25a5e621 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb @@ -18,7 +18,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb index b559961469..7814ec1eba 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb index 0f50e5f84d..e2199ba071 100644 --- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html' description = "GDB-7.5.1: The GNU Project Debugger" sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gdb/'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb index 6d6c21ad76..2706aa7486 100644 --- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """GMP is a free library for arbitrary precision arithmetic, toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gmp'] +source_urls = [GNU_SOURCE] runtest = 'check' diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb index e24d3871de..c9123d61f7 100644 --- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb @@ -7,7 +7,7 @@ operating on signed integers, rational numbers, and floating point numbers. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gmp'] +source_urls = [GNU_SOURCE] runtest = 'check' diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb index 03244c62e3..3c7c8b1566 100644 --- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """GMP is a free library for arbitrary precision arithmetic, toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gmp'] +source_urls = [GNU_SOURCE] runtest = 'check' diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb index aa308839e7..8fdf71fe7e 100644 --- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """GMP is a free library for arbitrary precision arithmetic, toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gmp'] +source_urls = [GNU_SOURCE] runtest = 'check' diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb index c0dac1a452..af2d9401ca 100644 --- a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb @@ -8,7 +8,7 @@ operating on signed integers, rational numbers, and floating point numbers. """ toolchain = {'name': 'ictce', 'version': '5.2.0'} sources = [SOURCELOWER_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/gmp'] +source_urls = [GNU_SOURCE] runtest = 'check' diff --git a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb index 616810aa15..adc07319fe 100644 --- a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb @@ -16,7 +16,7 @@ version = '4.0.2' homepage = 'http://www.gnu.org/software/gawk/gawk.html' description = "gawk: GNU awk" -source_urls = ['http://ftp.gnu.org/gnu/gawk'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb index c32d5a7da3..2f7e0cf882 100644 --- a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb @@ -16,7 +16,7 @@ version = '4.0.2' homepage = 'http://www.gnu.org/software/gawk/gawk.html' description = "gawk: GNU awk" -source_urls = ['http://ftp.gnu.org/gnu/gawk'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb index 7aa8ebc89f..2d9e22b986 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb index a02af5a472..74ed768df4 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb index 7b771be38b..4bcc26447a 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb index 6a75826e5b..a32268bf8f 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'cgoolf', 'version': '1.1.7'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb index 93247f5f1a..1fede7e4c6 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb index 60cb87e25e..87753bfbc9 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'gmvolf', 'version': '1.7.12'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb index f6924ebc7b..b9cff2211e 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb index be1d80eb14..c26723dfec 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb index f99a141fdb..35cded15c6 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb index a3b70c032f..8c7cc9b4b8 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb index acbb710e53..3eddb0a6d2 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb index 34e274c6bd..56598b375e 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb index 530e6833bb..be4e49be17 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'ictce', 'version': '5.2.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb index e49e2e384b..3c2d60cef2 100644 --- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb @@ -9,7 +9,7 @@ and documentation""" toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s'] +source_urls = [GNU_SOURCE] configopts = '--without-emacs' diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb index 90e6fd9442..9596baa7ba 100644 --- a/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] dependencies = [ ('libtool', '2.4.2'), diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb index ed99bdaf7b..215f5b7322 100644 --- a/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb @@ -7,7 +7,7 @@ the official extension language for the GNU operating system.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] dependencies = [ ('libtool', '2.4.2'), diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb index 09c8aa8e51..517a4e5549 100644 --- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] dependencies = [ ('libtool', '2.4.2'), diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb index 9b84ed765c..13223b7897 100644 --- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb @@ -8,7 +8,7 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%s-%s.tar.gz' % (name.lower(), version)] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] dependencies = [ ('libtool', '2.4.2'), diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb index c6b02f870f..0d0a354c13 100644 --- a/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb @@ -7,7 +7,7 @@ Libidn's purpose is to encode and decode internationalized domain names.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb index befb705dc8..ce8871841a 100644 --- a/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb @@ -7,7 +7,7 @@ Libidn's purpose is to encode and decode internationalized domain names.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb index 494ea997a3..175e451374 100644 --- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb @@ -8,6 +8,6 @@ description = """GNU libtool is a generic library support script. Libtool hides toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb index 1b2d459320..f40fb3df88 100644 --- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb @@ -7,6 +7,6 @@ behind a consistent, portable interface.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb index 16e021b019..ff247a01fc 100644 --- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb @@ -8,6 +8,6 @@ description = """GNU libtool is a generic library support script. Libtool hides toolchain = {'name': 'ictce', 'version' : '4.0.6'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb index b8e328774b..5002055bd1 100644 --- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb @@ -8,6 +8,6 @@ description = """GNU libtool is a generic library support script. Libtool hides toolchain = {'name': 'ictce', 'version' : '4.1.13'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb index f8c23c3025..04bf2df64f 100644 --- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb @@ -9,6 +9,6 @@ description = """GNU libtool is a generic library support script. Libtool hides toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb index 56bdff5bcc..f7e4bcfbbd 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """This library provides functions for manipulating Unicode string toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb index 5a3efb3ea5..fd4a8b980c 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb @@ -7,7 +7,7 @@ according to the Unicode standard.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] sanity_check_paths = { 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb index dec6140666..9b68839fba 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """This library provides functions for manipulating Unicode string toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] patches = ['libunistring_icc_builtin_nan-inf.patch'] diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb index 6c3d6347d8..c8fd88eb0f 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """This library provides functions for manipulating Unicode string toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +source_urls = [GNU_SOURCE] patches = ['libunistring_icc_builtin_nan-inf.patch'] diff --git a/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb b/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb index 4adee4b622..33ab4efa80 100644 --- a/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb @@ -18,7 +18,7 @@ description = "make-3.82: GNU version of make utility" # fi. http://ftp.gnu.org/gnu/make/make-3.82.tar.gz sources = ['make-%(version)s.tar.bz2'] -source_urls = ['http://ftp.gnu.org/gnu/make'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb b/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb index 61ce56f41f..98d8a738b6 100644 --- a/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb @@ -18,7 +18,7 @@ description = "make-3.82: GNU version of make utility" # fi. http://ftp.gnu.org/gnu/make/make-3.82.tar.gz sources = ['make-%(version)s.tar.bz2'] -source_urls = ['http://ftp.gnu.org/gnu/make'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb index 26569c2f16..d19fa1d165 100644 --- a/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb @@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/' description = """parallel: Build and execute shell commands in parallel""" sources = [SOURCE_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/parallel'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb index 85e087b41e..ec06e9c7cc 100644 --- a/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb @@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/' description = """parallel: Build and execute shell commands in parallel""" sources = [SOURCE_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/parallel'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb index cf5a965b2d..2a63fe61d3 100644 --- a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb @@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/' description = """parallel: Build and execute shell commands in parallel""" sources = [SOURCE_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/parallel'] +source_urls = [GNU_SOURCE] toolchain = {'version': '4.0.6', 'name': 'ictce'} diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb index 47bd8f12e9..8de6c29485 100644 --- a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb @@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/' description = """parallel: Build and execute shell commands in parallel""" sources = [SOURCE_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/parallel'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb b/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb index eb4db79fe2..107caabf86 100644 --- a/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb @@ -17,7 +17,7 @@ homepage = 'http://www.cs.purdue.edu/homes/trinkle/RCS/' description = "RCS: GNU Revision Control System - version control software" sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/rcs'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb b/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb index 779cdb65cd..d2cd389f5e 100644 --- a/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb @@ -17,7 +17,7 @@ homepage = 'http://www.cs.purdue.edu/homes/trinkle/RCS/' description = "RCS: GNU Revision Control System - version control software" sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/rcs'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb index a4d66cc836..b67b65616a 100644 --- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html' description = """Stow-1.3.3: Maps several separate packages into a tree without merging them""" sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/stow'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb index cc9ff2a153..3e5a453e42 100644 --- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html' description = """Stow-1.3.3: Maps several separate packages into a tree without merging them""" sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/stow'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb index b098bdf237..911acb7f10 100644 --- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html' description = """Stow-1.3.3: Maps several separate packages into a tree without merging them""" sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/stow'] +source_urls = [GNU_SOURCE] toolchain = {'version': '4.0.6', 'name': 'ictce'} diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb index 28ac7d91ae..1c4d3c3cc5 100644 --- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb @@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html' description = """Stow-1.3.3: Maps several separate packages into a tree without merging them""" sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/stow'] +source_urls = [GNU_SOURCE] toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb index 36d6a8effc..a50ed96b52 100644 --- a/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb @@ -16,7 +16,7 @@ version = '1.26' homepage = 'http://www.gnu.org/software/tar/tar.html' description = "tar: The GNU tape archiver" -source_urls = ['http://ftp.gnu.org/gnu/tar'] +source_urls = [GNU_SOURCE] sources = ['tar-%s.tar.bz2' % version] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb index 9714f94ef0..72c6d238a9 100644 --- a/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb @@ -16,7 +16,7 @@ version = '1.26' homepage = 'http://www.gnu.org/software/tar/tar.html' description = "tar: The GNU tape archiver" -source_urls = ['http://ftp.gnu.org/gnu/tar'] +source_urls = [GNU_SOURCE] sources = ['tar-%s.tar.bz2' % version] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb index 5e707fde52..dc4a806ac5 100644 --- a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb @@ -16,7 +16,7 @@ version = '1.26' homepage = 'http://www.gnu.org/software/tar/tar.html' description = "tar: The GNU tape archiver" -source_urls = ['http://ftp.gnu.org/gnu/tar'] +source_urls = [GNU_SOURCE] sources = ['tar-%s.tar.bz2' % version] toolchain = {'name': 'ictce', 'version': '4.0.6'} diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb index 0444d484d5..5b4cb4045a 100644 --- a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb @@ -16,7 +16,7 @@ version = '1.26' homepage = 'http://www.gnu.org/software/tar/tar.html' description = "tar: The GNU tape archiver" -source_urls = ['http://ftp.gnu.org/gnu/tar'] +source_urls = [GNU_SOURCE] sources = ['tar-%s.tar.bz2' % version] -- GitLab From e66219647a156fcee22d8bdefaf569415a104ee1 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 14 Dec 2013 14:31:36 +0100 Subject: [PATCH 449/811] replace with GNU_SOURCE where needed, round #3 Signed-off-by: Fotis Georgatos --- .../f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb | 2 +- .../f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb | 2 +- .../easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb | 2 +- .../l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb index 46fc41bf4b..0933ebbe50 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb index 0d83aa6521..13f7275f3e 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb @@ -9,7 +9,7 @@ servers, font conversion tools, text image generation tools, and many other prod toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb index 57c645e55f..d8180f31a0 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb index 23c5e15dba..6cd7f858d2 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb index 5771475460..115ca243f3 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb index 05ced29532..00039d8f1d 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb @@ -9,7 +9,7 @@ servers, font conversion tools, text image generation tools, and many other prod toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb index 87014fb205..1df33cbab7 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb @@ -9,7 +9,7 @@ servers, font conversion tools, text image generation tools, and many other prod toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb index 181648612e..b99078235a 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb index 1b32b32fb6..6187e6b9ba 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb index f82be0c8cb..b585104cab 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'iqacml', 'version': '3.7.3'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb index a3b5de75a2..e9d9036e94 100644 --- a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb @@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ['http://download.savannah.gnu.org/releases/freetype/'] +source_urls = [GNU_SAVANNAH_SOURCE] sources = [SOURCE_TAR_GZ] dependencies = [('libpng', '1.6.6')] diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb index dd04511798..dc8684e20b 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb @@ -5,7 +5,7 @@ homepage = 'http://www.gnu.org/software/libmatheval/' description = """GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic expressions input as text.""" -source_urls = ['http://ftp.gnu.org/gnu/libmatheval/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb index b24bc59f04..cb89a94544 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb @@ -5,7 +5,7 @@ homepage = 'http://www.gnu.org/software/libmatheval/' description = """GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic expressions input as text.""" -source_urls = ['http://ftp.gnu.org/gnu/libmatheval/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb index 7b46f2830c..d043ee8cce 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb @@ -5,7 +5,7 @@ homepage = 'http://www.gnu.org/software/libmatheval/' description = """GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic expressions input as text.""" -source_urls = ['http://ftp.gnu.org/gnu/libmatheval/'] +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_GZ] toolchain = {'name': 'ictce', 'version': '4.0.6'} diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb index c3709d8e78..1a22f67f60 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb @@ -5,7 +5,7 @@ homepage = 'http://www.gnu.org/software/libmatheval/' description = """GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic expressions input as text.""" -source_urls = ['http://ftp.gnu.org/gnu/libmatheval/'] +source_urls = [GNU_SOURCE] sources = ['%s-%s.tar.gz' % (name.lower(), version)] -- GitLab From 8e1c9d8d2902a957c6b4e353732895d22815a166 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 16 Dec 2013 21:25:06 +0100 Subject: [PATCH 450/811] rework goolfc/2.6.10 easyconfigs using gcccuda subtoolchain, add GROMACS easyconfig for goolfc/2.6.10 --- .../Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb | 24 +++++++++++ .../Automake/Automake-1.14-gcccuda-2.6.10.eb | 31 ++++++++++++++ .../c/CMake/CMake-2.8.4-goolfc-2.6.10.eb | 20 ++++++++++ ...-1.6.10.eb => FFTW-3.3.3-gompic-2.6.10.eb} | 2 +- .../g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb | 40 +++++++++++++++++++ .../easyconfigs/g/gcccuda/gcccuda-2.6.10.eb | 17 ++++++++ .../easyconfigs/g/gompic/gompic-1.6.10.eb | 29 -------------- .../easyconfigs/g/gompic/gompic-2.6.10.eb | 19 +++++++++ .../{goolfc-2.0.10.eb => goolfc-2.6.10.eb} | 17 +++----- .../h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb | 17 ++++++++ .../m/M4/M4-1.4.16-gcccuda-2.6.10.eb | 22 ++++++++++ .../n/ncurses/ncurses-5.9-goolfc-2.6.10.eb | 15 +++++++ ...nBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb} | 2 +- ....22.eb => OpenMPI-1.7.3-gcccuda-2.6.10.eb} | 6 +-- ...pic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb} | 2 +- 15 files changed, 214 insertions(+), 49 deletions(-) create mode 100644 easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb create mode 100644 easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb rename easybuild/easyconfigs/f/FFTW/{FFTW-3.3.3-gompic-1.6.10.eb => FFTW-3.3.3-gompic-2.6.10.eb} (95%) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb create mode 100644 easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb delete mode 100644 easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb create mode 100644 easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb rename easybuild/easyconfigs/g/goolfc/{goolfc-2.0.10.eb => goolfc-2.6.10.eb} (72%) create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb create mode 100644 easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb rename easybuild/easyconfigs/o/OpenBLAS/{OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb => OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb} (96%) rename easybuild/easyconfigs/o/OpenMPI/{OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb => OpenMPI-1.7.3-gcccuda-2.6.10.eb} (88%) rename easybuild/easyconfigs/s/ScaLAPACK/{ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb => ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb} (92%) diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb new file mode 100644 index 0000000000..3dbedef6bb --- /dev/null +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb @@ -0,0 +1,24 @@ +name = 'Autoconf' +version = '2.69' + +homepage = 'http://www.gnu.org/software/autoconf/' +description = """Autoconf is an extensible package of M4 macros that produce shell scripts + to automatically configure software source code packages. These scripts can adapt the + packages to many kinds of UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template file that lists the + operating system features that the package can use, in the form of M4 macro calls.""" + +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} + +source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan", + "autoupdate", "ifnames"]], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb new file mode 100644 index 0000000000..60bb667379 --- /dev/null +++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb @@ -0,0 +1,31 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/ +## + +name = 'Automake' +version = "1.14" + +homepage = 'http://www.gnu.org/software/automake/automake.html' +description = "Automake: GNU Standards-compliant Makefile generator" + +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} + +source_urls = ['http://ftp.gnu.org/gnu/automake'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('Autoconf', '2.69')] + +sanity_check_paths = { + 'files': ['bin/automake', 'bin/aclocal'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb new file mode 100644 index 0000000000..42fa53cb42 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.4' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb similarity index 95% rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb rename to easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb index 7dd42f220e..e3193217ca 100644 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-1.6.10.eb +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb @@ -5,7 +5,7 @@ homepage = 'http://www.fftw.org' description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data.""" -toolchain = {'name': 'gompic', 'version': '1.6.10'} +toolchain = {'name': 'gompic', 'version': '2.6.10'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb new file mode 100644 index 0000000000..40a4d861ce --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb @@ -0,0 +1,40 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## + +easyblock = 'CMakeMake' + +name = 'GROMACS' +version = '4.6.1' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] + +builddependencies = [('CMake', '2.8.4')] + +configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" +runtest = 'check' + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb b/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb new file mode 100644 index 0000000000..d75a89f110 --- /dev/null +++ b/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb @@ -0,0 +1,17 @@ +easyblock = "Toolchain" + +name = 'gcccuda' +version = '2.6.10' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, along with CUDA toolkit.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# compiler toolchain dependencies +dependencies = [ + ('GCC', '4.8.2'), + ('CUDA', '5.5.22'), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb b/easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb deleted file mode 100644 index 525fd48b04..0000000000 --- a/easybuild/easyconfigs/g/gompic/gompic-1.6.10.eb +++ /dev/null @@ -1,29 +0,0 @@ -easyblock = "Toolchain" - -name = 'gompic' -version = '1.6.10' - -homepage = '(none)' -description = """GNU Compiler Collection (GCC) based compiler toolchain, - including OpenMPI for MPI support.""" - -toolchain = {'name': 'dummy', 'version': 'dummy'} - -compname = 'GCC' -compver = '4.8.2' -comp = (compname, compver) - -mpilib = 'OpenMPI' -mpiver = '1.7.3' - -cudaname = 'CUDA' -cudaver = '5.5.22' -cudasuffix = '-' + cudaname + '-' + cudaver - -# compiler toolchain dependencies -dependencies = [ - comp, - (mpilib, mpiver, cudasuffix, comp), -] - -moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb b/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb new file mode 100644 index 0000000000..d0cc8743ce --- /dev/null +++ b/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb @@ -0,0 +1,19 @@ +easyblock = "Toolchain" + +name = 'gompic' +version = '2.6.10' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain along with CUDA toolkit, + including OpenMPI for MPI support with CUDA features enabled.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# compiler toolchain dependencies +dependencies = [ + ('GCC', '4.8.2'), # part of gcccuda + ('CUDA', '5.5.22'), # part of gcccuda + ('OpenMPI', '1.7.3', '', ('gcccuda', version)), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb b/easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb similarity index 72% rename from easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb rename to easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb index 549e0bec37..345bc66c03 100644 --- a/easybuild/easyconfigs/g/goolfc/goolfc-2.0.10.eb +++ b/easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'goolfc' -version = '2.0.10' +version = '2.6.10' homepage = '(none)' description = """GCC based compiler toolchain __with CUDA support__, and including @@ -9,19 +9,11 @@ description = """GCC based compiler toolchain __with CUDA support__, and includi toolchain = {'name': 'dummy', 'version': 'dummy'} -comp_name = 'GCC' -comp_version = '4.8.2' -comp = (comp_name, comp_version) - # toolchain used to build goolfc dependencies comp_mpi_tc_name = 'gompic' -comp_mpi_tc_ver = '1.6.10' +comp_mpi_tc_ver = version comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) -cudaname = 'CUDA' -cudaver = '5.5.22' -cudasuffix = '-' + cudaname + '-' + cudaver - blaslib = 'OpenBLAS' blasver = '0.2.8' blassuff = '-LAPACK-3.4.2' @@ -31,8 +23,9 @@ blas = '-%s-%s%s' % (blaslib, blasver, blassuff) # we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain # because of toolchain preperation functions dependencies = [ - comp, # part of gompic - ('OpenMPI', '1.7.3', cudasuffix, comp), # part of gompic, which includes also CUDA + ('GCC', '4.8.2'), # part of gompic + ('CUDA', '5.5.22'), # part of gompic + ('OpenMPI', '1.7.3', '', ('gcccuda', version)), # part of gompic (blaslib, blasver, blassuff, comp_mpi_tc), ('FFTW', '3.3.3', '', comp_mpi_tc), ('ScaLAPACK', '2.0.2', blas, comp_mpi_tc), diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb new file mode 100644 index 0000000000..f554e7a62a --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = "1.7.2" + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb new file mode 100644 index 0000000000..2175e7a770 --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb @@ -0,0 +1,22 @@ +name = 'M4' +version = '1.4.16' + +homepage = 'http://www.gnu.org/software/m4/m4.html' +description = """GNU M4 is an implementation of the traditional Unix macro processor. + It is mostly SVR4 compatible although it has some extensions + (for example, handling more than 9 positional parameters to macros). + GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.""" + +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://ftpmirror.gnu.org/m4'] + +configopts = "--enable-cxx" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb new file mode 100644 index 0000000000..4e33e95089 --- /dev/null +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb @@ -0,0 +1,15 @@ +name = 'ncurses' +version = '5.9' + +homepage = 'http://www.gnu.org/software/ncurses/' +description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, +and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and +function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/%(name)s'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb similarity index 96% rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb rename to easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb index dfef0b31c1..59919ca91a 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-1.6.10-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb @@ -7,7 +7,7 @@ versionsuffix = '-LAPACK-%s' % lapackver homepage = 'http://xianyi.github.com/OpenBLAS/' description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" -toolchain = {'name': 'gompic', 'version': '1.6.10'} +toolchain = {'name': 'gompic', 'version': '2.6.10'} lapack_src = 'lapack-%s.tgz' % lapackver large_src = 'large.tgz' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb similarity index 88% rename from easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb rename to easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb index 64159cacf9..7912a2d94c 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2-CUDA-5.5.22.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb @@ -1,11 +1,10 @@ name = 'OpenMPI' version = "1.7.3" -versionsuffix = '-CUDA-5.5.22' homepage = 'http://www.open-mpi.org/' description = """The Open MPI Project is an open source MPI-2 implementation.""" -toolchain = {'name': 'GCC', 'version': '4.8.2'} +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] @@ -17,7 +16,6 @@ builddependencies = [ dependencies = [ ('hwloc', '1.7.2'), - ('CUDA', '5.5.22', '', True), ] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' @@ -36,5 +34,3 @@ sanity_check_paths = { } moduleclass = 'mpi' - -patches = ['openmpi-mca-params.conf-1.4.5-local.patch', 'pax_disable.patch'] diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb similarity index 92% rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb rename to easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb index 0bc94ce1d6..77f58e7b27 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb @@ -5,7 +5,7 @@ homepage = 'http://www.netlib.org/scalapack/' description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines redesigned for distributed memory MIMD parallel computers.""" -toolchain = {'name': 'gompic', 'version': '1.6.10'} +toolchain = {'name': 'gompic', 'version': '2.6.10'} toolchainopts = {'pic': True} source_urls = [homepage] -- GitLab From 80035a6fa645d59f9c8b30b7b38bbaca6a032970 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 16 Dec 2013 22:30:16 +0100 Subject: [PATCH 451/811] change gromacs version from 4.6.1 to 4.6.5 Signed-off-by: Fotis Georgatos --- ...-4.6.1-goolfc-2.6.10.eb => GROMACS-4.6.5-goolfc-2.6.10.eb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/g/GROMACS/{GROMACS-4.6.1-goolfc-2.6.10.eb => GROMACS-4.6.5-goolfc-2.6.10.eb} (94%) diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10.eb similarity index 94% rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10.eb index 40a4d861ce..5c6e6ac80d 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-2.6.10.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10.eb @@ -14,7 +14,7 @@ easyblock = 'CMakeMake' name = 'GROMACS' -version = '4.6.1' +version = '4.6.5' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, @@ -22,7 +22,7 @@ description = """GROMACS is a versatile package to perform molecular dynamics, toolchain = {'name': 'goolfc', 'version': '2.6.10'} -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz sources = [ SOURCELOWER_TAR_GZ, 'regressiontests-%(version)s.tar.gz', -- GitLab From e306e498766a1717fec6255650631c1fba48ba95 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 17 Dec 2013 00:55:52 +0100 Subject: [PATCH 452/811] promote version of hwloc from 1.7.2 to 1.8 Signed-off-by: Fotis Georgatos --- ...wloc-1.7.2-gcccuda-2.6.10.eb => hwloc-1.8-gcccuda-2.6.10.eb} | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/h/hwloc/{hwloc-1.7.2-gcccuda-2.6.10.eb => hwloc-1.8-gcccuda-2.6.10.eb} (98%) diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb similarity index 98% rename from easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb rename to easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb index f554e7a62a..16ef9ff42e 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb @@ -1,5 +1,5 @@ name = 'hwloc' -version = "1.7.2" +version = "1.8" homepage = 'http://www.open-mpi.org/projects/hwloc/' description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb index 7912a2d94c..9198983666 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb @@ -15,7 +15,7 @@ builddependencies = [ ] dependencies = [ - ('hwloc', '1.7.2'), + ('hwloc', '1.8'), ] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' -- GitLab From 54191fc3b951d9086b090e3a18535bd9ea9b375e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 17 Dec 2013 01:27:56 +0100 Subject: [PATCH 453/811] add netloc and its dep Jansson Signed-off-by: Fotis Georgatos --- .../j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb | 28 +++++++++++++++++++ .../n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb | 25 +++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb create mode 100644 easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb new file mode 100644 index 0000000000..cc9e526be3 --- /dev/null +++ b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb @@ -0,0 +1,28 @@ +name = 'Jansson' +version = "2.5" + +homepage = 'http://www.digip.org/jansson/' +description = """Jansson is a C library for encoding, decoding and manipulating JSON data. + Its main features and design principles are: + * Simple and intuitive API and data model + * Comprehensive documentation + * No dependencies on other libraries + * Full Unicode support (UTF-8) + * Extensive test suite""" + +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} + +# fi. https://github.com/akheron/jansson/archive/2.5.zip +source_urls = ['https://github.com/akheron/jansson/archive/'] +sources = ['%(version)s.tar.gz'] + +dependencies = [('Autoconf', '2.69')] + +preconfigopts = 'autoreconf -i && ' + +sanity_check_paths = { + 'files': ['lib/libjansson.%s' % SHLIB_EXT], + 'dirs': ['include'], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb b/easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb new file mode 100644 index 0000000000..b8c85aae37 --- /dev/null +++ b/easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb @@ -0,0 +1,25 @@ +name = 'netloc' +version = "0.5" +versionsuffix = "beta" + +homepage = 'http://www.open-mpi.org/software/netloc' +description = """The Portable Network Locality (netloc) software package provides + network topology discovery tools, and an abstract representation of those networks + topologies for a range of network types and configurations. + It is provided as a companion to the Portable Hardware Locality (hwloc) package.""" + +toolchain = {'name': 'gcccuda', 'version': '2.6.10'} + +dependencies = [ + ('hwloc', '1.8'), + ('Jansson', '2.5'), +] + +configopts = '--with-hwloc=$EBROOTHWLOC ' # hwloc support +configopts += '--with-jansson=$EBROOTJANSSON ' # jansson support + +# fi. http://www.open-mpi.org/software/netloc/v0.5/downloads/netloc-0.5.tar.gz +source_urls = [ homepage + '/v%(version_major_minor)s/downloads'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' -- GitLab From 023402da37d72bb2e2b0398ee0cf9226f952f556 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 17 Dec 2013 01:32:18 +0100 Subject: [PATCH 454/811] also do runtest for jansson Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb index cc9e526be3..5bc100cb87 100644 --- a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb @@ -25,4 +25,6 @@ sanity_check_paths = { 'dirs': ['include'], } +runtest = 'check' + moduleclass = 'devel' -- GitLab From 9d66a446c8f643f4bbd1375e2ca5f6f01e24d885 Mon Sep 17 00:00:00 2001 From: pescobar Date: Tue, 17 Dec 2013 13:11:34 +0100 Subject: [PATCH 455/811] added BEDTools-2.18.1-goolf-1.4.10.eb --- .../BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb new file mode 100644 index 0000000000..47e6beb8fd --- /dev/null +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb @@ -0,0 +1,29 @@ +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics (SIB) +# Biozentrum - University of Basel + +name = 'BEDTools' +version = '2.18.1' + +easyblock = 'MakeCp' + +homepage = "https://github.com/arq5x/bedtools2" +description = """A powerful toolset for genome arithmetic.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +sources = ['v%(version)s.tar.gz'] +source_urls = ['https://github.com/arq5x/bedtools2/archive/'] + +files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in [ + 'bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed', + ] + ], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From b3cbdbcfe394a489e8d5828ea7470aba9b55b835 Mon Sep 17 00:00:00 2001 From: pescobar Date: Tue, 17 Dec 2013 13:51:34 +0100 Subject: [PATCH 456/811] cutadapt-1.3-goolf-1.4.10 --- .../cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb | 33 +++++++++++++++++++ .../cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb | 33 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..a13b2285f2 --- /dev/null +++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,33 @@ +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics (SIB) +# Biozentrum - University of Basel + +easyblock = "PythonPackage" + +name = 'cutadapt' +version = '1.3' + +homepage = 'http://code.google.com/p/cutadapt/' +description = """ cutadapt removes adapter sequences from high-throughput sequencing data. This is usually necessary when the read length of the sequencing machine is longer than the molecule that is sequenced, for example when sequencing microRNAs. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://cutadapt.googlecode.com/files/'] +sources = ['%(namelower)s-%(version)s.tar.gz'] + +python = 'Python' +pyver = '2.7.3' +pyshortver = '.'.join(pyver.split('.')[:2]) + +versionsuffix = "-%s-%s" % (python, pyver) + +dependencies = [ + (python, pyver), +] + +sanity_check_paths = { + 'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.so',], + 'dirs': [], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb new file mode 100644 index 0000000000..df852e5316 --- /dev/null +++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb @@ -0,0 +1,33 @@ +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics (SIB) +# Biozentrum - University of Basel + +easyblock = "PythonPackage" + +name = 'cutadapt' +version = '1.3' + +homepage = 'http://code.google.com/p/cutadapt/' +description = """ cutadapt removes adapter sequences from high-throughput sequencing data. This is usually necessary when the read length of the sequencing machine is longer than the molecule that is sequenced, for example when sequencing microRNAs. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://cutadapt.googlecode.com/files/'] +sources = ['%(namelower)s-%(version)s.tar.gz'] + +python = 'Python' +pyver = '2.7.5' +pyshortver = '.'.join(pyver.split('.')[:2]) + +versionsuffix = "-%s-%s" % (python, pyver) + +dependencies = [ + (python, pyver), +] + +sanity_check_paths = { + 'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.so',], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From 0d89376b5c4a52b18e462f3ee01c00b7fd5f95ef Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 17 Dec 2013 15:22:24 +0100 Subject: [PATCH 457/811] CHARMM: updated to remarks in PR --- ...7b2-ictce-5.5.0-nompi.eb => CHARMM-37b2-ictce-5.5.0-mt.eb} | 2 +- easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch | 1 + easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch | 4 +++- easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/c/CHARMM/{CHARMM-37b2-ictce-5.5.0-nompi.eb => CHARMM-37b2-ictce-5.5.0-mt.eb} (97%) diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb similarity index 97% rename from easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb rename to easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb index 25b23807a7..cd544770d0 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-nompi.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb @@ -2,7 +2,7 @@ name = "CHARMM" version = "37b2" -versionsuffix = "nompi" +versionsuffix = "-mt" homepage = "http://www.charmm.org" description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile diff --git a/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch b/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch index 3ec2563cdb..e2261c3173 100644 --- a/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch +++ b/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch @@ -1,4 +1,5 @@ # fix a error in the main +# By Ward Poelmans diff -ur c37b2.orig/source/charmm/charmm_main.src c37b2/source/charmm/charmm_main.src --- c37b2.orig/source/charmm/charmm_main.src 2013-02-11 06:27:24.000000000 +0100 +++ c37b2/source/charmm/charmm_main.src 2013-12-03 16:30:45.539579132 +0100 diff --git a/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch b/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch index 2365077555..291948be88 100644 --- a/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch +++ b/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch @@ -1,4 +1,6 @@ -# fixes compile error. Always display the warning +# fixes compile error: for some reason, ifort fails on this (possibly compiler bug) +# As a solution, we always display the warning +# By Ward Poelmans diff -ur c37b2.orig/source/squantm/sqnt_qm2_ewald.src c37b2/source/squantm/sqnt_qm2_ewald.src --- c37b2.orig/source/squantm/sqnt_qm2_ewald.src 2012-07-17 01:08:32.000000000 +0200 +++ c37b2/source/squantm/sqnt_qm2_ewald.src 2013-12-03 14:11:46.945196858 +0100 diff --git a/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch b/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch index deb270dfb2..1bfab91ec4 100644 --- a/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch +++ b/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch @@ -1,4 +1,5 @@ # lets use the flags the EB sets for us +# By Ward Poelmans diff -ur c37b2.orig/build/UNX/Makefile_em64t c37b2/build/UNX/Makefile_em64t --- c37b2.orig/build/UNX/Makefile_em64t 2012-07-10 14:06:18.000000000 +0200 +++ c37b2/build/UNX/Makefile_em64t 2013-12-03 15:35:18.997245768 +0100 -- GitLab From 3686f7ec5fb7737dbf5e3ce95deff7275a66cdd6 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 17 Dec 2013 15:39:53 +0100 Subject: [PATCH 458/811] added vsc-base and vsc-mympirun --- .../easyconfigs/v/vsc-base/vsc-base-1.6.9.eb | 19 +++++++++++++++ .../v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 23 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb create mode 100644 easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb new file mode 100644 index 0000000000..3f28389ec6 --- /dev/null +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb @@ -0,0 +1,19 @@ +easyblock = 'VersionIndependendPythonPackage' +name = 'vsc-base' +version = '1.6.9' + +homepage = 'http://hpcugent.github.com/vsc-mympirun/' +description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" + +# we build this to work with every python version +toolchain = {'name': 'dummy', 'version': 'dummy'} + + +sources = [SOURCE_TAR_GZ] +source_urls = [ + 'https://github.com/hpcugent/vsc-base/archive/', +] + +options = {'modulename': 'vsc.utils'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb new file mode 100644 index 0000000000..12fd4698df --- /dev/null +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -0,0 +1,23 @@ +easyblock = 'VersionIndependendPythonPackage' +name = 'vsc-mympirun' +version = '3.2.1' + +homepage = 'http://hpcugent.github.com/vsc-mympirun/' +description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" + +# we build this to work with every python version +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = [SOURCE_TAR_GZ] +source_urls = [ + 'https://github.com/hpcugent/vsc-mympirun/archive/', +] + +dependencies = [('vsc-base', '1.6.9')] + +# we ship something in bin/fake +modextrapaths = {'PATH': 'bin/fake'} + +options = {'modulename': 'vsc.mympirun'} + +moduleclass = 'tools' -- GitLab From 31a869b31314c3ac7ced7ce5d3d3e5dc67abc63d Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 17 Dec 2013 15:53:15 +0100 Subject: [PATCH 459/811] CHARMM: remove g09 dep --- .../c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb | 5 ----- .../easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb | 4 ---- easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb | 6 ------ 3 files changed, 15 deletions(-) diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb index 75a0e78635..6a211df95b 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb @@ -17,11 +17,6 @@ patches = [ "main-case-fix-%(version)s.patch", ] -# if you specify Gaussian, it will be used for the QM part. -dependencies = [ -# ('Gaussian', 'g09_D.01', '-amd64-gpfs'), -] - # FFTW will automatically be used because of the toolchain build_options = ["FULL", "COLFFT", "PIPF"] diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb index cd544770d0..446ccaff83 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb @@ -19,10 +19,6 @@ patches = [ "main-case-fix-%(version)s.patch", ] -dependencies = [ -# ('Gaussian', 'g09_D.01-ictce-5.5.0-amd64-gpfs') -] - # MKL activated automatically when the MKL is found, same for g09 build_options = ["FULL", "COLFFT", "PIPF"] diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb index ca44f64f49..dec6c5408f 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb @@ -18,12 +18,6 @@ patches = [ "main-case-fix-%(version)s.patch", ] -# if you specify Gaussian, it will be used for the QM part. -# if you specify FFTW, it will be used instead of the MKL -dependencies = [ -# ('Gaussian', 'g09_D.01', '-amd64-gpfs') -] - # MKL activated automatically when the ictce toolchain is used build_options = ["FULL", "COLFFT", "PIPF"] -- GitLab From 88855caf526a3eb075d873b0ab565b87d0581341 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 17 Dec 2013 15:55:25 +0100 Subject: [PATCH 460/811] CHARMM: updated build options to new easyblock We now use a string instead of list. --- .../easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb | 2 +- easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb | 2 +- easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb index 6a211df95b..928c867d0a 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb @@ -18,7 +18,7 @@ patches = [ ] # FFTW will automatically be used because of the toolchain -build_options = ["FULL", "COLFFT", "PIPF"] +build_options = "FULL COLFFT PIPF" # Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce system_size = "medium" diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb index 446ccaff83..3485ce9ee9 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb @@ -20,7 +20,7 @@ patches = [ ] # MKL activated automatically when the MKL is found, same for g09 -build_options = ["FULL", "COLFFT", "PIPF"] +build_options = "FULL COLFFT PIPF" # Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce system_size = "medium" diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb index dec6c5408f..81f90923f0 100644 --- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb @@ -19,7 +19,7 @@ patches = [ ] # MKL activated automatically when the ictce toolchain is used -build_options = ["FULL", "COLFFT", "PIPF"] +build_options = "FULL COLFFT PIPF" # Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce system_size = "medium" -- GitLab From 65e38573905733815ba69b5e9ad7815ce4194b5c Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 17 Dec 2013 16:52:45 +0100 Subject: [PATCH 461/811] reverted bump of distribute in Python-3.2.3-ictce-5.3.0.eb --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 66d906e00a..ad55ab0b99 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -24,9 +24,10 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { - 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], - }), + ('distribute', '0.6.26', { + 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], + 'modulename': 'setuptools', + ) ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], }), -- GitLab From eb901afacac6994003ca3f8edeb3089d33fc8e3b Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 17 Dec 2013 16:55:31 +0100 Subject: [PATCH 462/811] reverted bump of distribute in Python-3.2.3-ictce-5.3.0.eb --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index ad55ab0b99..647a552ff9 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -24,6 +24,8 @@ dependencies = [ # order is important! exts_list = [ + # This should actually be bumped to 'setuptools', '1.4.1' see + # https://github.com/hpcugent/easybuild-easyconfigs/pull/563#discussion-diff-8024693R27 ('distribute', '0.6.26', { 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], 'modulename': 'setuptools', -- GitLab From f99d9423ffbe519ea62a7b9e60e7eb74de17b062 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Tue, 17 Dec 2013 18:01:22 +0100 Subject: [PATCH 463/811] added , --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 647a552ff9..8c0e2e548c 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -29,7 +29,7 @@ exts_list = [ ('distribute', '0.6.26', { 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], 'modulename': 'setuptools', - ) + ), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], }), -- GitLab From 4fe121d20a99fcaf794b5ca74d79c36117368d85 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:31:45 +0100 Subject: [PATCH 464/811] style fixes in HDF easyconfigs --- .../h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb | 8 ++++---- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb | 8 ++++---- .../h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb | 8 ++++---- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb | 8 ++++---- easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb | 10 +++++----- easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb index 4280af21ba..ca672a8ed9 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb index b4ea04cfdb..ac9ee252e4 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb @@ -7,10 +7,10 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('Szip', '2.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb index b18ddf73bb..66fffd032c 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb index 2914eadfc9..341fa0c50d 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb @@ -9,10 +9,10 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('Szip', '2.1'), - ] + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb index 6a6f38583d..4f8fd04bf4 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb @@ -8,13 +8,13 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.37'), - ('Bison', '2.7'), - ('Szip', '2.1'), - ] + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), +] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] +source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/] configopts = "--with-szlib=$EBROOTSZIP" diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index 1706cf2d0c..63497c73fd 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -8,10 +8,10 @@ toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.37'), - ('Bison', '2.7'), - ('Szip', '2.1'), - ] + ('flex', '2.5.37'), + ('Bison', '2.7'), + ('Szip', '2.1'), +] sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -- GitLab From da92bce9baab0c0b8f07fb9858cdab8338b2ca8e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:39:04 +0100 Subject: [PATCH 465/811] style fixes in MUMmer easyconfigs --- .../m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb | 7 ++++--- .../m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb | 8 +++++--- .../easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb | 8 +++++--- easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb | 7 ++++--- .../m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb | 8 +++++--- .../m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb | 7 ++++--- easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb | 7 ++++--- 7 files changed, 31 insertions(+), 21 deletions(-) diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb index 2c1a1daf0a..8ad0e5e710 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb @@ -14,12 +14,13 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb index e610d327ac..cc1c5b9528 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb @@ -14,12 +14,14 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] perl = 'Perl' perlver = '5.16.3' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb index 68e6cd4aaf..3a1c6157f6 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb @@ -14,11 +14,13 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb index 9a5bbfccf4..ee85659115 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb @@ -14,12 +14,13 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb index a8ee9f8f89..b85beabd73 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb @@ -14,12 +14,14 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" + toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] perl = 'Perl' perlver = '5.16.3' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb index 9d63283dc3..6148c2da6e 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb @@ -14,13 +14,14 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] perl = 'Perl' perlver = '5.16.3' diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb index 03ba013834..e11bf5f61d 100644 --- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb @@ -14,13 +14,14 @@ name = 'MUMmer' version = '3.23' homepage = 'http://mummer.sourceforge.net/' -description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it.""" +description = """MUMmer is a system for rapidly aligning entire genomes, + whether in complete or draft form. AMOS makes use of it.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'pic': True} -sources = ['%s%s.tar.gz' % (name, version)] -source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')] +sources = ['%(name)s%(version)s.tar.gz'] +source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')] moduleclass = 'bio' -- GitLab From 8e94ee6aaf0c6219ddeaddafe006a52a9eb7d9a2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:40:23 +0100 Subject: [PATCH 466/811] style fixes in molmod easyconfigs --- .../m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb | 3 ++- .../m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb | 3 ++- .../m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb index 2521556c73..08d2e9759c 100644 --- a/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb @@ -23,7 +23,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'python setup.py build_ext -i; nosetests -v' sanity_check_paths = { 'files': [], diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb index 7f4ed72e6c..e697762256 100644 --- a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb @@ -23,7 +23,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'python setup.py build_ext -i; nosetests -v' sanity_check_paths = { 'files': [], diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb index 42b1105348..221229e3a6 100644 --- a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb @@ -23,7 +23,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'python setup.py build_ext -i; nosetests -v' sanity_check_paths = { 'files': [], -- GitLab From d4582d95448aa68e8fd8aff374659a3c2d8c8d50 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:42:16 +0100 Subject: [PATCH 467/811] style fixes in OTF easyconfigs --- easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb | 3 +-- easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb index e2416b4554..23a2067ba3 100644 --- a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb @@ -8,7 +8,6 @@ ## name = "OTF" version = "1.12.4" -majorsuffix = 'salmon' homepage = 'http://www.tu-dresden.de/zih/otf/' description = """The Open Trace Format is a highly scalable, memory efficient event @@ -18,7 +17,7 @@ description = """The Open Trace Format is a highly scalable, memory efficient ev toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} # http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz -sources = ['%%(name)s-%%(version)s%s.tar.gz' % majorsuffix] +sources = ['%(name)s-%(version)ssalmon.tar.gz'] source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get='] # name change in version 1.12.3: "open-trace-format" was "otf" in older versions diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb index 34d46acb15..0d0f9bbf97 100644 --- a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb @@ -8,7 +8,6 @@ ## name = "OTF" version = "1.12.4" -majorsuffix = 'salmon' homepage = 'http://www.tu-dresden.de/zih/otf/' description = """The Open Trace Format is a highly scalable, memory efficient event @@ -18,7 +17,7 @@ description = """The Open Trace Format is a highly scalable, memory efficient ev toolchain = {'name': 'ictce', 'version': '5.3.0'} # http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz -sources = ['%%(name)s-%%(version)s%s.tar.gz' % majorsuffix] +sources = ['%(name)s-%(version)ssalmon.tar.gz'] source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get='] # name change in version 1.12.3: "open-trace-format" was "otf" in older versions -- GitLab From 75f1a8faa41682641d8260a4c0fc97f5fce8596f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:44:34 +0100 Subject: [PATCH 468/811] style fixes in OpenBLAS easyconfigs --- .../o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb | 2 +- .../OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb | 2 +- .../OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb | 2 +- .../o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb index 4c5aa495a3..3d70563ce7 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb index 7edb3a4acf..a34682d998 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb index 02701dd4c9..5d51f5f66c 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb index f2e81ac46b..f7fcbb964f 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb index 12c01f0dfb..70c17c320e 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb index 894db5aef6..7689f17f2e 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb index c7072566fc..500a1a4501 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb index 95abb118d2..ada05e324e 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb index c32ddbd8d2..cf3256ea5a 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb index 6692010d4e..57cde75cef 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb index 1ea6e6468c..50eb836081 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb @@ -26,7 +26,7 @@ source_urls = [ ] patches = [ - # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), -- GitLab From e9cfb35c4d426fd2fb1d8f285062b71b8cd7688d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:45:42 +0100 Subject: [PATCH 469/811] remove OpenBLAS Makefile patch for recent OpenBLAS versions --- .../o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb | 1 - .../o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb | 1 - 2 files changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb index 57cde75cef..005cd85340 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb @@ -26,7 +26,6 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb index 50eb836081..15f2df5280 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb @@ -26,7 +26,6 @@ source_urls = [ ] patches = [ - 'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch', (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir (large_src, '.'), (timing_src, '.'), -- GitLab From 9532cc5255f1a1f97aaac0649e59b0bc38b0a9c9 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:47:41 +0100 Subject: [PATCH 470/811] style fixes in PSI easyconfigs --- easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb | 4 ++-- .../easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb | 4 ++-- easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb index 257d8f97ad..d3cae5bf6c 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb @@ -4,8 +4,8 @@ versionsuffix = '-mt' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} # not using MPI results in a build relying on multithreaded BLAS solely diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb index 78a59d7159..0325be769c 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb @@ -3,8 +3,8 @@ version = '4.0b4' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb index d9bf4f7fd5..ea25a8f6c0 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb @@ -4,8 +4,8 @@ versionsuffix = '-mt' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} # not using MPI results in a build relying on multithreaded BLAS solely diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb index 55585c69df..9d5ff82601 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb @@ -3,8 +3,8 @@ version = '4.0b4' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb index baeac81b77..aaa504d53c 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb @@ -4,8 +4,8 @@ versionsuffix = '-mt' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} # not using MPI results in a build relying on multithreaded BLAS solely diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb index 99696fe235..6882ac49f0 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb @@ -3,8 +3,8 @@ version = '4.0b5' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb index 5e2d6e7d5e..51a7d52ca8 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb @@ -4,8 +4,8 @@ versionsuffix = '-mt' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} # not using MPI results in a build relying on multithreaded BLAS solely diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb index 324e93c116..7ded97c33e 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb @@ -3,8 +3,8 @@ version = '4.0b5' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb index 33a7817cd8..089a136deb 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb @@ -4,8 +4,8 @@ versionsuffix = '-mt' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} # not using MPI results in a build relying on multithreaded BLAS solely diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index 6c090df7b7..863bb18040 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -3,8 +3,8 @@ version = '4.0b5' homepage = 'http://www.psicode.org/' description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for -efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform -computations with more than 2500 basis functions running serially or in parallel.""" + efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform + computations with more than 2500 basis functions running serially or in parallel.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'usempi': True} -- GitLab From 380b8da7fe4c877ad429dadef8386c94cbe04635 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:52:04 +0100 Subject: [PATCH 471/811] style fixes in scikit-learn easyconfigs --- .../scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb | 1 + .../s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb | 1 + 2 files changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb index 5e0d6b5e2f..4e7c9c3f6d 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb @@ -10,6 +10,7 @@ it provides versatile tools for data mining and analysis in any field of science It strives to be simple and efficient, accessible to everybody, and reusable in various contexts.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} + source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb index fb08bf0088..d7df74419b 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb @@ -11,6 +11,7 @@ It strives to be simple and efficient, accessible to everybody, and reusable in toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] + sources = [SOURCE_TAR_GZ] python = "Python" -- GitLab From de6644c6cecb5a281b829de88d6325e9186cbf0d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:56:39 +0100 Subject: [PATCH 472/811] style fixes in WPS easyconfigs --- .../w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb | 10 +++++----- .../w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb | 2 +- .../w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb | 10 +++++----- .../easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb | 10 +++++----- .../w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb | 12 ++++++------ .../w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb | 12 ++++++------ .../easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb | 12 ++++++------ .../easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb | 12 ++++++------ .../w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb | 12 ++++++------ 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb index 66840bc3fb..bf9ebc38cd 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb @@ -16,10 +16,10 @@ buildtype = "dmpar" versionsuffix = '-%s' % buildtype dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', '4.1.3'), - ('libpng', '1.5.11'), - ('JasPer', '1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', '4.1.3'), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb index d191598cb4..cf9f032fe1 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb @@ -19,7 +19,7 @@ dependencies = [ ('WRF', version, versionsuffix), ('netCDF', '4.1.3'), ('libpng', '1.5.11'), - ('JasPer', '1.900.1') + ('JasPer', '1.900.1'), ] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb index 16a3c57158..8431eafd57 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb @@ -16,10 +16,10 @@ buildtype = "dmpar" versionsuffix = '-%s' % buildtype dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', '4.1.3'), - ('libpng', '1.5.11'), - ('JasPer', '1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', '4.1.3'), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb index eaf41baf93..9a70c0a0be 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb @@ -16,10 +16,10 @@ buildtype = "dmpar" versionsuffix = '-%s' % buildtype dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', '4.1.3'), - ('libpng', '1.5.11'), - ('JasPer', '1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', '4.1.3'), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb index df3c22e073..9e0cde67a1 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb @@ -20,11 +20,11 @@ versionsuffix = '-%s' % buildtype netcdf_version = '4.2' dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', netcdf_version), - ('netCDF-Fortran', netcdf_version), - ('libpng', '1.5.11'), - ('JasPer', '1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', netcdf_version), + ('netCDF-Fortran', netcdf_version), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb index 0f57f30f8f..ceaf726698 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb @@ -20,11 +20,11 @@ versionsuffix = '-%s' % buildtype netcdf_version = '4.2' dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', netcdf_version), - ('netCDF-Fortran', netcdf_version), - ('libpng', '1.5.11'), - ('JasPer', '1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', netcdf_version), + ('netCDF-Fortran', netcdf_version), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb index d43822d6cd..ef8b3b3cc6 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb @@ -19,11 +19,11 @@ buildtype = "dmpar" versionsuffix = '-%s' % buildtype dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', '4.2.1.1'), - ('netCDF-Fortran', '4.2'), - ('libpng', '1.5.11'), - ('JasPer', '1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('libpng', '1.5.11'), + ('JasPer', '1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb index 3dfc001558..a520db3494 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb @@ -18,11 +18,11 @@ buildtype = "dmpar" versionsuffix = '-%s' % buildtype dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', '4.2.1.1'), - ('netCDF-Fortran', '4.2'), - ('libpng', '1.5.14'), - ('JasPer','1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('libpng', '1.5.14'), + ('JasPer','1.900.1'), +] moduleclass = 'geo' diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb index a4441004d5..a11ffd3dd5 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb @@ -18,11 +18,11 @@ buildtype = "dmpar" versionsuffix = '-%s' % buildtype dependencies = [ - ('WRF', version, versionsuffix), - ('netCDF', '4.2.1.1'), - ('netCDF-Fortran', '4.2'), - ('libpng', '1.5.14'), - ('JasPer','1.900.1') - ] + ('WRF', version, versionsuffix), + ('netCDF', '4.2.1.1'), + ('netCDF-Fortran', '4.2'), + ('libpng', '1.5.14'), + ('JasPer','1.900.1'), +] moduleclass = 'geo' -- GitLab From d3f733d7471402d34537f7b7328b0138ac6e2098 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 20:59:19 +0100 Subject: [PATCH 473/811] style fixes in yaff easyconfigs --- .../easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb | 3 ++- .../easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb | 3 ++- .../easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb index 15ffe15aee..18d7701786 100644 --- a/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb @@ -26,7 +26,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'python setup.py build_ext -i; nosetests -v' sanity_check_paths = { 'files': [], diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb index a08ebd67d7..cdf3df85de 100644 --- a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb @@ -26,7 +26,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'python setup.py build_ext -i; nosetests -v' sanity_check_paths = { 'files': [], diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb index e0ef7ac9a4..ed6b897594 100644 --- a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb @@ -26,7 +26,8 @@ dependencies = [ ] # disable tests that require X11 by specifying "backend: agg" in matplotlibrc -runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v' +runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; ' +runtest += 'python setup.py build_ext -i; nosetests -v' sanity_check_paths = { 'files': [], -- GitLab From 0f270d08fbcee7ff203d80bb18d2933eb4719bfe Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 21:09:08 +0100 Subject: [PATCH 474/811] fix typo in HDF easyconfig + missing style fix --- easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb index 4f8fd04bf4..2035306c6a 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb @@ -14,7 +14,7 @@ dependencies = [ ] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/] +source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/'] configopts = "--with-szlib=$EBROOTSZIP" diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index 63497c73fd..5a9f8c793a 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -14,7 +14,7 @@ dependencies = [ ] sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] +source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/'] configopts = "--with-szlib=$EBROOTSZIP" -- GitLab From 5dbadd375ee39afcb51c219dbcd6b3674d11e35f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Dec 2013 22:27:31 +0100 Subject: [PATCH 475/811] fix HDF v4.2.7 deps --- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb | 4 ++-- easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb index 66fffd032c..d0446b5752 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb @@ -8,8 +8,8 @@ toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.37'), - ('Bison', '2.7'), + ('flex', '2.5.35'), + ('Bison', '2.5'), ('Szip', '2.1'), ] diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb index 341fa0c50d..1ad7d6ac5c 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb @@ -9,8 +9,8 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'pic': True} dependencies = [ - ('flex', '2.5.37'), - ('Bison', '2.7'), + ('flex', '2.5.35'), + ('Bison', '2.5'), ('Szip', '2.1'), ] -- GitLab From 0b60f34ab8dd8ebc7c28bf17b8f788962de3d621 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 18 Dec 2013 01:49:16 +0100 Subject: [PATCH 476/811] removed CBLAS for ictce-5.3.0 Signed-off-by: Fotis Georgatos --- .../c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb deleted file mode 100644 index 41a61d1d6f..0000000000 --- a/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-ictce-5.3.0.eb +++ /dev/null @@ -1,22 +0,0 @@ -name = 'CBLAS' -version = '20110120' - -homepage = 'http://www.netlib.org/blas/' -description = "C interface to the BLAS" - -toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'pic': True} - -source_urls = ['http://www.netlib.org/blas/blast-forum/'] -sources = ['cblas.tgz'] - -patches = ['CBLAS_shared-lib.patch'] - -makeopts = 'all shared' - -# parallel build fails occasionally -parallel = 1 - -runtest = 'runtst' - -moduleclass = 'numlib' -- GitLab From 57276b9feee33eec08ff8d3cfbc90da5b7e357f6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 18 Dec 2013 01:57:29 +0100 Subject: [PATCH 477/811] remove GROMACS-4.6.1-ictce-5.3.0.eb Signed-off-by: Fotis Georgatos --- .../g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb deleted file mode 100644 index 6704a1c189..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0.eb +++ /dev/null @@ -1,40 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## - -easyblock = 'CMakeMake' - -name = 'GROMACS' -version = '4.6.1' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] - -builddependencies = [('CMake', '2.8.4')] - -configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" -runtest = 'check' - -moduleclass = 'bio' -- GitLab From fe5e3a0c96055c7bb04b4a66036120bd307058c7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 18 Dec 2013 02:08:45 +0100 Subject: [PATCH 478/811] remove OpenSSL-1.0.0-ictce-5.3.0.eb Signed-off-by: Fotis Georgatos --- .../o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb deleted file mode 100644 index 0d17976392..0000000000 --- a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-ictce-5.3.0.eb +++ /dev/null @@ -1,21 +0,0 @@ -name = 'OpenSSL' -version = '1.0.0' - -homepage = 'http://www.openssl.org/' -description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, -and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) -protocols as well as a full-strength general purpose cryptography library. """ - -toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'pic': True, 'opt': True, 'optarch': True} - -sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.openssl.org/source/'] - -dependencies = [('zlib', '1.2.7')] - -# makefile is not suitable for parallel build -parallel = 1 -runtest = 'test' - -moduleclass = 'system' -- GitLab From b13d24039db8f0036a7c2df5a21e5adb604399bc Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 07:44:46 +0100 Subject: [PATCH 479/811] mark flex/Bison as build dependencies of Doxygen rather than actual deps --- .../d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb | 6 ++++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb | 4 ++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb | 4 ++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb | 4 ++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb | 4 ++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb | 4 ++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb | 4 ++-- .../easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb | 2 +- .../easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb | 2 +- .../easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb | 4 ++-- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb index a617a2a35e..94124552fa 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('Bison', '2.5'), ] diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb index d5037c4b63..50e6f2e0f5 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb @@ -10,7 +10,9 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [('flex', '2.5.35'), - ('Bison', '2.5')] +builddependencies = [ + ('flex', '2.5.35'), + ('Bison', '2.5'), +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb index f8cc37f0d7..2b4093a0c4 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('Bison', '2.5'), - ] +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb index 134c1f4a23..6fe341a2e4 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('Bison', '2.5'), - ] +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb index 32150d37b1..0a291437d5 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('Bison', '2.5'), - ] +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb index 69ca07e3c9..46e392d855 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.35'), ('Bison', '2.5'), - ] +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb index 433f76db8e..4e0322abc4 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.37'), ('Bison', '2.6.5'), - ] +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb index 064fa6f372..2793cce845 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.37'), ('Bison', '2.6.5'), - ] +] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb index 9962c84d18..9b648008e6 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.37'), ('Bison', '2.7'), ] diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb index 1af9922e91..b9145b9d9d 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.37'), ('Bison', '2.7'), ] diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb index a3abb79c1b..17c6df3ade 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb @@ -10,9 +10,9 @@ toolchain = {'name': 'iqacml', 'version': '3.7.3'} sources = ['%(namelower)s-%(version)s.src.tar.gz'] source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] -dependencies = [ +builddependencies = [ ('flex', '2.5.37'), ('Bison', '2.7'), - ] +] moduleclass = 'devel' -- GitLab From d6da9522cdb67ed12c2fbaac42b70686205cdd89 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 07:47:44 +0100 Subject: [PATCH 480/811] style fixes for g2clib easyconfigs --- .../g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb | 6 +++--- .../easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb | 6 +++--- .../easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb | 6 +++--- easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb | 7 +++---- .../easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb | 6 +++--- .../easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb | 6 +++--- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb index dbced3e64b..1f22264a23 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder ("C" version).""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb index 40a9844a04..f03d5ac65f 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb @@ -6,11 +6,11 @@ description = """Library contains GRIB2 encoder/decoder ("C" version).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb index 6626ea0412..e5c7bb899d 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder ("C" version).""" toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb index 1e29860282..64379dcbec 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb @@ -4,15 +4,14 @@ version = '1.2.3' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' description = """Library contains GRIB2 encoder/decoder ("C" version).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb index 42f32bafc7..cd304a31b0 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder ("C" version).""" toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + # parallel build tends to fail parallel = 1 diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb index 36b9488a21..568873fa47 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder ("C" version).""" toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + # parallel build tends to fail parallel = 1 -- GitLab From 2e8ab8413c76971179430c0abfd54d6344ebfa9b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 07:48:59 +0100 Subject: [PATCH 481/811] style fixes for g2lib easyconfigs --- .../easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb | 6 +++--- easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb | 6 +++--- .../easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb | 6 +++--- easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb | 7 +++---- easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb | 6 +++--- easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb | 6 +++--- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb index cd9cd1eda9..0ab3fe63d5 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + patches = ['fix_makefile.patch'] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb index d471cd44b2..afcd635a41 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb @@ -6,11 +6,11 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + patches = ['fix_makefile.patch'] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb index 7012aa01db..5f3786879f 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + patches = ['fix_makefile.patch'] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb index c7e5c2c63f..0cce533391 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb @@ -4,15 +4,14 @@ version = '1.2.4' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' description = """Library contains GRIB2 encoder/decoder and search/indexing routines.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + patches = ['fix_makefile.patch'] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb index 73e2caf3fb..6afe34db8d 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + patches = ['fix_makefile.patch'] # parallel build tends to fail diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb index 7e04bd54d3..deaffbea8e 100644 --- a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb @@ -7,11 +7,11 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True} -dependencies = [('JasPer', '1.900.1')] - -sources = ['%s-%s.tar' % (name, version)] +sources = [SOURCE_TAR] source_urls = [homepage] +dependencies = [('JasPer', '1.900.1')] + patches = ['fix_makefile.patch'] # parallel build tends to fail -- GitLab From cbb3cbae5e18cd0f976cb6efb37b9648194f0dca Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 07:51:25 +0100 Subject: [PATCH 482/811] style fixes for HDF, HDF5 and libjpeg-turbo easyconfigs --- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb | 3 ++- easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb | 4 +++- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb | 3 ++- easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb | 4 ++-- easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb | 3 ++- easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 3 ++- .../easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb | 2 +- .../l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb | 3 ++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb index 6c4821a391..2afcef011a 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb @@ -2,7 +2,8 @@ name = 'HDF' version = '4.2.7-patch1' homepage = 'http://www.hdfgroup.org/products/hdf4/' -description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" +description = """HDF (also known as HDF4) is a library and multi-object file format for storing + and managing data between machines.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True, 'pic': True} diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb index 1ca5d08181..ddec0bbdd1 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb @@ -2,7 +2,9 @@ name = 'HDF' version = '4.2.7-patch1' homepage = 'http://www.hdfgroup.org/products/hdf4/' -description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" +description = """HDF (also known as HDF4) is a library and multi-object file format for storing + and managing data between machines.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'pic': True} diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb index d71e54280e..7bf50ddd9d 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb @@ -2,7 +2,8 @@ name = 'HDF' version = '4.2.7-patch1' homepage = 'http://www.hdfgroup.org/products/hdf4/' -description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" +description = """HDF (also known as HDF4) is a library and multi-object file format for storing + and managing data between machines.""" toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True, 'pic': True} diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb index df3727db52..8e8c3a76f4 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb @@ -2,8 +2,8 @@ name = 'HDF' version = '4.2.7-patch1' homepage = 'http://www.hdfgroup.org/products/hdf4/' -description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" - +description = """HDF (also known as HDF4) is a library and multi-object file format for storing + and managing data between machines.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'pic': True} diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb index 12c89a77b4..0810f8a775 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb @@ -2,7 +2,8 @@ name = 'HDF' version = '4.2.8' homepage = 'http://www.hdfgroup.org/products/hdf4/' -description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" +description = """HDF (also known as HDF4) is a library and multi-object file format for storing + and managing data between machines.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True, 'pic': True} diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index a83caaaf0c..8cf209069c 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -2,7 +2,8 @@ name = 'HDF' version = '4.2.8' homepage = 'http://www.hdfgroup.org/products/hdf4/' -description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines.""" +description = """HDF (also known as HDF4) is a library and multi-object file format for storing + and managing data between machines.""" toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True, 'pic': True} diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb index b1532bad95..3003f14877 100644 --- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb @@ -19,7 +19,7 @@ patches = [ dependencies = [ ('zlib', '1.2.7'), - ('Szip','2.1'), + ('Szip', '2.1'), ] configopts = "--enable-gpfs --enable-threadsafe --enable-production " diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb index a8b098068f..60866e8337 100644 --- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb @@ -5,7 +5,8 @@ homepage = 'http://sourceforge.net/libjpeg-turbo/' description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding. """ -toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'ictce', 'version': '4.0.10'}) + +toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True} source_urls = [SOURCEFORGE_SOURCE] -- GitLab From 3df653d3bc60220322c94432e145094e787a0b13 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 09:06:54 +0100 Subject: [PATCH 483/811] make sure patch file is used in all M4 easyconfigs --- easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb | 2 ++ easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb | 2 ++ easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb index 5f1bea4076..104b577f90 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb @@ -13,6 +13,8 @@ toolchain = {'name': 'ClangGCC', 'version': '1.2.3'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftpmirror.gnu.org/m4'] +patches = ['M4-%(version)s-no-gets.patch'] + configopts = "--enable-cxx" sanity_check_paths = { diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb index 5f6973dba4..175c5e78af 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb @@ -12,6 +12,8 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftpmirror.gnu.org/m4'] +patches = ['M4-%(version)s-no-gets.patch'] + configopts = "--enable-cxx" sanity_check_paths = { diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb index 2175e7a770..68b005dc52 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb @@ -12,6 +12,8 @@ toolchain = {'name': 'gcccuda', 'version': '2.6.10'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftpmirror.gnu.org/m4'] +patches = ['M4-%(version)s-no-gets.patch'] + configopts = "--enable-cxx" sanity_check_paths = { -- GitLab From d77982820ce717aa5b8d75b617baeda086602074 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Wed, 18 Dec 2013 10:04:43 +0100 Subject: [PATCH 484/811] fixed syntax error --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 8c0e2e548c..5153420960 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -29,7 +29,7 @@ exts_list = [ ('distribute', '0.6.26', { 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], 'modulename': 'setuptools', - ), + }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], }), -- GitLab From 1ee53df508027c952830b8d65d2708c201459fdd Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 18 Dec 2013 10:15:10 +0100 Subject: [PATCH 485/811] fixed indentation --- .../c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb index a13b2285f2..5a8435dee3 100644 --- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb @@ -8,7 +8,11 @@ name = 'cutadapt' version = '1.3' homepage = 'http://code.google.com/p/cutadapt/' -description = """ cutadapt removes adapter sequences from high-throughput sequencing data. This is usually necessary when the read length of the sequencing machine is longer than the molecule that is sequenced, for example when sequencing microRNAs. """ +description = """ cutadapt removes adapter sequences + from high-throughput sequencing data. This is usually + necessary when the read length of the sequencing machine + is longer than the molecule that is sequenced, for + example when sequencing microRNAs. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -- GitLab From c4b321bd47cb6b464e3a6d068dc37c6bf993143e Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 18 Dec 2013 10:17:27 +0100 Subject: [PATCH 486/811] fix indent second eb file --- .../c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb index df852e5316..abd9e43447 100644 --- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb +++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb @@ -8,7 +8,11 @@ name = 'cutadapt' version = '1.3' homepage = 'http://code.google.com/p/cutadapt/' -description = """ cutadapt removes adapter sequences from high-throughput sequencing data. This is usually necessary when the read length of the sequencing machine is longer than the molecule that is sequenced, for example when sequencing microRNAs. """ +description = """ cutadapt removes adapter sequences + from high-throughput sequencing data. This is usually + necessary when the read length of the sequencing machine + is longer than the molecule that is sequenced, for + example when sequencing microRNAs. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -- GitLab From 0497c9179046d56d1807df138ca1fb8029a5aa73 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 18 Dec 2013 12:09:19 +0100 Subject: [PATCH 487/811] remove p/Python/Python-2.5.6-ictce-5.3.0-bare.eb Signed-off-by: Fotis Georgatos --- .../p/Python/Python-2.5.6-ictce-5.3.0-bare.eb | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb deleted file mode 100644 index 68a4b58e99..0000000000 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb +++ /dev/null @@ -1,23 +0,0 @@ -name = 'Python' -version = '2.5.6' -versionsuffix = '-bare' - -homepage = 'http://python.org/' -description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." - -toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'pic': True, 'opt': True, 'optarch': True} - -source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] - -patches = ['python_libffi_int128_icc.patch'] - -dependencies = [ - ('bzip2', '1.0.6'), - ('zlib', '1.2.7'), - ('libreadline', '6.2'), - ('ncurses', '5.9'), -] - -moduleclass = 'lang' -- GitLab From 33c02f771e4897116b3712178c78c2816c9272b1 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Wed, 18 Dec 2013 12:15:56 +0100 Subject: [PATCH 488/811] CP2K: reworked after remarks. --- ...tsvn.patch => CP2K-2.4.0-fix_compile_date_lastsvn.patch} | 0 easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb | 5 ++--- easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb | 6 +++--- ...fix.patch => CP2K-20131211-ifort-compiler-bug-fix.patch} | 0 easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) rename easybuild/easyconfigs/c/CP2K/{fix_compile_date_lastsvn.patch => CP2K-2.4.0-fix_compile_date_lastsvn.patch} (100%) rename easybuild/easyconfigs/c/CP2K/{ifort-compiler-bug-fix.patch => CP2K-20131211-ifort-compiler-bug-fix.patch} (100%) diff --git a/easybuild/easyconfigs/c/CP2K/fix_compile_date_lastsvn.patch b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-fix_compile_date_lastsvn.patch similarity index 100% rename from easybuild/easyconfigs/c/CP2K/fix_compile_date_lastsvn.patch rename to easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-fix_compile_date_lastsvn.patch diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb index b1ca163f20..ff604547cf 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb @@ -15,11 +15,10 @@ source_urls = [SOURCEFORGE_SOURCE] patches = [ 'do_regtest_nocompile.patch', - 'ifort-compiler-bug-fix.patch', - 'fix_compile_date_lastsvn.patch', + 'CP2K-20131211-ifort-compiler-bug-fix.patch', + 'CP2K-2.4.0-fix_compile_date_lastsvn.patch', ] -## use FFTW, with FFTACML there are extra failures in regtests dependencies = [ ('Libint', '1.1.4'), ('libxc', '2.0.1'), diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb index 61301c6ae4..1d06d1dfc9 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb @@ -10,14 +10,14 @@ classical pair and many-body potentials. """ toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'pic': True} +# Uses a svn checkout from 20131211 (r13439) sources = [SOURCE_TAR_BZ2] patches = [ - 'ifort-compiler-bug-fix.patch', - 'fix_compile_date_lastsvn.patch', + 'CP2K-20131211-ifort-compiler-bug-fix.patch', + 'CP2K-2.4.0-fix_compile_date_lastsvn.patch', ] -## use FFTW, with FFTACML there are extra failures in regtests dependencies = [ ('Libint', '1.1.4'), ('libxc', '2.0.1'), diff --git a/easybuild/easyconfigs/c/CP2K/ifort-compiler-bug-fix.patch b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ifort-compiler-bug-fix.patch similarity index 100% rename from easybuild/easyconfigs/c/CP2K/ifort-compiler-bug-fix.patch rename to easybuild/easyconfigs/c/CP2K/CP2K-20131211-ifort-compiler-bug-fix.patch diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb index 53b0b9a430..7b83d19f9b 100644 --- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb @@ -5,12 +5,12 @@ homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc' description = """Libxc is a library of exchange-correlation functionals for density-functional theory. The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals.""" -sources = [SOURCE_TAR_GZ] -source_urls = ['http://www.tddft.org/programs/octopus/down.php?file=libxc/'] - toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'opt': True} +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.tddft.org/programs/octopus/down.php?file=libxc/'] + configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="$F77 -E" --enable-shared' # From the libxc mailing list -- GitLab From c9853b0fd0a089a05911daf9d2ea0aa74afe5e94 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 20:35:43 +0100 Subject: [PATCH 489/811] various style and consistency fixes across Python easyconfigs, don't use icc patch for GCC-based builds --- .../Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb | 2 -- .../Python/Python-2.5.6-goolf-1.4.10-bare.eb | 2 -- .../p/Python/Python-2.7.3-cgmpolf-1.1.6.eb | 4 ++- .../Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb | 1 + .../p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 1 + .../p/Python/Python-2.7.3-gmvolf-1.7.12.eb | 1 + .../Python-2.7.3-goalf-1.1.0-no-OFED.eb | 1 + .../p/Python/Python-2.7.3-goolf-1.4.10.eb | 1 + .../p/Python/Python-2.7.3-ictce-4.0.6.eb | 1 + .../p/Python/Python-2.7.3-iomkl-4.6.13.eb | 4 +-- .../Python-2.7.5-goalf-1.5.12-no-OFED.eb | 2 -- .../p/Python/Python-2.7.5-goolf-1.4.10.eb | 3 --- .../p/Python/Python-2.7.5-ictce-4.1.13.eb | 3 ++- .../p/Python/Python-2.7.5-ictce-5.3.0.eb | 3 ++- .../p/Python/Python-2.7.5-ictce-5.5.0.eb | 5 ++-- .../p/Python/Python-2.7.5-iqacml-3.7.3.eb | 3 ++- .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 4 +-- .../Python-3.2.3-goalf-1.1.0-no-OFED.eb | 5 ++-- .../p/Python/Python-3.2.3-goolf-1.4.10.eb | 5 ++-- .../p/Python/Python-3.2.3-ictce-4.0.6.eb | 5 ++-- .../p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 -- .../python-2.7.6_libffi_int128_icc.patch | 27 ------------------- ...python-2.7_libffi-include-xmmintrin.patch} | 0 23 files changed, 30 insertions(+), 55 deletions(-) delete mode 100644 easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch rename easybuild/easyconfigs/p/Python/{libffi-3.0.13_include-xmmintrin.patch => python-2.7_libffi-include-xmmintrin.patch} (100%) diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb index 8831f1a81b..9ab4e226d2 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb @@ -11,8 +11,6 @@ toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python_libffi_int128_icc.patch'] - dependencies = [ ('bzip2', '1.0.6'), ('zlib', '1.2.7'), diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb index f626304d89..d72d837ddd 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb @@ -11,8 +11,6 @@ toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python_libffi_int128_icc.patch'] - dependencies = [ ('bzip2', '1.0.6'), ('zlib', '1.2.7'), diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb index 40021bd464..0964225cd4 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb @@ -19,7 +19,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), -]# order is important! +] + +# order is important! exts_list = [ ('setuptools', '0.6c11', { 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb index 84f064c627..2abbb4a82c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb @@ -20,6 +20,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index a38b2c3f31..10d8fa9b8f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -20,6 +20,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb index c89425f2de..fdfab00748 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb @@ -20,6 +20,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb index 1155745345..84035e978d 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb @@ -20,6 +20,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index 1f0a6d0a81..e19b57db63 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -20,6 +20,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb index 3b07a66bff..d9fb7984f4 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb @@ -22,6 +22,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb index 95ba9a38e7..ee9593c250 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb @@ -8,8 +8,7 @@ toolchain = {'name': 'iomkl', 'version': '4.6.13'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} numpyversion = '1.6.1' -scipyversion = '0.11.0' -pytablesversion = '2.4.0' +scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] @@ -23,6 +22,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ] + # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb index 2447f7bc5d..dc003dc8ce 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -13,8 +13,6 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] - # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index 7c65b339df..3d4ede9ed0 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -13,8 +13,6 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] - # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), @@ -23,7 +21,6 @@ dependencies = [ ('ncurses', '5.9'), ] - # order is important! exts_list = [ ('setuptools', '0.6c11', { diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index 214f9caf18..780f5d4768 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -13,7 +13,8 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['libffi-3.0.13_include-xmmintrin.patch'] +# libffi build in python is still broken, see http://bugs.python.org/issue4130 +patches = ['python-2.7_libffi-include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index 43582a47e8..59cc853852 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -13,7 +13,8 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['libffi-3.0.13_include-xmmintrin.patch'] +# libffi build in python is still broken, see http://bugs.python.org/issue4130 +patches = ['python-2.7_libffi-include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 9a2a8fbdbb..2632828fea 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -7,13 +7,14 @@ description = "Python is a programming language that lets you work more quickly toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} -numpyversion = '1.7.1' +numpyversion = '1.7.0' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['libffi-3.0.13_include-xmmintrin.patch'] +# libffi build in python is still broken, see http://bugs.python.org/issue4130 +patches = ['python-2.7_libffi-include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index a510ac66d6..81a392ff98 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -13,7 +13,8 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python-%(version)s_libffi_int128_icc.patch'] +# libffi build in python is still broken, see http://bugs.python.org/issue4130 +patches = ['python-2.7_libffi-include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index a621200714..a66adf51e6 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -14,9 +14,7 @@ source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] # libffi build in python is still broken, see http://bugs.python.org/issue4130 -patches = [ - 'libffi-3.0.13_include-xmmintrin.patch', -] +patches = ['python-2.7_libffi-include-xmmintrin.patch'] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index fb7852574b..ceea0be3dc 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -23,8 +23,9 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { - 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + ('distribute', '0.6.26', { + 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], + 'modulename': 'setuptools', }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index c42562dc72..525d37410a 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -23,8 +23,9 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { - 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + ('distribute', '0.6.26', { + 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], + 'modulename': 'setuptools', }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 9422982772..a56d8bfda5 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -23,8 +23,9 @@ dependencies = [ # order is important! exts_list = [ - ('setuptools', '1.4.1', { - 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + ('distribute', '0.6.26', { + 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], + 'modulename': 'setuptools', }), ('pip', '1.1', { 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 5153420960..0bd2f902ad 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -24,8 +24,6 @@ dependencies = [ # order is important! exts_list = [ - # This should actually be bumped to 'setuptools', '1.4.1' see - # https://github.com/hpcugent/easybuild-easyconfigs/pull/563#discussion-diff-8024693R27 ('distribute', '0.6.26', { 'source_urls': ['http://pypi.python.org/packages/source/d/distribute'], 'modulename': 'setuptools', diff --git a/easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch b/easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch deleted file mode 100644 index c639c75c09..0000000000 --- a/easybuild/easyconfigs/p/Python/python-2.7.6_libffi_int128_icc.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur Python-2.7.4.orig/Modules/_ctypes/libffi/src/x86/ffi64.c Python-2.7.4/Modules/_ctypes/libffi/src/x86/ffi64.c ---- Python-2.7.4.orig/Modules/_ctypes/libffi/src/x86/ffi64.c 2013-04-06 16:02:35.000000000 +0200 -+++ Python-2.7.4/Modules/_ctypes/libffi/src/x86/ffi64.c 2013-05-13 10:28:22.935090082 +0200 -@@ -56,6 +56,8 @@ - UINT128 i128; - }; - -+typedef struct { int64_t m[2]; } __int128_t; -+ - struct register_args - { - /* Registers for argument passing. */ -@@ -507,10 +509,12 @@ - break; - case X86_64_SSE_CLASS: - case X86_64_SSEDF_CLASS: -- reg_args->sse[ssecount++].i64 = *(UINT64 *) a; -+ reg_args->sse[ssecount++].m[0] = *(UINT64 *) a; -+ reg_args->sse[ssecount++].m[1] = 0; - break; - case X86_64_SSESF_CLASS: -- reg_args->sse[ssecount++].i32 = *(UINT32 *) a; -+ reg_args->sse[ssecount++].m[0] = *(UINT32 *) a; -+ reg_args->sse[ssecount++].m[1] = 0; - break; - default: - abort(); diff --git a/easybuild/easyconfigs/p/Python/libffi-3.0.13_include-xmmintrin.patch b/easybuild/easyconfigs/p/Python/python-2.7_libffi-include-xmmintrin.patch similarity index 100% rename from easybuild/easyconfigs/p/Python/libffi-3.0.13_include-xmmintrin.patch rename to easybuild/easyconfigs/p/Python/python-2.7_libffi-include-xmmintrin.patch -- GitLab From 2385ee7086c957b392e4eacbe53b72076ab9e128 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2013 22:42:31 +0100 Subject: [PATCH 490/811] paycheck is not compatible with Python 3.x --- .../easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb | 3 --- easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb | 3 --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 3 --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 3 --- 4 files changed, 12 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index ceea0be3dc..b87c0b57d2 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -45,9 +45,6 @@ exts_list = [ ('mpi4py', '1.3', { 'source_urls': ['https://mpi4py.googlecode.com/files/'], }), - ('paycheck', '1.0.2', { - 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], - }), ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index 525d37410a..f9770acdad 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -45,9 +45,6 @@ exts_list = [ ('mpi4py', '1.3', { 'source_urls': ['https://mpi4py.googlecode.com/files/'], }), - ('paycheck', '1.0.2', { - 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], - }), ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index a56d8bfda5..022930c2e7 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -45,9 +45,6 @@ exts_list = [ ('mpi4py', '1.3', { 'source_urls': ['https://mpi4py.googlecode.com/files/'], }), - ('paycheck', '1.0.2', { - 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], - }), ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 0bd2f902ad..b8f230e44e 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -46,9 +46,6 @@ exts_list = [ ('mpi4py', '1.3', { 'source_urls': ['https://mpi4py.googlecode.com/files/'], }), - ('paycheck', '1.0.2', { - 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], - }), ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), -- GitLab From 5411cdccbc8eaed7af1f772528fa0ae39debef70 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 08:50:37 +0100 Subject: [PATCH 491/811] remove patches for Python versions <= 2.7.3 with ictce 5.2.0 or up (incompatibility issue was fixed in Intel compilers) --- easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb | 2 -- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb | 2 -- easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb | 2 -- 3 files changed, 6 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb index 5defdd9ca7..6f70a20147 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb @@ -11,8 +11,6 @@ toolchainopts = {'pic': True, 'opt': True, 'optarch': True} source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python_libffi_int128_icc.patch'] - dependencies = [ ('bzip2', '1.0.6'), ('zlib', '1.2.7'), diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb index 9250403c43..4da1f6b6ef 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb @@ -13,8 +13,6 @@ scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python_libffi_int128_icc.patch'] - # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb index 17649568df..6f098b9e79 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb @@ -13,8 +13,6 @@ scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = ['%(name)s-%(version)s.tgz'] -patches = ['python_libffi_int128_icc.patch'] - # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), -- GitLab From 1a39df304c30af6d966d27b845a2c9679ebc6f5c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 08:55:05 +0100 Subject: [PATCH 492/811] add easyconfig for Python 2.7.6 with goolf --- .../p/Python/Python-2.7.6-goolf-1.4.10.eb | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb new file mode 100644 index 0000000000..28d55c2c9b --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb @@ -0,0 +1,82 @@ +name = 'Python' +version = '2.7.6' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.8.0' +scipyversion = '0.13.1' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.4.2', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('pip', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s-mkl.patch' % numpyversion, + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3.1', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.2', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.2', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), +] + +moduleclass = 'lang' -- GitLab From 628bf0997be84d7fc4fcd0db7f227e7866c6d42c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 09:28:54 +0100 Subject: [PATCH 493/811] call set_tmpdir so tempfile is initialized like in an actual eb run --- test/easyconfigs/easyconfigs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 3925e6ada3..b729fca376 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -60,6 +60,7 @@ class EasyConfigTest(TestCase): # initialize configuration (required for e.g. default modules_tool setting) eb_go = eboptions.parse_options() config.init(eb_go.options, eb_go.get_options_by_section('config')) + config.set_tmpdir() del eb_go log = fancylogger.getLogger("EasyConfigTest", fname=False) -- GitLab From c87579caf8f4f3e56681ed81283d618c319f4080 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 09:29:58 +0100 Subject: [PATCH 494/811] minor style fixes in numpy 1.6.2 goolf easyconfig --- .../n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb index 8106dc54bf..a018a5b44d 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb @@ -7,12 +7,13 @@ a powerful N-dimensional array object, sophisticated (broadcasting) functions, t code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses, NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] sources = [SOURCE_TAR_GZ] -patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] +patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch'] python = 'Python' pyver = '2.7.3' -- GitLab From f6f22a13550903cc550ce35788112404861fa0be Mon Sep 17 00:00:00 2001 From: pescobar Date: Thu, 19 Dec 2013 10:47:38 +0100 Subject: [PATCH 495/811] VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb --- ...CFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb new file mode 100644 index 0000000000..3bf776b509 --- /dev/null +++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb @@ -0,0 +1,38 @@ +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'VCFtools' +version = '0.1.11' + +easyblock = 'MakeCp' + +homepage = "http://vcftools.sourceforge.net/" +description = """The aim of VCFtools is to provide methods for working with VCF files: validating, merging, comparing and calculate some basic population genetic statistics. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%(namelower)s_%(version)s.tar.gz'] + +perl = 'Perl' +perlver = '5.16.3' +versionsuffix = '-%s-%s' % (perl, perlver) +dependencies = [ + (perl, perlver), +] + +files_to_copy = ["bin","lib"] + +modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'} + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in [ + 'vcftools', 'vcf-sort', 'vcf-stats', + ] + ], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From d45a7aef06f60eda9feeba6c560f3d7bd64328fc Mon Sep 17 00:00:00 2001 From: pescobar Date: Thu, 19 Dec 2013 10:51:35 +0100 Subject: [PATCH 496/811] fixed indentation in vcftools eb file --- .../v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb index 3bf776b509..6f90845017 100644 --- a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb @@ -8,7 +8,10 @@ version = '0.1.11' easyblock = 'MakeCp' homepage = "http://vcftools.sourceforge.net/" -description = """The aim of VCFtools is to provide methods for working with VCF files: validating, merging, comparing and calculate some basic population genetic statistics. """ +description = """The aim of VCFtools is to provide + methods for working with VCF files: validating, + merging, comparing and calculate some basic population + genetic statistics. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} -- GitLab From ed95ea0abf2549f7ab6c840cfb39dca0af82f5a4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 11:20:36 +0100 Subject: [PATCH 497/811] add goolf easyconfigs for numpy v1.7.1 and scipy v1.13.0 --- .../numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb | 26 +++ ...py-1.7.1_distutils_multiple-lib-dirs.patch | 202 ++++++++++++++++++ .../scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb | 19 ++ 3 files changed, 247 insertions(+) create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb create mode 100644 easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch create mode 100644 easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..a02cfbdf02 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,26 @@ +name = 'numpy' +version = '1.7.1' + +homepage = 'http://www.numpy.org' +description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things: +a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran +code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses, +NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be +defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +sources = [SOURCE_TAR_GZ] + +patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch'] + +python = 'Python' +pyver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), +] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch b/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch new file mode 100644 index 0000000000..12501c6754 --- /dev/null +++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch @@ -0,0 +1,202 @@ +diff -ru numpy-1.7.0.orig/numpy/distutils/fcompiler/__init__.py numpy-1.7.0/numpy/distutils/fcompiler/__init__.py +--- numpy-1.7.0.orig/numpy/distutils/fcompiler/__init__.py 2013-02-09 22:04:55.000000000 +0100 ++++ numpy-1.7.0/numpy/distutils/fcompiler/__init__.py 2013-05-13 10:40:59.806346107 +0200 +@@ -626,7 +626,11 @@ + return options + + def library_option(self, lib): +- return "-l" + lib ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib ++ + def library_dir_option(self, dir): + return "-L" + dir + +diff -ru numpy-1.7.0.orig/numpy/distutils/system_info.py numpy-1.7.0/numpy/distutils/system_info.py +--- numpy-1.7.0.orig/numpy/distutils/system_info.py 2013-02-09 22:04:56.000000000 +0100 ++++ numpy-1.7.0/numpy/distutils/system_info.py 2013-05-13 10:48:49.063599772 +0200 +@@ -588,7 +588,7 @@ + if is_string(default): + return [default] + return default +- return [b for b in [a.strip() for a in libs.split(',')] if b] ++ return [b for b in [a.strip().replace(':',',') for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): + return self.get_libs(key, '') +@@ -630,6 +630,23 @@ + lib_dirs) + return info + ++ def check_libs_all(self,lib_dir,libs,opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks for all libraries as shared libraries first, then ++ static (or vice versa if self.search_static_first is True). ++ """ ++ exts = self.library_extensions() ++ info = None ++ for ext in exts: ++ info = self._check_libs_all(lib_dir,libs,opt_libs,[ext]) ++ if info is not None: ++ break ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), lib_dir) ++ return info ++ + def check_libs2(self, lib_dirs, libs, opt_libs=[]): + """If static or shared libraries are available then return + their info dictionary. +@@ -643,6 +660,18 @@ + lib_dirs) + return info + ++ def check_libs2_all(self, lib_dirs, libs, opt_libs =[]): ++ """If static or shared libraries are available then return ++ their info dictionary. ++ ++ Checks each library for shared or static. ++ """ ++ exts = self.library_extensions() ++ info = self._check_libs_all(lib_dirs,libs,opt_libs,exts) ++ if not info: ++ log.info(' libraries %s not found in %s', ','.join(libs), os.pathsep.join(lib_dirs)) ++ return info ++ + def _lib_list(self, lib_dir, libs, exts): + assert is_string(lib_dir) + liblist = [] +@@ -653,6 +682,9 @@ + lib_prefixes = ['lib'] + # for each library name, see if we can find a file for it. + for l in libs: ++ if l[0]=='-': ++ liblist.append(l) ++ continue + for ext in exts: + for prefix in lib_prefixes: + p = self.combine_paths(lib_dir, prefix + l + ext) +@@ -668,6 +700,19 @@ + break + return liblist + ++ def _lib_list_all(self, lib_dirs, libs, exts): ++ assert (type(lib_dirs)==list) ++ if lib_dirs: ++ assert is_string(lib_dirs[0]) ++ liblist=[] ++ for lib_dir in lib_dirs: ++ ls=self._lib_list(lib_dir,libs,exts) ++ for l in ls: ++ log.info("(_lib_list_all) Found %s in %s"%(l,lib_dir)) ++ if l not in liblist: ++ liblist.append(l) ++ return liblist ++ + def _check_libs(self, lib_dirs, libs, opt_libs, exts): + """Find mandatory and optional libs in expected paths. + +@@ -709,6 +754,22 @@ + else: + return None + ++ def _check_libs_all(self, lib_dirs, libs, opt_libs, exts): ++ found_libs_unordered = self._lib_list_all(lib_dirs, libs, exts) ++ # ensure same order as in lib_dirs ++ found_libs = [] ++ for lib_dir in libs: ++ if lib_dir in found_libs_unordered: ++ found_libs.append(lib_dir) ++ if len(found_libs) == len(libs): ++ info = {'libraries' : found_libs, 'library_dirs' : lib_dirs} ++ opt_found_libs = self._lib_list_all(lib_dirs, opt_libs, exts) ++ if len(opt_found_libs) == len(opt_libs): ++ info['libraries'].extend(opt_found_libs) ++ return info ++ else: ++ return ++ + def combine_paths(self, *args): + """Return a list of existing paths composed by all combinations + of items from the arguments. +@@ -944,7 +1005,7 @@ + lib_dirs = self.get_lib_dirs() + incl_dirs = self.get_include_dirs() + mkl_libs = self.get_libs('mkl_libs', self._lib_mkl) +- info = self.check_libs2(lib_dirs, mkl_libs) ++ info = self.check_libs2_all(lib_dirs, mkl_libs) + if info is None: + return + dict_append(info, +@@ -1008,16 +1069,13 @@ + atlas = None + lapack = None + atlas_1 = None +- for d in lib_dirs: +- atlas = self.check_libs2(d, atlas_libs, []) +- lapack_atlas = self.check_libs2(d, ['lapack_atlas'], []) +- if atlas is not None: +- lib_dirs2 = [d] + self.combine_paths(d, ['atlas*', 'ATLAS*']) +- lapack = self.check_libs2(lib_dirs2, lapack_libs, []) +- if lapack is not None: +- break +- if atlas: +- atlas_1 = atlas ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs) ++ lapack_atlas = self.check_libs2_all(lib_dirs, ['lapack_atlas']) ++ if atlas is not None: ++ lib_dirs2 = lib_dirs + self.combine_paths(lib_dirs,['atlas*','ATLAS*']) ++ lapack = self.check_libs2_all(lib_dirs2, lapack_libs) ++ if atlas: ++ atlas_1 = atlas + log.info(self.__class__) + if atlas is None: + atlas = atlas_1 +@@ -1096,7 +1154,7 @@ + info = {} + atlas_libs = self.get_libs('atlas_libs', + self._lib_names + self._lib_atlas) +- atlas = self.check_libs2(lib_dirs, atlas_libs, []) ++ atlas = self.check_libs2_all(lib_dirs, atlas_libs, []) + if atlas is None: + return + include_dirs = self.get_include_dirs() +@@ -1144,7 +1202,7 @@ + lib_dirs = self.get_lib_dirs() + + lapack_libs = self.get_libs('lapack_libs', self._lib_names) +- info = self.check_libs(lib_dirs, lapack_libs, []) ++ info = self.check_libs_all(lib_dirs, lapack_libs, []) + if info is None: + return + info['language'] = 'f77' +@@ -1521,7 +1579,7 @@ + lib_dirs = self.get_lib_dirs() + + blas_libs = self.get_libs('blas_libs', self._lib_names) +- info = self.check_libs(lib_dirs, blas_libs, []) ++ info = self.check_libs_all(lib_dirs, blas_libs, []) + if info is None: + return + info['language'] = 'f77' # XXX: is it generally true? +Only in numpy-1.7.0/numpy/distutils: system_info.py.orig +Only in numpy-1.7.0/numpy/distutils: system_info.py.rej +diff -ru numpy-1.7.0.orig/numpy/distutils/unixccompiler.py numpy-1.7.0/numpy/distutils/unixccompiler.py +--- numpy-1.7.0.orig/numpy/distutils/unixccompiler.py 2013-02-09 22:04:55.000000000 +0100 ++++ numpy-1.7.0/numpy/distutils/unixccompiler.py 2013-05-13 10:40:59.833592000 +0200 +@@ -109,3 +109,12 @@ + + replace_method(UnixCCompiler, 'create_static_lib', + UnixCCompiler_create_static_lib) ++ ++def UnixCCompiler_library_option(self, lib): ++ if lib[0]=='-': ++ return lib ++ else: ++ return "-l" + lib ++ ++replace_method(UnixCCompiler, 'library_option', ++ UnixCCompiler_library_option) diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb new file mode 100644 index 0000000000..a1047f4733 --- /dev/null +++ b/easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb @@ -0,0 +1,19 @@ +name = 'scipy' +version = '0.13.0' +versionsuffix = '-Python-2.7.3' + +homepage = 'http://www.scipy.org' +description = """SciPy is a collection of mathematical algorithms and convenience + functions built on the Numpy extension for Python.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True} + +source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')] +sources = [SOURCE_TAR_GZ] + +dependencies = [ + ('numpy', '1.7.1', versionsuffix), +] + +moduleclass = 'math' -- GitLab From 68b078518030bbc72aa6707546ad403684392cc2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 14:23:26 +0100 Subject: [PATCH 498/811] remove XML-LibXML and XML-Simple easyconfigs, build doesn't work --- ...L-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb | 25 ------------------- ...XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb | 25 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb delete mode 100644 easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb diff --git a/easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb deleted file mode 100644 index f91b2703dc..0000000000 --- a/easybuild/easyconfigs/x/XML/XML-LibXML-2.0018-ictce-5.3.0-Perl-5.16.3.eb +++ /dev/null @@ -1,25 +0,0 @@ -easyblock = 'PerlModule' - -name = 'XML-LibXML' -version = '2.0018' - -homepage = 'http://search.cpan.org/src/SHLOMIF/XML-LibXML-2.0018/' -description = """Perl binding for libxml2""" - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - -source_urls = ['http://www.cpan.org/modules/by-module/XML/SHLOMIF/'] -sources = [SOURCE_TAR_GZ] - -perl = 'Perl' -perlver = '5.16.3' -versionsuffix = '-%s-%s' % (perl, perlver) - -dependencies = [ - (perl, perlver), - ("libxml2", "2.9.0"), -] - -options = {'modulename': 'XML::LibXML'} - -moduleclass = 'data' diff --git a/easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb deleted file mode 100644 index e61280523c..0000000000 --- a/easybuild/easyconfigs/x/XML/XML-Simple-2.20-ictce-5.3.0-Perl-5.16.3.eb +++ /dev/null @@ -1,25 +0,0 @@ -easyblock = 'PerlModule' - -name = 'XML-Simple' -version = '2.20' - -homepage = 'http://search.cpan.org/src/GRANTM/XML-Simple-2.20/' -description = """Easily read/write XML in Perl""" - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - -source_urls = ['http://www.cpan.org/modules/by-module/XML/GRANTM/'] -sources = [SOURCE_TAR_GZ] - -perl = 'Perl' -perlver = '5.16.3' -versionsuffix = '-%s-%s' % (perl, perlver) - -dependencies = [ - (perl, perlver), - ("XML-LibXML", "2.0018", versionsuffix), -] - -options = {'modulename': 'XML::Simple'} - -moduleclass = 'data' -- GitLab From 08621517c4b42bea17227593c85e20457a7879ef Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 19 Dec 2013 15:15:40 +0100 Subject: [PATCH 499/811] remove Qt easyconfig, build seems broken --- .../easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb deleted file mode 100644 index e712e4c5a2..0000000000 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-5.3.0.eb +++ /dev/null @@ -1,20 +0,0 @@ -name = 'Qt' -version = '4.8.5' - -homepage = 'http://qt-project.org/' -description = "Qt is a comprehensive cross-platform C++ application framework." - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - -source_urls = ['http://download.qt-project.org/official_releases/qt/4.8/4.8.5/'] -sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] - -dependencies = [('GLib', '2.34.3')] - -configopts="-confirm-license -opensource -silent" - -sanity_check_paths = { - 'files': ['lib/libQtCore.so'], - 'dirs': [], -} -moduleclass = 'devel' -- GitLab From 461e6cd654eaf35585c8532788ccd6ea10acb7e4 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 20 Dec 2013 11:16:17 +0100 Subject: [PATCH 500/811] small style changes --- .../v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb index 6f90845017..a5053fd3e9 100644 --- a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb @@ -26,15 +26,12 @@ dependencies = [ (perl, perlver), ] -files_to_copy = ["bin","lib"] +files_to_copy = ["bin", "lib"] modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'} sanity_check_paths = { - 'files': ['bin/%s' % x for x in [ - 'vcftools', 'vcf-sort', 'vcf-stats', - ] - ], + 'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']], 'dirs': [], } -- GitLab From 5b9e9771fbebbd968f0bc878d3c8d1e61106417d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 20 Dec 2013 20:15:16 +0100 Subject: [PATCH 501/811] use '-seq' versionsuffix for existing GROMACS easyconfigs and explicitely disable OpenMPI and MPI support, and -mt, -mpi and -hybrid variants (that work) --- ...10.eb => GROMACS-4.6.1-goolf-1.4.10-mt.eb} | 27 +++++-------- .../GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb | 38 +++++++++++++++++++ ...2.eb => GROMACS-4.6.1-goolfc-1.3.12-mt.eb} | 23 +++++------ .../GROMACS-4.6.1-goolfc-1.3.12-seq.eb | 38 +++++++++++++++++++ .../GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb | 38 +++++++++++++++++++ .../GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb | 38 +++++++++++++++++++ ...0.eb => GROMACS-4.6.5-goolfc-2.6.10-mt.eb} | 20 +++++----- .../GROMACS-4.6.5-goolfc-2.6.10-seq.eb | 38 +++++++++++++++++++ ...eb => GROMACS-4.6.5-ictce-5.5.0-hybrid.eb} | 26 ++++--------- .../GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb | 38 +++++++++++++++++++ .../g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb | 38 +++++++++++++++++++ .../GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb | 38 +++++++++++++++++++ .../g/GSL/GSL-1.15-goolf-1.4.10.eb | 1 + .../easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb | 1 - .../g/GSL/GSL-1.16-goolf-1.4.10.eb | 16 ++++++++ .../g/GSL/GSL-1.16-goolfc-1.3.12.eb | 16 ++++++++ .../g/GSL/GSL-1.16-goolfc-2.6.10.eb | 16 ++++++++ 17 files changed, 387 insertions(+), 63 deletions(-) rename easybuild/easyconfigs/g/GROMACS/{GROMACS-4.6.1-goolf-1.4.10.eb => GROMACS-4.6.1-goolf-1.4.10-mt.eb} (67%) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb rename easybuild/easyconfigs/g/GROMACS/{GROMACS-4.6.1-goolfc-1.3.12.eb => GROMACS-4.6.1-goolfc-1.3.12-mt.eb} (75%) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb rename easybuild/easyconfigs/g/GROMACS/{GROMACS-4.6.5-goolfc-2.6.10.eb => GROMACS-4.6.5-goolfc-2.6.10-mt.eb} (82%) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb rename easybuild/easyconfigs/g/GROMACS/{GROMACS-4.6.5-ictce-5.5.0.eb => GROMACS-4.6.5-ictce-5.5.0-hybrid.eb} (62%) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb create mode 100644 easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb create mode 100644 easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb similarity index 67% rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb index 02fb60a067..f4e21dcbfc 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb @@ -10,38 +10,29 @@ # This work implements a part of the HPCBIOS project and is a component of the policy: # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html ## - -easyblock = 'CMakeMake' - name = 'GROMACS' version = '4.6.1' +versionsuffix = '-mt' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'usempi': True} +toolchainopts = {'openmp': True, 'usempi': False} # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] source_urls = [ 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources 'http://gerrit.gromacs.org/download/', # regression tests sources ] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] -builddependencies = [('CMake', '2.8.4')] - -configopts = '-DGMX_EXTERNAL_BLAS=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_MPI=ON -DGMX_X11=OFF ' - -# explicitely disable CUDA support, i.e. avoid that GROMACS find and uses a system-wide CUDA compiler -# CUDA and GCC v4.7 don't play well together -configopts += ' -DGMX_GPU=OFF' +dependencies = [('GSL', '1.16')] -configopts += "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" -runtest = 'check' +builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb new file mode 100644 index 0000000000..08aece5c97 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.1' +versionsuffix = '-seq' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'openmp': False, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb similarity index 75% rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb index 256c0d975a..9d83bacb7b 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb @@ -10,34 +10,29 @@ # This work implements a part of the HPCBIOS project and is a component of the policy: # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html ## - -easyblock = 'CMakeMake' - name = 'GROMACS' version = '4.6.1' +versionsuffix = '-mt' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" toolchain = {'name': 'goolfc', 'version': '1.3.12'} -toolchainopts = {'usempi': True} +toolchainopts = {'openmp': True, 'usempi': False} # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] source_urls = [ 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources 'http://gerrit.gromacs.org/download/', # regression tests sources ] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] -builddependencies = [('CMake', '2.8.4')] - -configopts = '-DGMX_EXTERNAL_BLAS=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_MPI=ON -DGMX_X11=OFF ' +dependencies = [('GSL', '1.16')] -configopts += "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" -runtest = 'check' +builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb new file mode 100644 index 0000000000..5a0b2360e9 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.1' +versionsuffix = '-seq' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolfc', 'version': '1.3.12'} +toolchainopts = {'openmp': False, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb new file mode 100644 index 0000000000..4cfd2d6698 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'openmp': True, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb new file mode 100644 index 0000000000..7b464a0529 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'openmp': False, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb similarity index 82% rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10.eb rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb index 5c6e6ac80d..651f7be69d 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb @@ -10,31 +10,29 @@ # This work implements a part of the HPCBIOS project and is a component of the policy: # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html ## - -easyblock = 'CMakeMake' - name = 'GROMACS' version = '4.6.5' +versionsuffix = '-mt' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" toolchain = {'name': 'goolfc', 'version': '2.6.10'} +toolchainopts = {'openmp': True, 'usempi': False} # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] source_urls = [ 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources 'http://gerrit.gromacs.org/download/', # regression tests sources ] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] -builddependencies = [('CMake', '2.8.4')] +dependencies = [('GSL', '1.16')] -configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'" -runtest = 'check' +builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb new file mode 100644 index 0000000000..63c1d1b695 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-seq' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} +toolchainopts = {'openmp': False, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb similarity index 62% rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb index 3e5a3d3c07..6b7c7754fa 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb @@ -10,41 +10,29 @@ # This work implements a part of the HPCBIOS project and is a component of the policy: # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html ## - -easyblock = 'CMakeMake' - name = 'GROMACS' version = '4.6.5' +versionsuffix = '-hybrid' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'usempi': True} +toolchainopts = {'openmp': True, 'usempi': True} # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] source_urls = [ 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources 'http://gerrit.gromacs.org/download/', # regression tests sources ] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] dependencies = [('GSL', '1.16')] builddependencies = [('CMake', '2.8.12')] -configopts = '-DGMX_FFT_LIBRARY=mkl -DMKL_INCLUDE_DIR="$EBROOTMKL/mkl/include" ' -configopts += '-DMKL_LIBRARIES="$EBROOTMKL/mkl/lib/intel64/libmkl.a;$EBROOTMKL/mkl/lib/intel64/libmkl_lapack.a" ' -configopts += '-DGMX_EXTERNAL_BLAS=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_MPI=ON -DGMX_X11=OFF ' - -# explicitely disable CUDA support, i.e. avoid that GROMACS find and uses a system-wide CUDA compiler -configopts += '-DGMX_GPU=OFF ' - -configopts += '-DREGRESSIONTEST_PATH="%(builddir)s/regressiontests-%(version)s" ' -runtest = 'check' - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb new file mode 100644 index 0000000000..e3aec07320 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-mpi' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'openmp': False, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb new file mode 100644 index 0000000000..12cb6865b7 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-mt' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'openmp': True, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb new file mode 100644 index 0000000000..15d5a0a5a9 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-seq' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'openmp': False, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb index fe17508924..f42e966bda 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb @@ -4,6 +4,7 @@ version = '1.15' homepage = 'http://www.gnu.org/software/gsl/' description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb index 46fb6c2c19..455dbe52ed 100644 --- a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb @@ -5,7 +5,6 @@ homepage = 'http://www.gnu.org/software/gsl/' description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb new file mode 100644 index 0000000000..2d05bc4775 --- /dev/null +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb @@ -0,0 +1,16 @@ +name = 'GSL' +version = '1.16' + +homepage = 'http://www.gnu.org/software/gsl/' +description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. +The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/gsl/'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb new file mode 100644 index 0000000000..c792614359 --- /dev/null +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb @@ -0,0 +1,16 @@ +name = 'GSL' +version = '1.16' + +homepage = 'http://www.gnu.org/software/gsl/' +description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. +The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" + +toolchain = {'name': 'goolfc', 'version': '1.3.12'} +toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/gsl/'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb new file mode 100644 index 0000000000..db182f74d8 --- /dev/null +++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb @@ -0,0 +1,16 @@ +name = 'GSL' +version = '1.16' + +homepage = 'http://www.gnu.org/software/gsl/' +description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. +The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} +toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True} + +source_urls = ['http://ftpmirror.gnu.org/gsl/'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +moduleclass = 'numlib' -- GitLab From b7cfde0e375ac2d99567e525bf91f1b450adbc1d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 20 Dec 2013 20:32:22 +0100 Subject: [PATCH 502/811] add missing CMake easyconfig as build dep for GROMACS --- .../c/CMake/CMake-2.8.12-goolf-1.4.10.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb new file mode 100644 index 0000000000..0eb9ee7abd --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From e0438a1c3f60dd3fd998ec22595cd72af63c1e57 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 11:22:45 +0100 Subject: [PATCH 503/811] fix versionsuffix for GROMACS goolf -mt easyconfig --- .../easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb index 4cfd2d6698..79cf87d0ba 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb @@ -12,7 +12,7 @@ ## name = 'GROMACS' version = '4.6.5' -versionsuffix = '-hybrid' +versionsuffix = '-mt' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, -- GitLab From db0aeace94779c081350c79971936232551ba1eb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 11:27:00 +0100 Subject: [PATCH 504/811] remove -seq and -mpi variants, -mt and -hybrid will do --- .../GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb | 38 ------------------- .../GROMACS-4.6.1-goolfc-1.3.12-seq.eb | 38 ------------------- .../GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb | 38 ------------------- .../GROMACS-4.6.5-goolfc-2.6.10-seq.eb | 38 ------------------- .../GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb | 38 ------------------- .../GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb | 38 ------------------- 6 files changed, 228 deletions(-) delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb delete mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb deleted file mode 100644 index 08aece5c97..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-seq.eb +++ /dev/null @@ -1,38 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## -name = 'GROMACS' -version = '4.6.1' -versionsuffix = '-seq' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'openmp': False, 'usempi': False} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] - -dependencies = [('GSL', '1.16')] - -builddependencies = [('CMake', '2.8.4')] - -moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb deleted file mode 100644 index 5a0b2360e9..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-seq.eb +++ /dev/null @@ -1,38 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## -name = 'GROMACS' -version = '4.6.1' -versionsuffix = '-seq' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'goolfc', 'version': '1.3.12'} -toolchainopts = {'openmp': False, 'usempi': False} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] - -dependencies = [('GSL', '1.16')] - -builddependencies = [('CMake', '2.8.4')] - -moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb deleted file mode 100644 index 7b464a0529..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-seq.eb +++ /dev/null @@ -1,38 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## -name = 'GROMACS' -version = '4.6.5' -versionsuffix = '-hybrid' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'openmp': False, 'usempi': False} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] - -dependencies = [('GSL', '1.16')] - -builddependencies = [('CMake', '2.8.12')] - -moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb deleted file mode 100644 index 63c1d1b695..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-seq.eb +++ /dev/null @@ -1,38 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## -name = 'GROMACS' -version = '4.6.5' -versionsuffix = '-seq' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'goolfc', 'version': '2.6.10'} -toolchainopts = {'openmp': False, 'usempi': False} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] - -dependencies = [('GSL', '1.16')] - -builddependencies = [('CMake', '2.8.4')] - -moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb deleted file mode 100644 index e3aec07320..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mpi.eb +++ /dev/null @@ -1,38 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## -name = 'GROMACS' -version = '4.6.5' -versionsuffix = '-mpi' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'openmp': False, 'usempi': True} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] - -dependencies = [('GSL', '1.16')] - -builddependencies = [('CMake', '2.8.12')] - -moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb deleted file mode 100644 index 15d5a0a5a9..0000000000 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-seq.eb +++ /dev/null @@ -1,38 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University -# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ -# George Tsouloupas , Kenneth Hoste -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html -## -name = 'GROMACS' -version = '4.6.5' -versionsuffix = '-seq' - -homepage = 'http://www.gromacs.org' -description = """GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" - -toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'openmp': False, 'usempi': False} - -# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz -source_urls = [ - 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources - 'http://gerrit.gromacs.org/download/', # regression tests sources -] -sources = [ - SOURCELOWER_TAR_GZ, - 'regressiontests-%(version)s.tar.gz', -] - -dependencies = [('GSL', '1.16')] - -builddependencies = [('CMake', '2.8.12')] - -moduleclass = 'bio' -- GitLab From 88634a3b3d0a7f8c402fad3adadcb95201fd9d46 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 11:30:32 +0100 Subject: [PATCH 505/811] add GROMACS easyconfigs for various toolchains, both -mt and -hybrid versions --- .../GROMACS-4.6.1-goolf-1.4.10-hybrid.eb | 38 +++++++++++++++++ .../GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb | 38 +++++++++++++++++ .../GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb | 41 +++++++++++++++++++ .../GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb | 41 +++++++++++++++++++ .../GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb | 41 +++++++++++++++++++ .../GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb | 41 +++++++++++++++++++ ...ROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb | 38 +++++++++++++++++ .../GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb | 38 +++++++++++++++++ .../GROMACS-4.6.5-goolf-1.4.10-hybrid.eb | 41 +++++++++++++++++++ .../GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb | 40 ++++++++++++++++++ 10 files changed, 397 insertions(+) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb new file mode 100644 index 0000000000..a57097dec7 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.1' +versionsuffix = '-hyrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb new file mode 100644 index 0000000000..4c518648ee --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.1' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolfc', 'version': '1.3.12'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb new file mode 100644 index 0000000000..b14c93b641 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb @@ -0,0 +1,41 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +#configopts = "-DGMX_TEST_NUMBER_PROCS=1" +#parallel = 1 + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb new file mode 100644 index 0000000000..65217db71e --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb @@ -0,0 +1,41 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-mt' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'openmp': True, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +#configopts = "-DGMX_TEST_NUMBER_PROCS=1" +#parallel = 1 + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb new file mode 100644 index 0000000000..b3862d7bc7 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb @@ -0,0 +1,41 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'gmvolf', 'version': '1.7.12'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +#configopts = "-DGMX_TEST_NUMBER_PROCS=1" +#parallel = 1 + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb new file mode 100644 index 0000000000..f2d0ddfb74 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb @@ -0,0 +1,41 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-mt' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'gmvolf', 'version': '1.7.12'} +toolchainopts = {'openmp': True, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +#configopts = "-DGMX_TEST_NUMBER_PROCS=1" +#parallel = 1 + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb new file mode 100644 index 0000000000..538c0a560c --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb new file mode 100644 index 0000000000..ed12feb1c9 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-mt' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'openmp': True, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb new file mode 100644 index 0000000000..c23c74d646 --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb @@ -0,0 +1,41 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +#configopts = "-DGMX_TEST_NUMBER_PROCS=1" +parallel = 1 + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb new file mode 100644 index 0000000000..21eb75235b --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb @@ -0,0 +1,40 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.5' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +#dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.12')] + +configopts = "-DGMX_TEST_NUMBER_PROCS=16" + +moduleclass = 'bio' -- GitLab From 1ee222f13de31a4aa773b047e76d02411e0b6b2a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 11:45:46 +0100 Subject: [PATCH 506/811] fix typo --- .../easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb index a57097dec7..39b40704bf 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb @@ -12,7 +12,7 @@ ## name = 'GROMACS' version = '4.6.1' -versionsuffix = '-hyrid' +versionsuffix = '-hybrid' homepage = 'http://www.gromacs.org' description = """GROMACS is a versatile package to perform molecular dynamics, -- GitLab From afefc373af0f78e2b4d09c591b94892fc1d071d4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 11:46:06 +0100 Subject: [PATCH 507/811] add ictce/5.3.0 easyconfigs for GROMACS v4.6.1 --- .../GROMACS-4.6.1-ictce-5.3.0-hybrid.eb | 38 +++++++++++++++++++ .../g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb | 38 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb create mode 100644 easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb new file mode 100644 index 0000000000..2950040b1b --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.1' +versionsuffix = '-hybrid' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'openmp': True, 'usempi': True} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb new file mode 100644 index 0000000000..964c5c848d --- /dev/null +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb @@ -0,0 +1,38 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University +# Authors:: Wiktor Jurkowski , Fotis Georgatos , \ +# George Tsouloupas , Kenneth Hoste +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html +## +name = 'GROMACS' +version = '4.6.1' +versionsuffix = '-mt' + +homepage = 'http://www.gromacs.org' +description = """GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles.""" + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'openmp': True, 'usempi': False} + +# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz +source_urls = [ + 'ftp://ftp.gromacs.org/pub/gromacs/', # GROMACS sources + 'http://gerrit.gromacs.org/download/', # regression tests sources +] +sources = [ + SOURCELOWER_TAR_GZ, + 'regressiontests-%(version)s.tar.gz', +] + +dependencies = [('GSL', '1.16')] + +builddependencies = [('CMake', '2.8.4')] + +moduleclass = 'bio' -- GitLab From c1591e72c39aec02a901f257b6f23e7fc3d6f85a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 11:46:17 +0100 Subject: [PATCH 508/811] fix HPCBIOS GROMACS entries --- .../h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb | 2 +- .../h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb | 2 +- .../HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb | 2 +- .../HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb index 1a2ccc532c..86ef1ed180 100644 --- a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb @@ -41,7 +41,7 @@ dependencies = [ ('FASTX-Toolkit', '0.0.13.2'), ('FSL', '4.1.9'), ('GLIMMER', '3.02b'), - ('GROMACS', '4.6.1'), + ('GROMACS', '4.6.1', '-hybrid'), ('HH-suite', '2.0.16'), ('HMMER', '3.0'), ('Infernal', '1.1rc1'), diff --git a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb index 1d4aeb5a5a..a7271f599b 100644 --- a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb @@ -41,7 +41,7 @@ dependencies = [ ('FASTX-Toolkit', '0.0.13.2'), ('FSL', '4.1.9'), ('GLIMMER', '3.02b'), -# ('GROMACS', '4.6.1'), + ('GROMACS', '4.6.1', '-hybrid'), ('HMMER', '3.0'), # ('HH-suite', '2.0.16'), ('Infernal', '1.1rc1'), diff --git a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb index d087f2d6bd..8b2a4995ff 100644 --- a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb @@ -27,7 +27,7 @@ dependencies = [ ('BLAST', '2.2.28', '-Python-2.7.3'), ('BWA', '0.6.2'), ('ClustalW2', '2.1'), - ('GROMACS', '4.6.1'), + ('GROMACS', '4.6.1', '-hybrid'), ('HMMER', '3.0'), ('MrBayes', '3.1.2'), ('mpiBLAST', '1.6.0'), diff --git a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb index 1ea5f64544..dc22e82ed1 100644 --- a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb @@ -27,7 +27,7 @@ dependencies = [ ('BLAST', '2.2.28', '-Python-2.7.3'), ('BWA', '0.6.2'), ('ClustalW2', '2.1'), -# ('GROMACS', '4.6.1'), + ('GROMACS', '4.6.1', '-hybrid'), ('HMMER', '3.0'), ('MrBayes', '3.1.2'), ('mpiBLAST', '1.6.0'), -- GitLab From 45992aaee94a429c961a07ad0007a8eab2443d16 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 21 Dec 2013 12:48:53 +0100 Subject: [PATCH 509/811] fix permissions for impi-3.2.2.006.eb Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb diff --git a/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb old mode 100755 new mode 100644 -- GitLab From 227fa6212979aa392c1bbface00ef88f206d0b35 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 21 Dec 2013 12:50:42 +0100 Subject: [PATCH 510/811] add ictce/6.2.0 paraphernalia Signed-off-by: Fotis Georgatos --- .../easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb | 18 ++++++++++++++++ easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb | 21 +++++++++++++++++++ .../easyconfigs/i/impi/impi-4.1.3.045.eb | 19 +++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb create mode 100644 easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb create mode 100644 easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb new file mode 100644 index 0000000000..ea2e3bdfd7 --- /dev/null +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb @@ -0,0 +1,18 @@ +name = 'HPL' +version = '2.0' + +homepage = 'http://www.netlib.org/benchmark/hpl/' +description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic + on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the + High Performance Computing Linpack Benchmark.""" + +toolchain = {'name': 'ictce', 'version': '6.2.0'} +toolchainopts = {'optarch': True, 'usempi': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.netlib.org/benchmark/%(namelower)s'] + +# fix Make dependencies, so parallel build also works +patches = ['HPL_parallel-make.patch'] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb b/easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb new file mode 100644 index 0000000000..973e6ab44a --- /dev/null +++ b/easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb @@ -0,0 +1,21 @@ +easyblock = "Toolchain" + +name = 'ictce' +version = '6.2.0' + +homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' +description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +suff = '1.106' +compver = '2013_sp1.%s' % suff + +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.3.045'), + ('imkl', '11.1.%s' % suff), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb b/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb new file mode 100644 index 0000000000..99968e9833 --- /dev/null +++ b/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb @@ -0,0 +1,19 @@ +name = 'impi' +version = '4.1.3.045' + +homepage = 'http://software.intel.com/en-us/intel-mpi-library/' +description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message + passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for + Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mpi_p_%(version)s.tgz'] + +moduleclass = 'mpi' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") -- GitLab From a8bb286893e62d56a4e830f89fc29ede6307236f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 14:25:03 +0100 Subject: [PATCH 511/811] drop GSL dependencies, doesn't always work as expected --- .../g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb | 2 -- .../easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb | 2 -- .../g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb | 2 -- .../easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb | 2 -- .../g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb | 2 -- .../easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb | 2 -- .../g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb | 5 ----- .../easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb | 5 ----- .../g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb | 5 ----- .../easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb | 5 ----- .../g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb | 2 -- .../g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb | 2 -- .../g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb | 5 ----- .../easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb | 2 -- .../g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb | 4 ---- .../easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb | 2 -- .../g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb | 2 -- .../easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb | 2 -- 18 files changed, 53 deletions(-) diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb index 39b40704bf..2c32c1c216 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb index f4e21dcbfc..7304cc5789 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb index 4c518648ee..d6f38ccfbb 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb index 9d83bacb7b..caa9471e7c 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb index 2950040b1b..6dcbff4c39 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb index 964c5c848d..605b8ed69d 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb index b14c93b641..bbf71787ee 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb @@ -31,11 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] -#configopts = "-DGMX_TEST_NUMBER_PROCS=1" -#parallel = 1 - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb index 65217db71e..72e6d81f6c 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb @@ -31,11 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] -#configopts = "-DGMX_TEST_NUMBER_PROCS=1" -#parallel = 1 - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb index b3862d7bc7..45f81add29 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb @@ -31,11 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] -#configopts = "-DGMX_TEST_NUMBER_PROCS=1" -#parallel = 1 - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb index f2d0ddfb74..6d1ed16eee 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb @@ -31,11 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] -#configopts = "-DGMX_TEST_NUMBER_PROCS=1" -#parallel = 1 - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb index 538c0a560c..afe1fbe21b 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb index ed12feb1c9..e9d5d04c88 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb index c23c74d646..73c56d433b 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb @@ -31,11 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] -#configopts = "-DGMX_TEST_NUMBER_PROCS=1" -parallel = 1 - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb index 79cf87d0ba..e5cfaf5826 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb index 21eb75235b..839eb005c2 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb @@ -31,10 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -#dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] -configopts = "-DGMX_TEST_NUMBER_PROCS=16" - moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb index 651f7be69d..060e0556d6 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.4')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb index 6b7c7754fa..1f91b84ea4 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb index 12cb6865b7..b04177b611 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb @@ -31,8 +31,6 @@ sources = [ 'regressiontests-%(version)s.tar.gz', ] -dependencies = [('GSL', '1.16')] - builddependencies = [('CMake', '2.8.12')] moduleclass = 'bio' -- GitLab From 73a9234b7bfd65f526bc7266c2b106dc807eeb18 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 14:27:21 +0100 Subject: [PATCH 512/811] add missing CMake easyconfigs --- .../c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb | 20 +++++++++++++++++++ .../c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb | 20 +++++++++++++++++++ .../CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb | 20 +++++++++++++++++++ .../c/CMake/CMake-2.8.12-goolfc-2.6.10.eb | 20 +++++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb new file mode 100644 index 0000000000..29decbc378 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'gmpolf', 'version': '1.4.8'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb new file mode 100644 index 0000000000..4e80c3b739 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'gmvolf', 'version': '1.7.12'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb new file mode 100644 index 0000000000..4371f8b627 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb new file mode 100644 index 0000000000..3b0a2eaf8c --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'goolfc', 'version': '2.6.10'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From 9eabe0d3b5766b6a026ebfcf973ea8db6d1e5ec6 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 21 Dec 2013 14:46:09 +0100 Subject: [PATCH 513/811] demote ictce-6.2.0 to ictce-6.1.5 Signed-off-by: Fotis Georgatos --- .../easyconfigs/i/ictce/{ictce-6.2.0.eb => ictce-6.1.5.eb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename easybuild/easyconfigs/i/ictce/{ictce-6.2.0.eb => ictce-6.1.5.eb} (96%) diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb b/easybuild/easyconfigs/i/ictce/ictce-6.1.5.eb similarity index 96% rename from easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb rename to easybuild/easyconfigs/i/ictce/ictce-6.1.5.eb index 973e6ab44a..47215eb1bc 100644 --- a/easybuild/easyconfigs/i/ictce/ictce-6.2.0.eb +++ b/easybuild/easyconfigs/i/ictce/ictce-6.1.5.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'ictce' -version = '6.2.0' +version = '6.1.5' homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" -- GitLab From 8919cf9fed98894eb0534c87be716f990d2809e2 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 21 Dec 2013 15:34:58 +0100 Subject: [PATCH 514/811] bumped versions of ictce/6.x --- .../ictce/{ictce-6.0.0.eb => ictce-6.0.5.eb} | 2 +- easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb | 21 ------------------- .../easyconfigs/i/imkl/imkl-11.1.1.106.eb | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) rename easybuild/easyconfigs/i/ictce/{ictce-6.0.0.eb => ictce-6.0.5.eb} (96%) delete mode 100644 easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb b/easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb similarity index 96% rename from easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb rename to easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb index 343a214a2c..7fd907fdff 100644 --- a/easybuild/easyconfigs/i/ictce/ictce-6.0.0.eb +++ b/easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'ictce' -version = '6.0.0' +version = '6.0.5' homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb b/easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb deleted file mode 100644 index 29381078a5..0000000000 --- a/easybuild/easyconfigs/i/ictce/ictce-6.1.0.eb +++ /dev/null @@ -1,21 +0,0 @@ -easyblock = "Toolchain" - -name = 'ictce' -version = '6.1.0' - -homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' -description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" - -toolchain = {'name': 'dummy', 'version': 'dummy'} - -suff = '1.106' -compver = '2013_sp1.%s' % suff - -dependencies = [ - ('icc', compver), - ('ifort', compver), - ('impi', '4.1.2.040'), - ('imkl', '11.1.%s' % suff), -] - -moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb index 3a8d833067..6c2f677c6c 100644 --- a/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb @@ -16,7 +16,7 @@ compver = '2013_sp1.1.106' dependencies = [ ('icc', compver), ('ifort', compver), - ('impi', '4.1.2.040') + ('impi', '4.1.3.045') ] dontcreateinstalldir = 'True' -- GitLab From 49a241d477b0799708b558aa652d57af1273d7e5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 15:52:22 +0100 Subject: [PATCH 515/811] put moduleclass at bottom of impi easyconfigs, fix toolchains in HPL ictce-6.x easyconfigs --- .../h/HPL/{HPL-2.0-ictce-6.0.0.eb => HPL-2.0-ictce-6.0.5.eb} | 0 .../h/HPL/{HPL-2.0-ictce-6.2.0.eb => HPL-2.0-ictce-6.1.5.eb} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/h/HPL/{HPL-2.0-ictce-6.0.0.eb => HPL-2.0-ictce-6.0.5.eb} (100%) rename easybuild/easyconfigs/h/HPL/{HPL-2.0-ictce-6.2.0.eb => HPL-2.0-ictce-6.1.5.eb} (100%) diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb similarity index 100% rename from easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.0.eb rename to easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb similarity index 100% rename from easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.2.0.eb rename to easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb -- GitLab From f54c26cd4c69c539dea4ab1126d72db9be6a2b0c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 15:58:20 +0100 Subject: [PATCH 516/811] put moduleclass at bottom of impi easyconfigs, fix toolchains in HPL ictce-6.x easyconfigs --- easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb | 2 +- easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb | 2 +- easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb | 4 ++-- easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb index dad098f322..ab34c97e0c 100644 --- a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb @@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the High Performance Computing Linpack Benchmark.""" -toolchain = {'name': 'ictce', 'version': '6.0.0'} +toolchain = {'name': 'ictce', 'version': '6.0.5'} toolchainopts = {'optarch': True, 'usempi': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb index ea2e3bdfd7..91a1cadef9 100644 --- a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb @@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the High Performance Computing Linpack Benchmark.""" -toolchain = {'name': 'ictce', 'version': '6.2.0'} +toolchain = {'name': 'ictce', 'version': '6.1.5'} toolchainopts = {'optarch': True, 'usempi': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb index af378447b9..5f35cd6834 100644 --- a/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb +++ b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_p_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb b/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb index c1fe77fbb7..437532bb49 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb @@ -11,8 +11,6 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_pu_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file @@ -20,3 +18,5 @@ import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") m32 = True + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb b/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb index 02fa80a736..a551f57786 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_pu_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb b/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb index 3e513a018f..4830b5c3c8 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb @@ -12,10 +12,10 @@ sources = ['l_mpi_p_%(version)s.tgz'] patches = ['impi_4.x_productsdb.patch'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb b/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb index 72b72e75d9..839fe8f604 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_p_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb b/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb index 5d906bc72f..875b582066 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_p_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb b/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb index a6158d1a06..97c88ff999 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_p_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb b/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb index 95c8b09cb5..839d937043 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_p_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb b/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb index 99968e9833..d31c2924c8 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb @@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} sources = ['l_mpi_p_%(version)s.tgz'] -moduleclass = 'mpi' - dontcreateinstalldir = 'True' # license file import os license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' -- GitLab From 3b7cdfc94178d4f1da7e5ac8ab07a3c673b04b05 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 16:01:44 +0100 Subject: [PATCH 517/811] fix remark --- easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb | 4 ++-- easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb | 4 ++-- easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb | 4 ++-- easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb | 4 ++-- easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb index dc75cc5bc6..39be41a74e 100644 --- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb @@ -5,8 +5,8 @@ version = '1.7.0' homepage = 'http://hpcugent.github.com/easybuild/' description = """EasyBuild is a software build and installation framework - written in Python that allows you to install software in a structured, -repeatable and robust way.""" + written in Python that allows you to install software in a structured, + repeatable and robust way.""" toolchain = {'name': 'dummy', 'version': 'dummy'} diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb index 4474ca43e8..1fe6136b55 100644 --- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb @@ -5,8 +5,8 @@ version = '1.8.0' homepage = 'http://hpcugent.github.com/easybuild/' description = """EasyBuild is a software build and installation framework - written in Python that allows you to install software in a structured, -repeatable and robust way.""" + written in Python that allows you to install software in a structured, + repeatable and robust way.""" toolchain = {'name': 'dummy', 'version': 'dummy'} diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb index 59a2b57db8..629ec16acb 100644 --- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb @@ -5,8 +5,8 @@ version = '1.8.1' homepage = 'http://hpcugent.github.com/easybuild/' description = """EasyBuild is a software build and installation framework - written in Python that allows you to install software in a structured, -repeatable and robust way.""" + written in Python that allows you to install software in a structured, + repeatable and robust way.""" toolchain = {'name': 'dummy', 'version': 'dummy'} diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb index 13f2a0d294..15551872f9 100644 --- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb @@ -5,8 +5,8 @@ version = '1.8.2' homepage = 'http://hpcugent.github.com/easybuild/' description = """EasyBuild is a software build and installation framework - written in Python that allows you to install software in a structured, -repeatable and robust way.""" + written in Python that allows you to install software in a structured, + repeatable and robust way.""" toolchain = {'name': 'dummy', 'version': 'dummy'} diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb index 30a0e1cfd6..4047b50760 100644 --- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb @@ -5,8 +5,8 @@ version = '1.9.0' homepage = 'http://hpcugent.github.com/easybuild/' description = """EasyBuild is a software build and installation framework - written in Python that allows you to install software in a structured, -repeatable and robust way.""" + written in Python that allows you to install software in a structured, + repeatable and robust way.""" toolchain = {'name': 'dummy', 'version': 'dummy'} -- GitLab From 148722268f4fde5f318572b0f8ac9e5b074fa29f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 21 Dec 2013 16:08:04 +0100 Subject: [PATCH 518/811] remove HPL for non-existing ictce/6.1.0 --- .../easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb deleted file mode 100644 index d3a5822e94..0000000000 --- a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.0.eb +++ /dev/null @@ -1,18 +0,0 @@ -name = 'HPL' -version = '2.0' - -homepage = 'http://www.netlib.org/benchmark/hpl/' -description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic - on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the - High Performance Computing Linpack Benchmark.""" - -toolchain = {'name': 'ictce', 'version': '6.1.0'} -toolchainopts = {'optarch': True, 'usempi': True} - -sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.netlib.org/benchmark/%(namelower)s'] - -# fix Make dependencies, so parallel build also works -patches = ['HPL_parallel-make.patch'] - -moduleclass = 'tools' -- GitLab From 4d120e2d4994bcbb17091894a656d259c4af1675 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 11:57:20 +0100 Subject: [PATCH 519/811] minor style fixes in Java and ErlangOTP easyconfigs --- .../e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb | 5 +---- .../easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb | 7 +------ easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb | 2 +- easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb | 2 +- easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb | 2 +- easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb | 2 +- easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb | 2 +- 7 files changed, 7 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb index 819ddd9b6b..84aa14f3cb 100644 --- a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb +++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb @@ -6,18 +6,15 @@ homepage = 'http://www.erlang.org/' description = """Erlang is a general-purpose concurrent, garbage-collected programming language and runtime system.""" toolchain = {'name': 'GCC', 'version': '4.7.2'} -toolchainopts = {} # toolchain options, e.g. opt, pic, usempi, optarch, ... sources = ['otp_src_%(version)s.tar.gz'] source_urls = ['http://www.erlang.org/download'] configopts = '--without-javac ' -patches = [] sanity_check_paths = { 'files': ['bin/erl'], - 'dirs': ['lib/erlang/bin', 'lib/erlang/lib'] - + 'dirs': ['lib/erlang/bin', 'lib/erlang/lib'], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb index 0415fc7a1c..14f196cbec 100644 --- a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb @@ -4,9 +4,7 @@ version = 'R16B02' homepage = 'http://www.erlang.org/' description = """Erlang is a general-purpose concurrent, garbage-collected programming language and runtime system.""" - toolchain = {'name': 'GCC', 'version': '4.7.2'} -toolchainopts = {} # toolchain options, e.g. opt, pic, usempi, optarch, ... sources = ['otp_src_%(version)s.tar.gz'] source_urls = ['http://www.erlang.org/download'] @@ -14,13 +12,10 @@ source_urls = ['http://www.erlang.org/download'] builddependencies = [('Java','1.7.0_45','',True)] configopts = '--with-javac ' -patches = [] sanity_check_paths = { 'files': ['bin/erl'], - 'dirs': ['lib/erlang/bin', 'lib/erlang/lib', - 'lib/erlang/lib/jinterface-1.5.8'] # Note java dependency - + 'dirs': ['lib/erlang/bin', 'lib/erlang/lib', 'lib/erlang/lib/jinterface-1.5.8'], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb index 2b21438ebc..aab1041c12 100644 --- a/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb @@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and toolchain = {'name': 'dummy', 'version': 'dummy'} -## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html (vp, vs) = version.split('_') altver = '%su%s' % (vp.split('.')[1], vs) sources = ['jdk-%s-linux-x64.tar.gz' % altver] diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb index a2c3b24e5a..5c86c312a9 100644 --- a/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb @@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and toolchain = {'name': 'dummy', 'version': 'dummy'} -## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html (vp, vs) = version.split('_') altver = '%su%s' % (vp.split('.')[1], vs) sources = ['jdk-%s-linux-x64.tar.gz' % altver] diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb index a103ca3d47..dbfbd84991 100644 --- a/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb @@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and toolchain = {'name': 'dummy', 'version': 'dummy'} -## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html (vp, vs) = version.split('_') altver = '%su%s' % (vp.split('.')[1], vs) sources = ['jdk-%s-linux-x64.tar.gz' % altver] diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb index a5fd350c4b..cf9d4f4b74 100644 --- a/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb @@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and toolchain = {'name': 'dummy', 'version': 'dummy'} -## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html (vp, vs) = version.split('_') altver = '%su%s' % (vp.split('.')[1], vs) sources = ['jdk-%s-linux-x64.tar.gz' % altver] diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb index 592d650cab..3387dbbb89 100644 --- a/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb +++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb @@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and toolchain = {'name': 'dummy', 'version': 'dummy'} -## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html +# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html (vp, vs) = version.split('_') altver = '%su%s' % (vp.split('.')[1], vs) sources = ['jdk-%s-linux-x64.tar.gz' % altver] -- GitLab From 40a1f2870bf1e462d28727c5b5c8cf9287fc55a3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 13:57:38 +0100 Subject: [PATCH 520/811] minor style fix in GATK easyconfigs, add easyconfig for v2.8-1 --- .../g/GATK/GATK-2.5-2-Java-1.7.0_10.eb | 2 +- .../g/GATK/GATK-2.6-5-Java-1.7.0_10.eb | 2 +- .../g/GATK/GATK-2.7-4-Java-1.7.0_10.eb | 2 +- .../g/GATK/GATK-2.8-1-Java-1.7.0_10.eb | 40 +++++++++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb index 0c47f958a0..4c9f63f9c5 100644 --- a/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb +++ b/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb @@ -25,7 +25,7 @@ description = """The Genome Analysis Toolkit or GATK is a software package devel toolchain = {'name': 'dummy', 'version': 'dummy'} # download manually from http://www.broadinstitute.org/gatk/download -sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)] +sources = ['GenomeAnalysisTK-%(version)s.tar.bz2'] java = 'Java' javaver = '1.7.0_10' diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb index cd3b27bab6..833388f606 100644 --- a/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb +++ b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb @@ -25,7 +25,7 @@ description = """The Genome Analysis Toolkit or GATK is a software package devel toolchain = {'name': 'dummy', 'version': 'dummy'} # download manually from http://www.broadinstitute.org/gatk/download -sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)] +sources = ['GenomeAnalysisTK-%(version)s.tar.bz2'] java = 'Java' javaver = '1.7.0_10' diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb index e9bb8a2fb7..c75c22094b 100644 --- a/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb +++ b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb @@ -25,7 +25,7 @@ description = """The Genome Analysis Toolkit or GATK is a software package devel toolchain = {'name': 'dummy', 'version': 'dummy'} # download manually from http://www.broadinstitute.org/gatk/download -sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)] +sources = ['GenomeAnalysisTK-%(version)s.tar.bz2'] java = 'Java' javaver = '1.7.0_10' diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb new file mode 100644 index 0000000000..c3a788ffe2 --- /dev/null +++ b/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb @@ -0,0 +1,40 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB +# Authors:: George Tsouloupas , Fotis Georgatos , Kenneth Hoste (UGent) +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +easyblock = 'Tarball' + +name = 'GATK' +version = '2.8-1' + +homepage = 'http://www.broadinstitute.org/gatk/' +description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute + to analyse next-generation resequencing data. The toolkit offers a wide variety of tools, + with a primary focus on variant discovery and genotyping as well as strong emphasis on + data quality assurance. Its robust architecture, powerful processing engine and + high-performance computing features make it capable of taking on projects of any size.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +# download manually from http://www.broadinstitute.org/gatk/download +sources = ['GenomeAnalysisTK-%(version)s.tar.bz2'] + +java = 'Java' +javaver = '1.7.0_10' +versionsuffix = '-%s-%s' % (java, javaver) +dependencies = [(java, javaver)] + +sanity_check_paths = { + 'files': ["GenomeAnalysisTK.jar"], + 'dirs': ["resources"], +} + +moduleclass = 'bio' -- GitLab From 64688082ee34530c0113acfc99f2954cc06b6dc3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 14:03:43 +0100 Subject: [PATCH 521/811] minor style fixes in Libint easyconfig --- .../easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb index 6f64e7b117..df7ae20900 100644 --- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb @@ -15,10 +15,10 @@ source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'dow configopts = "--with-pic --enable-deriv --enable-r12" sanity_check_paths = { - 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + - ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + - ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], - 'dirs':[] - } + 'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] + + ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] + + ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]], + 'dirs':[], +} moduleclass = 'chem' -- GitLab From 3dd6421a9ffab07be9aae4b6f932323d4fa7aefc Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 14:49:10 +0100 Subject: [PATCH 522/811] minor style fixes in HPL easyconfigs --- easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb | 1 - easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb | 1 - 2 files changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb index d9e8ade351..fa3e730343 100644 --- a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb @@ -6,7 +6,6 @@ description = """HPL is a software package that solves a (random) dense linear s on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the High Performance Computing Linpack Benchmark.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'usempi': True} diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb index bf12551602..312add6caf 100644 --- a/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb @@ -6,7 +6,6 @@ description = """HPL is a software package that solves a (random) dense linear s on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the High Performance Computing Linpack Benchmark.""" - toolchain = {'name': 'iomkl', 'version': '4.6.13'} toolchainopts = {'optarch': True, 'usempi': True} -- GitLab From 0bec9ed569eb21ed7a8454e5ee850107953bc40d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 16:10:11 +0100 Subject: [PATCH 523/811] add goolf easyconfig for GMP v5.1.3 --- .../g/GMP/GMP-5.1.3-goolf-1.4.10.eb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb new file mode 100644 index 0000000000..12faa79b4a --- /dev/null +++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb @@ -0,0 +1,23 @@ +name = 'GMP' +version = '5.1.3' + +homepage = 'http://gmplib.org/' +description = """GMP is a free library for arbitrary precision arithmetic, +operating on signed integers, rational numbers, and floating point numbers. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = ['http://ftp.gnu.org/gnu/gmp'] + +# enable C++ interface +configopts = '--enable-cxx' + +runtest = 'check' + +sanity_check_paths = { + 'files': ['lib/libgmp.so', 'include/gmp.h'], + 'dirs': [], +} + +moduleclass = 'math' -- GitLab From 183e373bd8c7ccc4ecd139ef2c7f8f3d380eb97c Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 22 Dec 2013 16:53:20 +0100 Subject: [PATCH 524/811] M4: use GNU_SOURCE template in source url --- easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb index bd161358d2..b122fe2d09 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb @@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce toolchain = {'name': 'ictce', 'version': '5.5.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftpmirror.gnu.org/m4'] +source_urls = [GNU_SOURCE] configopts = "--enable-cxx" -- GitLab From 7e2d87450f9f6f05e0c8f6948d3714d1879a9b94 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 22 Dec 2013 17:05:50 +0100 Subject: [PATCH 525/811] CP2K: enable libxc support --- easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb | 2 ++ easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb index ff604547cf..d40ebb8e28 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb @@ -36,4 +36,6 @@ parallel = 1 # regression test reports failures ignore_regtest_fails = True +libxc = True + moduleclass = 'chem' diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb index 1d06d1dfc9..33d9c00435 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb @@ -35,4 +35,6 @@ parallel = 1 # regression test reports failures: 13/2450 segfault ignore_regtest_fails = True +libxc = True + moduleclass = 'chem' -- GitLab From 5778709026f081dba1a8b4ef8c819f833557c4a3 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 22 Dec 2013 17:18:25 +0100 Subject: [PATCH 526/811] CP2K: drop libxc options, use the dep In the easyblock, we will check in the dependencies for libxc and libint --- easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb | 2 -- easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb | 2 -- 2 files changed, 4 deletions(-) diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb index d40ebb8e28..ff604547cf 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb @@ -36,6 +36,4 @@ parallel = 1 # regression test reports failures ignore_regtest_fails = True -libxc = True - moduleclass = 'chem' diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb index 33d9c00435..1d06d1dfc9 100644 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb @@ -35,6 +35,4 @@ parallel = 1 # regression test reports failures: 13/2450 segfault ignore_regtest_fails = True -libxc = True - moduleclass = 'chem' -- GitLab From 1fd8f38ab0498ae28454305be660ab60fa358f42 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 22 Dec 2013 17:32:26 +0100 Subject: [PATCH 527/811] Bison: use GNU_SOURCE as source url --- easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb index 5224af1090..1c8ec7242c 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb @@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an toolchain = {'name': 'ictce', 'version': '5.5.0'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s'] +source_urls = [GNU_SOURCE] builddependencies = [('M4', '1.4.17')] -- GitLab From 50d59801876ef2f0edea6e1ec8b38d73957d9d81 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 19:54:27 +0100 Subject: [PATCH 528/811] fix Ghostscript name, fix remarks and style issues --- .../Ghostscript-9.10-goolf-1.4.10.eb} | 14 ++++++-------- .../Ghostscript-9.10-ictce-4.1.13.eb} | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) rename easybuild/easyconfigs/g/{ghostscript/ghostscript-9.10-goolf-1.4.10.eb => Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb} (68%) rename easybuild/easyconfigs/g/{ghostscript/ghostscript-9.10-ictce-4.1.13.eb => Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb} (68%) diff --git a/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb similarity index 68% rename from easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb rename to easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb index c2f7480573..9e63e7389c 100644 --- a/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb @@ -1,24 +1,22 @@ -name = 'ghostscript' +name = 'Ghostscript' version = '9.10' homepage = 'http://ghostscript.com' description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to - different targets. It used to be part of the cups printing stack, but is no longer used for that. -""" + different targets. It used to be part of the cups printing stack, but is no longer used for that.""" + toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} source_urls = ["http://downloads.ghostscript.com/public/"] sources = [SOURCELOWER_TAR_GZ] +# expat, freetype and libpng are optional deps, +# these are actually patched and included in the sources, dependencies = [ -# optional, these are actually patched and included in the sources, -# ('expat', '2.1.0'), -# ('freetype', '2.4.10'), -# ('libpng', '1.6.2'), ('LibTIFF', '4.0.3'), ] configopts = "--with-system-libtiff --enable-dynamic" -moduleclass = 'lib' +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb similarity index 68% rename from easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb rename to easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb index d38ce6de2c..12bdcd0f27 100644 --- a/easybuild/easyconfigs/g/ghostscript/ghostscript-9.10-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb @@ -1,24 +1,22 @@ -name = 'ghostscript' +name = 'Ghostscript' version = '9.10' homepage = 'http://ghostscript.com' description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to - different targets. It used to be part of the cups printing stack, but is no longer used for that. -""" + different targets. It used to be part of the cups printing stack, but is no longer used for that.""" + toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'pic': True} source_urls = ["http://downloads.ghostscript.com/public/"] sources = [SOURCELOWER_TAR_GZ] +# expat, freetype and libpng are optional deps, +# these are actually patched and included in the sources, dependencies = [ -# optional, these are actually patched and included in the sources, -# ('expat', '2.1.0'), -# ('freetype', '2.4.10'), -# ('libpng', '1.6.2'), ('LibTIFF', '4.0.3'), ] configopts = "--with-system-libtiff --enable-dynamic" -moduleclass = 'lib' +moduleclass = 'tools' -- GitLab From 517a882f7fbe8e5c851e1428f73e80083761c36f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 20:55:36 +0100 Subject: [PATCH 529/811] add Python versionsuffix to HTSeq easyconfigs filenames --- ...goolf-1.4.10.eb => HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb} | 0 ...ictce-4.1.13.eb => HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/h/HTSeq/{HTSeq-0.5.4p5-goolf-1.4.10.eb => HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb} (100%) rename easybuild/easyconfigs/h/HTSeq/{HTSeq-0.5.4p5-ictce-4.1.13.eb => HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb} (100%) diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb similarity index 100% rename from easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10.eb rename to easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb similarity index 100% rename from easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13.eb rename to easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb -- GitLab From 0414ff3ecf9eb1875eb74ff6afd1e23b6429049e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 20:57:04 +0100 Subject: [PATCH 530/811] style fixes in BEDTools easyconfigs --- .../b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb | 13 ++++++++----- .../b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb | 14 ++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb index 8186926dfe..0c4ebbc6f3 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb @@ -1,13 +1,13 @@ easyblock = 'MakeCp' + name = 'BEDTools' version = 'v2.17.0' homepage = 'http://code.google.com/p/bedtools/' description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and -computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. -Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" -several BEDTools together. The following are examples of common questions that one can address with BEDTools. -""" + computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. + Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" + several BEDTools together. The following are examples of common questions that one can address with BEDTools.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} @@ -18,6 +18,9 @@ dirs = ["bin", "data", "docs", "genomes", 'scripts'] # copy all directories to the installation directory files_to_copy = dirs -sanity_check_paths = {'files': [], 'dirs': dirs} +sanity_check_paths = { + 'files': [], + 'dirs': dirs, +} moduleclass = 'bio' diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb index adcf9bdf19..c30c0d550b 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb @@ -1,14 +1,13 @@ easyblock = 'MakeCp' + name = 'BEDTools' version = 'v2.17.0' homepage = 'http://code.google.com/p/bedtools/' description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and -computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. -Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" -several BEDTools together. The following are examples of common questions that one can address with BEDTools. -""" - + computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. + Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" + several BEDTools together. The following are examples of common questions that one can address with BEDTools.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} @@ -19,6 +18,9 @@ dirs = ["bin", "data", "docs", "genomes", 'scripts'] # copy all directories to the installation directory files_to_copy = dirs -sanity_check_paths = {'files': [], 'dirs': dirs} +sanity_check_paths = { + 'files': [], + 'dirs': dirs, +} moduleclass = 'bio' -- GitLab From 21f97ba79045fb5dbf0859800ab5d7933b3f075d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 22:11:05 +0100 Subject: [PATCH 531/811] fix BEDTools versions --- ...2.17.0-goolf-1.4.10.eb => BEDTools-2.17.0-goolf-1.4.10.eb} | 4 ++-- ...2.17.0-ictce-4.1.13.eb => BEDTools-2.17.0-ictce-4.1.13.eb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename easybuild/easyconfigs/b/BEDTools/{BEDTools-v2.17.0-goolf-1.4.10.eb => BEDTools-2.17.0-goolf-1.4.10.eb} (93%) rename easybuild/easyconfigs/b/BEDTools/{BEDTools-v2.17.0-ictce-4.1.13.eb => BEDTools-2.17.0-ictce-4.1.13.eb} (93%) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb similarity index 93% rename from easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb rename to easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb index 0c4ebbc6f3..60d9a2da76 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb @@ -1,7 +1,7 @@ easyblock = 'MakeCp' name = 'BEDTools' -version = 'v2.17.0' +version = '2.17.0' homepage = 'http://code.google.com/p/bedtools/' description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and @@ -12,7 +12,7 @@ description = """The BEDTools utilities allow one to address common genomics tas toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ["http://bedtools.googlecode.com/files/"] -sources = ['%(name)s.%(version)s.tar.gz'] +sources = ['%(name)s.v%(version)s.tar.gz'] dirs = ["bin", "data", "docs", "genomes", 'scripts'] # copy all directories to the installation directory diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb similarity index 93% rename from easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb rename to easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb index c30c0d550b..ed094b1acf 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-v2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb @@ -1,7 +1,7 @@ easyblock = 'MakeCp' name = 'BEDTools' -version = 'v2.17.0' +version = '2.17.0' homepage = 'http://code.google.com/p/bedtools/' description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and @@ -12,7 +12,7 @@ description = """The BEDTools utilities allow one to address common genomics tas toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ["http://bedtools.googlecode.com/files/"] -sources = ['%(name)s.%(version)s.tar.gz'] +sources = ['%(name)s.v%(version)s.tar.gz'] dirs = ["bin", "data", "docs", "genomes", 'scripts'] # copy all directories to the installation directory -- GitLab From 9052b791523997f7871521e1daabcc9e8ba06026 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 22:15:42 +0100 Subject: [PATCH 532/811] align various BEDTools easyconfigs --- .../BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb | 19 ++++++++----------- .../BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb | 19 ++++++++----------- .../BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb | 18 ++++++++---------- 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb index 60d9a2da76..4b2fba7bcf 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb @@ -4,23 +4,20 @@ name = 'BEDTools' version = '2.17.0' homepage = 'http://code.google.com/p/bedtools/' -description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and - computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. - Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" - several BEDTools together. The following are examples of common questions that one can address with BEDTools.""" +description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps + and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, + and SAM/BAM.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ["http://bedtools.googlecode.com/files/"] -sources = ['%(name)s.v%(version)s.tar.gz'] +source_urls = ['https://github.com/arq5x/bedtools2/archive/'] +sources = ['v%(version)s.tar.gz'] -dirs = ["bin", "data", "docs", "genomes", 'scripts'] -# copy all directories to the installation directory -files_to_copy = dirs +files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"] sanity_check_paths = { - 'files': [], - 'dirs': dirs, + 'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']], + 'dirs': files_to_copy, } moduleclass = 'bio' diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb index ed094b1acf..d215c84837 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb @@ -4,23 +4,20 @@ name = 'BEDTools' version = '2.17.0' homepage = 'http://code.google.com/p/bedtools/' -description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps and - computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, and SAM/BAM. - Using BEDTools, one can develop sophisticated pipelines that answer complicated research questions by "streaming" - several BEDTools together. The following are examples of common questions that one can address with BEDTools.""" +description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps + and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, + and SAM/BAM.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ["http://bedtools.googlecode.com/files/"] -sources = ['%(name)s.v%(version)s.tar.gz'] +source_urls = ['https://github.com/arq5x/bedtools2/archive/'] +sources = ['v%(version)s.tar.gz'] -dirs = ["bin", "data", "docs", "genomes", 'scripts'] -# copy all directories to the installation directory -files_to_copy = dirs +files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"] sanity_check_paths = { - 'files': [], - 'dirs': dirs, + 'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']], + 'dirs': files_to_copy, } moduleclass = 'bio' diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb index 47e6beb8fd..d45afb71d9 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb @@ -2,28 +2,26 @@ # Swiss Institute of Bioinformatics (SIB) # Biozentrum - University of Basel +easyblock = 'MakeCp' + name = 'BEDTools' version = '2.18.1' -easyblock = 'MakeCp' - homepage = "https://github.com/arq5x/bedtools2" -description = """A powerful toolset for genome arithmetic.""" +description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps + and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF, + and SAM/BAM.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'optarch': True} -sources = ['v%(version)s.tar.gz'] source_urls = ['https://github.com/arq5x/bedtools2/archive/'] +sources = ['v%(version)s.tar.gz'] files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"] sanity_check_paths = { - 'files': ['bin/%s' % x for x in [ - 'bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed', - ] - ], - 'dirs': [], + 'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']], + 'dirs': files_to_copy, } moduleclass = 'bio' -- GitLab From 75298f01889b3c1e2a692b1dea3b7921ef59b1aa Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 22:27:16 +0100 Subject: [PATCH 533/811] only v2.18 version and up are available via github --- .../easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb | 4 ++-- .../easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb index 4b2fba7bcf..6cb0f4b818 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb @@ -10,8 +10,8 @@ description = """The BEDTools utilities allow one to address common genomics tas toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['https://github.com/arq5x/bedtools2/archive/'] -sources = ['v%(version)s.tar.gz'] +source_urls = ["http://bedtools.googlecode.com/files/"] +sources = ['%(name)s.v%(version)s.tar.gz'] files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"] diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb index d215c84837..3cb9f10e2d 100644 --- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb @@ -10,8 +10,8 @@ description = """The BEDTools utilities allow one to address common genomics tas toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['https://github.com/arq5x/bedtools2/archive/'] -sources = ['v%(version)s.tar.gz'] +source_urls = ["http://bedtools.googlecode.com/files/"] +sources = ['%(name)s.v%(version)s.tar.gz'] files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"] -- GitLab From c392e5e78454f481ac711b93782b9cad74263b56 Mon Sep 17 00:00:00 2001 From: pescobar Date: Sun, 22 Dec 2013 22:51:59 +0100 Subject: [PATCH 534/811] change date/version format. Added md5sums --- .../{CAP3-intel-x86.eb => CAP3-20071221-intel-x86.eb} | 11 +++++++---- ...-intel-x86_64.eb => CAP3-20071221-intel-x86_64.eb} | 11 +++++++---- .../{CAP3-opteron.eb => CAP3-20071221-opteron.eb} | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) rename easybuild/easyconfigs/c/CAP3/{CAP3-intel-x86.eb => CAP3-20071221-intel-x86.eb} (53%) rename easybuild/easyconfigs/c/CAP3/{CAP3-intel-x86_64.eb => CAP3-20071221-intel-x86_64.eb} (54%) rename easybuild/easyconfigs/c/CAP3/{CAP3-opteron.eb => CAP3-20071221-opteron.eb} (54%) diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb similarity index 53% rename from easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb rename to easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb index e9d20d0c64..0c1d5284b7 100644 --- a/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86.eb +++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb @@ -1,6 +1,11 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel name = 'CAP3' -version = 'intel-x86_12-21-2007' +version = '20071221-intel-x86' +# see VersionDate in caps3 output easyblock = 'PackedBinary' @@ -11,13 +16,11 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} source_urls = [('http://seq.cs.iastate.edu/CAP3/')] sources = ['cap3.linux.tar'] +checksums = [('md5', '55f57f61e588d4de06c0506cf2696c29')] sanity_check_paths = { 'files': ['cap3','formcon'], 'dirs': [], } - moduleclass = 'bio' - - diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb similarity index 54% rename from easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb rename to easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb index 46918913be..0962339a29 100644 --- a/easybuild/easyconfigs/c/CAP3/CAP3-intel-x86_64.eb +++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb @@ -1,6 +1,11 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel name = 'CAP3' -version = 'intel-x86_64_12-21-2007' +version = '20071221-intel-x86_64' +# see VersionDate in caps3 output easyblock = 'PackedBinary' @@ -11,13 +16,11 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} source_urls = [('http://seq.cs.iastate.edu/CAP3/')] sources = ['cap3.linux.x86_64.tar'] +checksums = [('md5', '0fbb95c3fcbfb2b1afcebc5f7e2b4343')] sanity_check_paths = { 'files': ['cap3','formcon'], 'dirs': [], } - moduleclass = 'bio' - - diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb similarity index 54% rename from easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb rename to easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb index 559fab20ae..3e19f30c49 100644 --- a/easybuild/easyconfigs/c/CAP3/CAP3-opteron.eb +++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb @@ -1,6 +1,11 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel name = 'CAP3' -version = 'opteron-12-21-2007' +version = '20071221-opteron' +# see VersionDate in caps3 output easyblock = 'PackedBinary' @@ -11,13 +16,11 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} source_urls = [('http://seq.cs.iastate.edu/CAP3/')] sources = ['cap3.linux.opteron64.tar'] +checksums = [('md5', '2d924766f6e8b5cf03bd2db81016d821')] sanity_check_paths = { 'files': ['cap3','formcon'], 'dirs': [], } - moduleclass = 'bio' - - -- GitLab From 99455d235d512ce2e93fbfd2563ea23199d3c2a7 Mon Sep 17 00:00:00 2001 From: pescobar Date: Sun, 22 Dec 2013 23:01:05 +0100 Subject: [PATCH 535/811] just modified headers --- .../c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb | 1 + .../c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb | 1 + 2 files changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb index 5a8435dee3..77441b5881 100644 --- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb @@ -1,3 +1,4 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # Author: Pablo Escobar Lopez # Swiss Institute of Bioinformatics (SIB) # Biozentrum - University of Basel diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb index abd9e43447..e788568341 100644 --- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb +++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb @@ -1,3 +1,4 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # Author: Pablo Escobar Lopez # Swiss Institute of Bioinformatics (SIB) # Biozentrum - University of Basel -- GitLab From e9589161dc081ec34dffc956bf3a2174c54c7e4b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 22 Dec 2013 23:06:54 +0100 Subject: [PATCH 536/811] only use 2 MPI processes when tested, since GROMACS required one GPU per MPI process --- .../g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb | 3 +++ .../g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb index d6f38ccfbb..d2a6762f37 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb @@ -33,4 +33,7 @@ sources = [ builddependencies = [('CMake', '2.8.4')] +# GROMACS required one GPU per MPI process used, so lets keep it at a minimum +configopts = '-DGMX_TEST_NUMBER_PROCS=2' + moduleclass = 'bio' diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb index 839eb005c2..0056d45c8c 100644 --- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb +++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb @@ -33,4 +33,7 @@ sources = [ builddependencies = [('CMake', '2.8.12')] +# GROMACS required one GPU per MPI process used, so lets keep it at a minimum +configopts = '-DGMX_TEST_NUMBER_PROCS=2' + moduleclass = 'bio' -- GitLab From fca2342efed0ae77614508dac413439ed137b25b Mon Sep 17 00:00:00 2001 From: pescobar Date: Sun, 22 Dec 2013 23:49:18 +0100 Subject: [PATCH 537/811] style fixes --- .../a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb index 54ffe4617c..3d65bd4489 100644 --- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb +++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb @@ -24,15 +24,14 @@ toolchainopts = {'usempi': True} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.bcgsc.ca/downloads/abyss/'] - dependencies = [ - ('google-sparsehash', '2.0.2'), - ('Boost', '1.49.0',versionsuffix), + ('google-sparsehash', '2.0.2'), + ('Boost', '1.49.0', versionsuffix), ] sanity_check_paths = { - 'files': ["bin/ABYSS", "bin/ABYSS-P"], - 'dirs': [] - } + 'files': ["bin/ABYSS", "bin/ABYSS-P"], + 'dirs': [] +} moduleclass = 'bio' -- GitLab From 49b293adac00251a7f9038c8b38e17b2975ee28c Mon Sep 17 00:00:00 2001 From: pescobar Date: Mon, 23 Dec 2013 00:21:08 +0100 Subject: [PATCH 538/811] added header --- easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb index 0c368ea41a..9496f69174 100644 --- a/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb @@ -1,3 +1,8 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics (SIB) +# Biozentrum - University of Basel + name = 'o2scl' version = '0.913' -- GitLab From 49f34763ef43b79cd36895b71a77e3aa4adb7db0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 10:38:28 +0100 Subject: [PATCH 539/811] fix Qt dependency for CGAL --- .../CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 13 ++++++------- .../c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb | 13 ++++++------- .../c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb | 13 ++++++------- .../c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb | 13 ++++++------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index b0f7c63498..3df06d2d4f 100644 --- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -15,12 +15,11 @@ pythonversion = '2.7.3' versionsuffix = "-Python-%s" % pythonversion dependencies = [ - ('CMake', '2.8.4'), - ('GMP', '5.0.5'), - ('Boost', '1.49.0', versionsuffix), - ('MPFR', '3.1.0'), - ] - -osdependencies = ['qt4-devel'] + ('CMake', '2.8.4'), + ('GMP', '5.0.5'), + ('Boost', '1.49.0', versionsuffix), + ('MPFR', '3.1.0'), + ('Qt', '4.8.4'), +] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb index 34490bdba2..0aff43ef22 100644 --- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb @@ -15,12 +15,11 @@ pythonversion = '2.7.3' versionsuffix = "-Python-%s" % pythonversion dependencies = [ - ('CMake', '2.8.4'), - ('GMP', '5.0.5'), - ('Boost', '1.49.0', versionsuffix), - ('MPFR', '3.1.0'), - ] - -osdependencies = ['qt4-devel'] + ('CMake', '2.8.4'), + ('GMP', '5.0.5'), + ('Boost', '1.49.0', versionsuffix), + ('MPFR', '3.1.0'), + ('Qt', '4.8.4'), +] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb index 943d99f867..c2050e6543 100644 --- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb @@ -15,13 +15,12 @@ pythonversion = '2.7.3' versionsuffix = "-Python-%s" % pythonversion dependencies = [ - ('CMake', '2.8.4'), - ('GMP', '5.0.5'), - ('Boost', '1.49.0', versionsuffix), - ('MPFR', '3.1.0'), - ] - -osdependencies = ['qt4-devel'] + ('CMake', '2.8.4'), + ('GMP', '5.0.5'), + ('Boost', '1.49.0', versionsuffix), + ('MPFR', '3.1.0'), + ('Qt', '4.8.4'), +] moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb index ba2bcd6e09..721c08f9d7 100644 --- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb @@ -16,13 +16,12 @@ pythonversion = '2.7.3' versionsuffix = "-Python-%s" % pythonversion dependencies = [ - ('CMake', '2.8.4'), - ('GMP', '5.0.5'), - ('Boost', '1.49.0', versionsuffix), - ('MPFR', '3.1.0'), - ] - -osdependencies = ['qt4-devel'] + ('CMake', '2.8.4'), + ('GMP', '5.0.5'), + ('Boost', '1.49.0', versionsuffix), + ('MPFR', '3.1.0'), + ('Qt', '4.8.4'), +] moduleclass = 'numlib' -- GitLab From ae547fa7bb236f6cca38418406d53a8178914955 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 11:00:09 +0100 Subject: [PATCH 540/811] add missing dependencies --- .../g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb | 19 +++++++++++++++ .../g/GLib/GLib-2.34.3-ictce-4.0.6.eb | 19 +++++++++++++++ .../l/libffi/libffi-3.0.13-ictce-4.0.6.eb | 23 +++++++++++++++++++ .../Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb | 21 +++++++++++++++++ .../p/Python/Python-2.5.6-ictce-4.0.6-bare.eb | 23 +++++++++++++++++++ .../p/Python/Python-2.5.6-ictce-5.3.0-bare.eb | 21 +++++++++++++++++ .../q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb | 14 +++++++++++ .../easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb | 14 +++++++++++ .../easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb | 14 +++++++++++ 9 files changed, 168 insertions(+) create mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb create mode 100644 easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb new file mode 100644 index 0000000000..e23ae02de7 --- /dev/null +++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb @@ -0,0 +1,19 @@ +name = 'GLib' +version = '2.34.3' + +homepage = 'http://www.gtk.org/' +description = """GLib is one of the base libraries of the GTK+ project""" + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/'] +sources = ['glib-%(version)s.tar.xz'] + +dependencies = [ + ('libffi', '3.0.13'), + ('gettext', '0.18.2'), +] +builddependencies = [('Python', '2.5.6', '-bare')] + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb new file mode 100644 index 0000000000..e63e6d5920 --- /dev/null +++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb @@ -0,0 +1,19 @@ +name = 'GLib' +version = '2.34.3' + +homepage = 'http://www.gtk.org/' +description = """GLib is one of the base libraries of the GTK+ project""" + +toolchain = {'name': 'ictce', 'version': '4.0.6'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/'] +sources = ['glib-%(version)s.tar.xz'] + +dependencies = [ + ('libffi', '3.0.13'), + ('gettext', '0.18.2'), +] +builddependencies = [('Python', '2.5.6', '-bare')] + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb new file mode 100644 index 0000000000..8f8f4182b7 --- /dev/null +++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb @@ -0,0 +1,23 @@ +name = 'libffi' +version = '3.0.13' + +homepage = 'http://sourceware.org/libffi/' +description = """The libffi library provides a portable, high level programming interface to various calling +conventions. This allows a programmer to call any function specified by a call interface description at run-time.""" + +toolchain = {'name': 'ictce', 'version': '4.0.6'} + +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['libffi-%(version)s_include-xmmintrin.patch'] + +sanity_check_paths = { + 'files': ['lib/libffi.%s' % SHLIB_EXT, 'lib/libffi.a'], + 'dirs': [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb new file mode 100644 index 0000000000..f2464bd93a --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb @@ -0,0 +1,21 @@ +name = 'Python' +version = '2.5.6' +versionsuffix = '-bare' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = [SOURCE_TGZ] + +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb new file mode 100644 index 0000000000..e25ef5a1c1 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb @@ -0,0 +1,23 @@ +name = 'Python' +version = '2.5.6' +versionsuffix = '-bare' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '4.0.6'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = [SOURCE_TGZ] + +patches = ['python_libffi_int128_icc.patch'] + +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb new file mode 100644 index 0000000000..5176f9c1ae --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb @@ -0,0 +1,21 @@ +name = 'Python' +version = '2.5.6' +versionsuffix = '-bare' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = [SOURCE_TGZ] + +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb new file mode 100644 index 0000000000..e9b04c5257 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb @@ -0,0 +1,14 @@ +name = 'Qt' +version = '4.8.4' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} + +source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb new file mode 100644 index 0000000000..4bd93a453e --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb @@ -0,0 +1,14 @@ +name = 'Qt' +version = '4.8.4' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." + +toolchain = {'name': 'ictce', 'version': '4.0.6'} + +source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb new file mode 100644 index 0000000000..56cdaa29b3 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb @@ -0,0 +1,14 @@ +name = 'Qt' +version = '4.8.4' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +moduleclass = 'devel' -- GitLab From f87f4e7e9dda06adc9ccd4cee25b1905fb7de3d2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 11:11:34 +0100 Subject: [PATCH 541/811] remove dateutil Python extension, build doesn't work --- .../easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb | 4 ---- easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb | 4 ---- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 4 ---- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 4 ---- 4 files changed, 16 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index 1811efcbd6..fcd6f6faa9 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -54,10 +54,6 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), - ('dateutil', '2.1', { - 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', - 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], - }), ('deap', '0.9.1', { 'source_urls': ['https://deap.googlecode.com/files/'], }), diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index 2edfeaac2b..a8a0d5bb35 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -54,10 +54,6 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), - ('dateutil', '2.1', { - 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', - 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], - }), ('deap', '0.9.1', { 'source_urls': ['https://deap.googlecode.com/files/'], }), diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index b3f2fc2f03..a09ac8bc40 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -54,10 +54,6 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), - ('dateutil', '2.1', { - 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', - 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], - }), ('deap', '0.9.1', { 'source_urls': ['https://deap.googlecode.com/files/'], }), diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 7263a31cf4..ff9baf5e2b 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -55,10 +55,6 @@ exts_list = [ ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), - ('dateutil', '2.1', { - 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', - 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], - }), ('deap', '0.9.1', { 'source_urls': ['https://deap.googlecode.com/files/'], }), -- GitLab From e39ff1b8c208c91f2b5de004b23fddc7dd827704 Mon Sep 17 00:00:00 2001 From: pescobar Date: Mon, 23 Dec 2013 13:32:32 +0100 Subject: [PATCH 542/811] updated header with url to github --- .../v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb index a5053fd3e9..47c30351f2 100644 --- a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb +++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb @@ -1,3 +1,4 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # Author: Pablo Escobar Lopez # Swiss Institute of Bioinformatics # Biozentrum - University of Basel -- GitLab From 9a96b7276d0825bced9527a8ae9bb715f8328357 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 13:33:51 +0100 Subject: [PATCH 543/811] remove Python 3.x incompatible extensions --- .../p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb | 10 ---------- .../easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb | 10 ---------- .../easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 10 ---------- .../easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 10 ---------- 4 files changed, 40 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index fcd6f6faa9..b57481552a 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -48,9 +48,6 @@ exts_list = [ ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), - ('lockfile', '0.9.1', { - 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], - }), ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), @@ -60,17 +57,10 @@ exts_list = [ ('decorator', '3.4.0', { 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], }), - ('arff', '1.1', { - 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], - }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], }), - ('paramiko', '1.12.0', { - 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], - }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index a8a0d5bb35..6e6ef740c7 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -48,9 +48,6 @@ exts_list = [ ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), - ('lockfile', '0.9.1', { - 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], - }), ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), @@ -60,17 +57,10 @@ exts_list = [ ('decorator', '3.4.0', { 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], }), - ('arff', '1.1', { - 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], - }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], }), - ('paramiko', '1.12.0', { - 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], - }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index a09ac8bc40..1049fd8980 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -48,9 +48,6 @@ exts_list = [ ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), - ('lockfile', '0.9.1', { - 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], - }), ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), @@ -60,17 +57,10 @@ exts_list = [ ('decorator', '3.4.0', { 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], }), - ('arff', '1.1', { - 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], - }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], }), - ('paramiko', '1.12.0', { - 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], - }), ] moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index ff9baf5e2b..039d169ed3 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -49,9 +49,6 @@ exts_list = [ ('argparse', '1.2.1', { 'source_urls': ['http://argparse.googlecode.com/files/'], }), - ('lockfile', '0.9.1', { - 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], - }), ('Cython', '0.19.1', { 'source_urls': ['http://www.cython.org/release/'], }), @@ -61,17 +58,10 @@ exts_list = [ ('decorator', '3.4.0', { 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], }), - ('arff', '1.1', { - 'source_tmpl': 'liac-%(name)s-%(version)s.zip', - 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], - }), ('pycrypto', '2.6.1', { 'modulename': 'Crypto', 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], }), - ('paramiko', '1.12.0', { - 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], - }), ] moduleclass = 'lang' -- GitLab From 13a521ead96e83e3d5b84ddfe5ff05e849802647 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 14:46:50 +0100 Subject: [PATCH 544/811] add required patch file in Python 3.2.3 ictce/4.0.6 easyconfig --- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 1049fd8980..7c8244621d 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -13,6 +13,8 @@ scipyversion = '0.10.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = [SOURCE_TGZ] +patches = ['python_libffi_int128_icc.patch'] + # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), -- GitLab From dc53b45ef222a9e243529e36f7394f032a2ae6e3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 15:20:05 +0100 Subject: [PATCH 545/811] add patch file to enforce use of -O1 for Qt with ictce/4.0.6 --- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb | 4 ++++ easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb index 4bd93a453e..7c847a9b40 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb @@ -5,10 +5,14 @@ homepage = 'http://qt-project.org/' description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '4.0.6'} +toolchainopts = {'lowopt': True} # use -O1 source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] +# enforce use of -O1, required because of compiler bug that triggers 'internal error: 0_381' +patches = ['Qt-4.8.4_ictce-O1.patch'] + dependencies = [('GLib', '2.34.3')] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch b/easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch new file mode 100644 index 0000000000..26a7811ae9 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.4/mkspecs/linux-icc/qmake.conf.orig 2013-12-23 14:54:00.272609496 +0100 ++++ qt-everywhere-opensource-src-4.8.4/mkspecs/linux-icc/qmake.conf 2013-12-23 14:54:09.392773091 +0100 +@@ -25,7 +25,7 @@ + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -w1 -Wcheck -wd654,1572,411,873,1125,2259 + QMAKE_CFLAGS_WARN_OFF = -w +-QMAKE_CFLAGS_RELEASE = -O2 -falign-functions=16 -ansi-alias -fstrict-aliasing ++QMAKE_CFLAGS_RELEASE = -O1 -falign-functions=16 -ansi-alias -fstrict-aliasing + QMAKE_CFLAGS_DEBUG = -O0 -g + QMAKE_CFLAGS_SHLIB = -fPIC -fno-jump-tables + QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB -- GitLab From 17e0a2f59d6f4b2f47c803fac91067e70e856f17 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 15:42:08 +0100 Subject: [PATCH 546/811] add fix for libctl build failing because guile-config contains full path to bin/guile --- .../easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb | 3 +++ easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb | 3 +++ easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb | 3 +++ easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb | 4 +++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb index 6965c925d9..4793aadab2 100644 --- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb @@ -12,4 +12,7 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('guile', '1.8.8')] +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb index eaeab2f0a1..c6329bbafe 100644 --- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb @@ -11,4 +11,7 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('guile', '1.8.8')] +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb index d079fb1e33..f9f2863718 100644 --- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb @@ -12,4 +12,7 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('guile', '1.8.8')] +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + moduleclass = 'chem' diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb index 74ca15b43e..ff25be499b 100644 --- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb @@ -4,7 +4,6 @@ version = '3.2.1' homepage = 'http://ab-initio.mit.edu/libctl' description = """libctl is a free Guile-based library implementing flexible control files for scientific simulations.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} @@ -13,4 +12,7 @@ sources = [SOURCELOWER_TAR_GZ] dependencies = [('guile', '1.8.8')] +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + moduleclass = 'chem' -- GitLab From 335c84d2cfdd9c86650995d614b90ee09ad35f37 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 15:58:20 +0100 Subject: [PATCH 547/811] add patch file to fix issue with PSI configure using python-config which includes full path to bin/python --- .../p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb | 1 + .../p/PSI/PSI-4.0b4-ictce-4.1.13.eb | 1 + .../p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb | 1 + .../p/PSI/PSI-4.0b4-ictce-5.3.0.eb | 1 + .../p/PSI/PSI-4.0b4_python-config.patch | 20 +++++++++++++++++++ .../PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb | 3 ++- .../p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb | 3 ++- .../p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb | 3 ++- .../p/PSI/PSI-4.0b5-ictce-5.3.0.eb | 3 ++- .../p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb | 3 ++- .../p/PSI/PSI-4.0b5-ictce-5.5.0.eb | 3 ++- .../p/PSI/PSI-4.0b5_python-config.patch | 20 +++++++++++++++++++ 12 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb index d3cae5bf6c..69d6cb10be 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb @@ -17,6 +17,7 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b4-mpi.patch', 'PSI-4.0b4-thread-pool.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb index 0325be769c..5c45d4243c 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb @@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b4-mpi.patch', 'PSI-4.0b4-thread-pool.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb index ea25a8f6c0..528a6728be 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb @@ -17,6 +17,7 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b4-mpi.patch', 'PSI-4.0b4-thread-pool.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb index 9d5ff82601..674a15f04b 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb @@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b4-mpi.patch', 'PSI-4.0b4-thread-pool.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch new file mode 100644 index 0000000000..caa0038c3d --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch @@ -0,0 +1,20 @@ +--- psi4.0b4/configure.orig 2013-04-07 09:13:35.000000000 +0200 ++++ psi4.0b4/configure 2013-12-23 15:52:14.531809408 +0100 +@@ -4968,7 +4968,7 @@ + if test "${am_cv_python_include+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- am_cv_python_include=`${PYTHON}-config --includes` ++ am_cv_python_include=`python ${PYTHON}-config --includes` + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_python_include" >&5 + $as_echo "$am_cv_python_include" >&6; } +@@ -4980,7 +4980,7 @@ + if test "${am_cv_python_ldflags+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- am_cv_python_ldflags=`${PYTHON}-config --ldflags` ++ am_cv_python_ldflags=`python ${PYTHON}-config --ldflags` + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_python_ldflags" >&5 + $as_echo "$am_cv_python_ldflags" >&6; } diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb index aaa504d53c..77f4624c51 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb @@ -15,9 +15,10 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ - 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-failed-test.patch', # the test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb index 6882ac49f0..de36f9f90d 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb @@ -14,9 +14,10 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b5-mpi-memcpy.patch', - 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-failed-test.patch', # the test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb index 51a7d52ca8..c680330c40 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb @@ -15,9 +15,10 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ - 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-failed-test.patch', # the test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb index 7ded97c33e..288d0bd7ab 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb @@ -14,9 +14,10 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b5-mpi-memcpy.patch', - 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-failed-test.patch', # the test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb index 089a136deb..e65fbf7805 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb @@ -15,9 +15,10 @@ source_urls = ['http://download.sourceforge.net/psicode/'] sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ - 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-failed-test.patch', # the test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb index 863bb18040..7be55fa034 100644 --- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb @@ -14,9 +14,10 @@ sources = ['%(namelower)s%(version)s.tar.gz'] patches = [ 'PSI-4.0b5-mpi-memcpy.patch', - 'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit + 'PSI-4.0b5-failed-test.patch', # the test works but it segfaults on exit 'PSI-4.0b5-thread-pool.patch', 'PSI-4.0b5-new-plugin.patch', + 'PSI-%(version)s_python-config.patch', # workaround for broken python-config due to full path to bin/python being used ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch new file mode 100644 index 0000000000..ff2bd121f0 --- /dev/null +++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch @@ -0,0 +1,20 @@ +--- psi4.0b5/configure.orig 2013-12-23 15:48:15.547085479 +0100 ++++ psi4.0b5/configure 2013-12-23 15:49:03.008030357 +0100 +@@ -4977,7 +4977,7 @@ + if test "${am_cv_python_include+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- am_cv_python_include=`${PYTHON}-config --includes` ++ am_cv_python_include=`python ${PYTHON}-config --includes` + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_python_include" >&5 + $as_echo "$am_cv_python_include" >&6; } +@@ -4989,7 +4989,7 @@ + if test "${am_cv_python_ldflags+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- am_cv_python_ldflags=`${PYTHON}-config --ldflags` ++ am_cv_python_ldflags=`python ${PYTHON}-config --ldflags` + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_python_ldflags" >&5 + $as_echo "$am_cv_python_ldflags" >&6; } -- GitLab From c879996b75c970965fac15c9dfad2038707b121c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 16:03:35 +0100 Subject: [PATCH 548/811] add GUILE_CONFIG config option to libmatheval easyconfig too --- .../libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb | 19 +++++++++++-------- .../libmatheval-1.1.8-goolf-1.4.10.eb | 19 +++++++++++-------- .../libmatheval-1.1.8-ictce-4.0.6.eb | 19 +++++++++++-------- .../libmatheval-1.1.8-ictce-5.3.0.eb | 19 +++++++++++-------- 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb index dd04511798..9812cf6fc2 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb @@ -12,17 +12,20 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('byacc', '20120526'), - ('guile', '1.8.8'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('byacc', '20120526'), + ('guile', '1.8.8'), +] configopts = '--with-pic' +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + sanity_check_paths = { - 'files': ['lib/libmatheval.a', 'include/matheval.h'], - 'dirs': [] - } + 'files': ['lib/libmatheval.a', 'include/matheval.h'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb index b24bc59f04..e4f394364d 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb @@ -12,17 +12,20 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('byacc', '20120526'), - ('guile', '1.8.8'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('byacc', '20120526'), + ('guile', '1.8.8'), +] configopts = '--with-pic' +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + sanity_check_paths = { - 'files': ['lib/libmatheval.a', 'include/matheval.h'], - 'dirs': [] - } + 'files': ['lib/libmatheval.a', 'include/matheval.h'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb index 7b46f2830c..feaa98cde7 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb @@ -12,17 +12,20 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('byacc', '20120526'), - ('guile', '1.8.8'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('byacc', '20120526'), + ('guile', '1.8.8'), +] configopts = '--with-pic' +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + sanity_check_paths = { - 'files': ['lib/libmatheval.a', 'include/matheval.h'], - 'dirs': [] - } + 'files': ['lib/libmatheval.a', 'include/matheval.h'], + 'dirs': [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb index 271da139b9..0c629e9716 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb @@ -13,17 +13,20 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'pic': True} dependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5'), - ('byacc', '20120526'), - ('guile', '1.8.8'), - ] + ('flex', '2.5.35'), + ('Bison', '2.5'), + ('byacc', '20120526'), + ('guile', '1.8.8'), +] configopts = '--with-pic' +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' + sanity_check_paths = { - 'files': ['lib/libmatheval.a', 'include/matheval.h'], - 'dirs': [] - } + 'files': ['lib/libmatheval.a', 'include/matheval.h'], + 'dirs': [], +} moduleclass = 'lib' -- GitLab From 8d4d963e0b11afc4231d9060eaa0545a3ebb31fa Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 16:08:35 +0100 Subject: [PATCH 549/811] fix missing space in libmatheval easyconfigs --- .../l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb index 9812cf6fc2..fc7b4abfc1 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb @@ -18,7 +18,7 @@ dependencies = [ ('guile', '1.8.8'), ] -configopts = '--with-pic' +configopts = '--with-pic ' # fix for guile-config being broken because shebang line contains full path to bin/guile configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb index e4f394364d..3c04bfef33 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb @@ -18,7 +18,7 @@ dependencies = [ ('guile', '1.8.8'), ] -configopts = '--with-pic' +configopts = '--with-pic ' # fix for guile-config being broken because shebang line contains full path to bin/guile configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb index feaa98cde7..2eabdf62ef 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb @@ -18,7 +18,7 @@ dependencies = [ ('guile', '1.8.8'), ] -configopts = '--with-pic' +configopts = '--with-pic ' # fix for guile-config being broken because shebang line contains full path to bin/guile configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb index 0c629e9716..25956f7777 100644 --- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb @@ -19,7 +19,7 @@ dependencies = [ ('guile', '1.8.8'), ] -configopts = '--with-pic' +configopts = '--with-pic ' # fix for guile-config being broken because shebang line contains full path to bin/guile configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' -- GitLab From e38ba9a5eb0751c3d74e2a18e0bab9b34d8875af Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 16:38:23 +0100 Subject: [PATCH 550/811] fix FSL makefile patch files --- .../f/FSL/FSL-5.0.4_makefile_fixes.patch | 84 +++++++++---------- .../f/FSL/FSL_makefile_fixes.patch | 84 +++++++++---------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch index eafc838d18..f90ee458bb 100644 --- a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch @@ -7,8 +7,8 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX ?= ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -21,8 +21,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -35,8 +35,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.3/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -49,8 +49,8 @@ diff -ru fsl.orig/config/apple-darwin8-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -63,8 +63,8 @@ diff -ru fsl.orig/config/apple-darwin9-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -77,8 +77,8 @@ diff -ru fsl.orig/config/generic/systemvars.mk fsl/config/generic/systemvars.mk -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -91,8 +91,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.2/systemvars.mk fsl/config/i686-pc- -CC = gcc-2 -CXX = c++-2 -+CC ?= gcc-2 -+CXX ?= c++-2 ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -105,8 +105,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.3/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -119,8 +119,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.4/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -133,8 +133,8 @@ diff -ru fsl.orig/config/linux_32-gcc2.96/systemvars.mk fsl/config/linux_32-gcc2 -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -147,8 +147,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.2/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -161,8 +161,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.3/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -175,8 +175,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.4/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -189,8 +189,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.0/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -203,8 +203,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.1/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -217,8 +217,8 @@ diff -ru fsl.orig/config/linux_64-gcc3.4/systemvars.mk fsl/config/linux_64-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -231,8 +231,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.0/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -245,8 +245,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.1/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -259,8 +259,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -273,8 +273,8 @@ diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer @@ -287,8 +287,8 @@ diff -ru fsl.orig/config/sparc-solaris2.9-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer ARCHLDFLAGS = -static diff --git a/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch index c78dd2e48a..c1313251ab 100644 --- a/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch @@ -28,8 +28,8 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -42,8 +42,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -56,8 +56,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.3/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -70,8 +70,8 @@ diff -ru fsl.orig/config/apple-darwin8-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -84,8 +84,8 @@ diff -ru fsl.orig/config/apple-darwin9-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC ?= cc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -98,8 +98,8 @@ diff -ru fsl.orig/config/generic/systemvars.mk fsl/config/generic/systemvars.mk -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -112,8 +112,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.2/systemvars.mk fsl/config/i686-pc- -CC = gcc-2 -CXX = c++-2 -+CC ?= gcc-2 -+CXX ?= c++-2 ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -126,8 +126,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.3/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -140,8 +140,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.4/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -154,8 +154,8 @@ diff -ru fsl.orig/config/linux_32-gcc2.96/systemvars.mk fsl/config/linux_32-gcc2 -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -168,8 +168,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.2/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -182,8 +182,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.3/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -196,8 +196,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.4/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -210,8 +210,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.0/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -224,8 +224,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.1/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -238,8 +238,8 @@ diff -ru fsl.orig/config/linux_64-gcc3.4/systemvars.mk fsl/config/linux_64-gcc3. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -252,8 +252,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.0/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -266,8 +266,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.1/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -280,8 +280,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -294,8 +294,8 @@ diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer @@ -308,8 +308,8 @@ diff -ru fsl.orig/config/sparc-solaris2.9-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC ?= gcc -+CXX ?= c++ ++CC = ${CC} ++CXX = ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer ARCHLDFLAGS = -static -- GitLab From c998f9d21541b3cb93a52dfee6eac4c7e133fc4b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 16:51:51 +0100 Subject: [PATCH 551/811] add GUILE_CONFIG config option to Meep easyconfigs too --- .../m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb | 17 ++++++++++------- .../easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb | 14 +++++++++----- .../easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb | 14 +++++++++----- .../easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb | 15 +++++++++------ 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb index b1b8b5191a..c6d4999624 100644 --- a/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb @@ -5,13 +5,13 @@ homepage = 'http://ab-initio.mit.edu/wiki/index.php/Meep' description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) simulation software package developed at MIT to model electromagnetic systems.""" -tcver = '1.1.0-no-OFED' -toolchain = {'name': 'goalf', 'version': tcver} -toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': - True, 'pic': True} +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ab-initio.mit.edu/meep/', - 'http://ab-initio.mit.edu/meep/old/'] +source_urls = [ + 'http://ab-initio.mit.edu/meep/', + 'http://ab-initio.mit.edu/meep/old/', +] sources = [SOURCELOWER_TAR_GZ] dependencies = [ @@ -21,6 +21,9 @@ dependencies = [ ('GSL', '1.15'), ] -configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared' +configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared ' + +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' moduleclass = 'phys' diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb index 2f278ab531..7b27d95b42 100644 --- a/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb @@ -6,11 +6,12 @@ description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) s MIT to model electromagnetic systems.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': - True, 'pic': True} +toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ab-initio.mit.edu/meep/', - 'http://ab-initio.mit.edu/meep/old/'] +source_urls = [ + 'http://ab-initio.mit.edu/meep/', + 'http://ab-initio.mit.edu/meep/old/', +] sources = [SOURCELOWER_TAR_GZ] dependencies = [ @@ -20,6 +21,9 @@ dependencies = [ ('GSL', '1.15'), ] -configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared' +configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared ' + +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' moduleclass = 'phys' diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb index 9b00a0bbd1..7b473e1b0b 100644 --- a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb @@ -6,11 +6,12 @@ description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) s developed at MIT to model electromagnetic systems.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} -toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': - True, 'pic': True} +toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ab-initio.mit.edu/meep/', - 'http://ab-initio.mit.edu/meep/old/'] +source_urls = [ + 'http://ab-initio.mit.edu/meep/', + 'http://ab-initio.mit.edu/meep/old/', +] sources = [SOURCELOWER_TAR_GZ] patches = ['Meep-%s_version-string-without-spaces.patch' % version] @@ -24,6 +25,9 @@ dependencies = [ ] configopts = "--with-pic --with-mpi --with-blas=mkl_em64t --with-lapack=mkl_em64t --without-gcc-arch " -configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared" +configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared " + +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' moduleclass = 'phys' diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb index a5d16e83a0..98db62a6c1 100644 --- a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb @@ -5,13 +5,13 @@ homepage = 'http://ab-initio.mit.edu/wiki/index.php/Meep' description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) simulation software package developed at MIT to model electromagnetic systems.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': - True, 'pic': True} +toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True} -source_urls = ['http://ab-initio.mit.edu/meep/', - 'http://ab-initio.mit.edu/meep/old/'] +source_urls = [ + 'http://ab-initio.mit.edu/meep/', + 'http://ab-initio.mit.edu/meep/old/', +] sources = [SOURCELOWER_TAR_GZ] patches = ['Meep-%s_version-string-without-spaces.patch' % version] @@ -25,6 +25,9 @@ dependencies = [ ] configopts = "--with-pic --with-mpi --with-blas=mkl_em64t --with-lapack=mkl_em64t --without-gcc-arch " -configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared" +configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared " + +# fix for guile-config being broken because shebang line contains full path to bin/guile +configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"' moduleclass = 'phys' -- GitLab From 9d449943650f50026dbfdb6e4a37abd27f177331 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 17:14:22 +0100 Subject: [PATCH 552/811] complete makefile patch for FSL v5.0.4 --- .../f/FSL/FSL-5.0.4_makefile_fixes.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch index f90ee458bb..0d4f7e9d4d 100644 --- a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch @@ -12,6 +12,34 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da CSTATICFLAGS = CXXSTATICFLAGS = +diff -ru fsl.orig/config/apple-darwin11-gcc4.2/systemvars.mk fsl/config/apple-darwin11-gcc4.2/systemvars.mk +--- fsl.orig/config/apple-darwin11-gcc4.2/systemvars.mk 2009-11-03 18:02:14.000000000 +0100 ++++ fsl/config/apple-darwin11-gcc4.2/systemvars.mk 2013-05-14 22:43:15.344366000 +0200 +@@ -3,8 +3,8 @@ + + # Compiler dependent variables + +-CC = cc +-CXX = c++ ++CC = ${CC} ++CXX ?= ${CXX} + CSTATICFLAGS = + CXXSTATICFLAGS = + +diff -ru fsl.orig/config/apple-darwin12-gcc4.2/systemvars.mk fsl/config/apple-darwin12-gcc4.2/systemvars.mk +--- fsl.orig/config/apple-darwin12-gcc4.2/systemvars.mk 2009-11-03 18:02:14.000000000 +0100 ++++ fsl/config/apple-darwin12-gcc4.2/systemvars.mk 2013-05-14 22:43:15.344366000 +0200 +@@ -3,8 +3,8 @@ + + # Compiler dependent variables + +-CC = cc +-CXX = c++ ++CC = ${CC} ++CXX ?= ${CXX} + CSTATICFLAGS = + CXXSTATICFLAGS = + diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-darwin7-gcc3.1/systemvars.mk --- fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk 2007-07-13 13:00:20.000000000 +0200 +++ fsl/config/apple-darwin7-gcc3.1/systemvars.mk 2013-05-14 22:43:15.363590000 +0200 @@ -264,6 +292,34 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4. CSTATICFLAGS = -static CXXSTATICFLAGS = -static +diff -ru fsl.orig/config/linux_64-gcc4.3/systemvars.mk fsl/config/linux_64-gcc4.3/systemvars.mk +--- fsl.orig/config/linux_64-gcc4.3/systemvars.mk 2008-06-26 15:25:42.000000000 +0200 ++++ fsl/config/linux_64-gcc4.3/systemvars.mk 2013-05-14 22:43:15.648658000 +0200 +@@ -18,8 +18,8 @@ + + # Compiler dependent variables + +-CC = gcc +-CXX = c++ ++CC = ${CC} ++CXX = ${CXX} + CSTATICFLAGS = -static + CXXSTATICFLAGS = -static + +diff -ru fsl.orig/config/linux_64-gcc4.4/systemvars.mk fsl/config/linux_64-gcc4.4/systemvars.mk +--- fsl.orig/config/linux_64-gcc4.4/systemvars.mk 2008-06-26 15:25:42.000000000 +0200 ++++ fsl/config/linux_64-gcc4.4/systemvars.mk 2013-05-14 22:43:15.648658000 +0200 +@@ -18,8 +18,8 @@ + + # Compiler dependent variables + +-CC = gcc +-CXX = c++ ++CC = ${CC} ++CXX = ${CXX} + CSTATICFLAGS = -static + CXXSTATICFLAGS = -static + diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc-solaris2.8-gcc2.95/systemvars.mk --- fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk 2007-07-13 13:00:21.000000000 +0200 +++ fsl/config/sparc-solaris2.8-gcc2.95/systemvars.mk 2013-05-14 22:43:15.658171000 +0200 -- GitLab From 67ee1b2dd6db6fea928915d5ce29d82d38c78953 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 17:26:23 +0100 Subject: [PATCH 553/811] correct edited patch file --- .../f/FSL/FSL-5.0.4_makefile_fixes.patch | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch index 0d4f7e9d4d..07c14cee1c 100644 --- a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch @@ -292,20 +292,6 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4. CSTATICFLAGS = -static CXXSTATICFLAGS = -static -diff -ru fsl.orig/config/linux_64-gcc4.3/systemvars.mk fsl/config/linux_64-gcc4.3/systemvars.mk ---- fsl.orig/config/linux_64-gcc4.3/systemvars.mk 2008-06-26 15:25:42.000000000 +0200 -+++ fsl/config/linux_64-gcc4.3/systemvars.mk 2013-05-14 22:43:15.648658000 +0200 -@@ -18,8 +18,8 @@ - - # Compiler dependent variables - --CC = gcc --CXX = c++ -+CC = ${CC} -+CXX = ${CXX} - CSTATICFLAGS = -static - CXXSTATICFLAGS = -static - diff -ru fsl.orig/config/linux_64-gcc4.4/systemvars.mk fsl/config/linux_64-gcc4.4/systemvars.mk --- fsl.orig/config/linux_64-gcc4.4/systemvars.mk 2008-06-26 15:25:42.000000000 +0200 +++ fsl/config/linux_64-gcc4.4/systemvars.mk 2013-05-14 22:43:15.648658000 +0200 -- GitLab From b0210ca8d126cd9c62d90919593e2b7f6e3c3a68 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 17:37:54 +0100 Subject: [PATCH 554/811] adjust include install dir for HDF, to avoid header file clashes (especially netcdf.h, e.g. in NCL) --- .../h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb | 7 ++++++- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb | 7 ++++++- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb | 7 ++++++- .../easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb | 7 ++++++- easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb | 7 ++++++- easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb | 7 ++++++- easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb | 7 ++++++- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb index 83e2988a0c..e995d9cfbc 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb @@ -18,6 +18,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szlib=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb index f96af34d46..144aadbb34 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb @@ -18,6 +18,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szlib=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb index 4f6e05af17..0a219c43cb 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb @@ -18,6 +18,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szlib=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb index cebdd7449b..e44680caf1 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb @@ -18,6 +18,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szlib=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb index 0810f8a775..f40a982742 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb @@ -18,6 +18,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]] -configopts = "--with-szip=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb index 2035306c6a..1c4c00dc01 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb @@ -16,6 +16,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/'] -configopts = "--with-szlib=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb index 9fc4dc8817..7a34de4b31 100644 --- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb @@ -18,6 +18,11 @@ dependencies = [ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/'] -configopts = "--with-szlib=$EBROOTSZIP" +configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf" + +sanity_check_paths = { + 'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'], + 'dirs': ['bin', 'include/hdf'], +} moduleclass = 'data' -- GitLab From 9eae34035c0d3c31d606d2173f48c3e0cc79efbf Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 17:47:00 +0100 Subject: [PATCH 555/811] fix FSL makefile patch (again) --- .../f/FSL/FSL-5.0.4_makefile_fixes.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch index 07c14cee1c..b9ef33e915 100644 --- a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch @@ -8,7 +8,7 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da -CC = cc -CXX = c++ +CC = ${CC} -+CXX ?= ${CXX} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -19,10 +19,10 @@ diff -ru fsl.orig/config/apple-darwin11-gcc4.2/systemvars.mk fsl/config/apple-da # Compiler dependent variables --CC = cc --CXX = c++ +-CC = gcc +-CXX = g++ +CC = ${CC} -+CXX ?= ${CXX} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -33,10 +33,10 @@ diff -ru fsl.orig/config/apple-darwin12-gcc4.2/systemvars.mk fsl/config/apple-da # Compiler dependent variables --CC = cc --CXX = c++ +-CC = gcc +-CXX = g++ +CC = ${CC} -+CXX ?= ${CXX} ++CXX = ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = -- GitLab From bb1e4204b9b143874b02ef55478954162c986de3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 18:21:35 +0100 Subject: [PATCH 556/811] avoid 'recursive variable CC references itself (eventually)' error by using := assignment in makefile --- .../f/FSL/FSL-5.0.4_makefile_fixes.patch | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch index b9ef33e915..7a7959c00b 100644 --- a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch @@ -7,8 +7,8 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -21,8 +21,8 @@ diff -ru fsl.orig/config/apple-darwin11-gcc4.2/systemvars.mk fsl/config/apple-da -CC = gcc -CXX = g++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -35,8 +35,8 @@ diff -ru fsl.orig/config/apple-darwin12-gcc4.2/systemvars.mk fsl/config/apple-da -CC = gcc -CXX = g++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -49,8 +49,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -63,8 +63,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.3/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -77,8 +77,8 @@ diff -ru fsl.orig/config/apple-darwin8-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -91,8 +91,8 @@ diff -ru fsl.orig/config/apple-darwin9-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -105,8 +105,8 @@ diff -ru fsl.orig/config/generic/systemvars.mk fsl/config/generic/systemvars.mk -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -119,8 +119,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.2/systemvars.mk fsl/config/i686-pc- -CC = gcc-2 -CXX = c++-2 -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -133,8 +133,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.3/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -147,8 +147,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.4/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -161,8 +161,8 @@ diff -ru fsl.orig/config/linux_32-gcc2.96/systemvars.mk fsl/config/linux_32-gcc2 -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -175,8 +175,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.2/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -189,8 +189,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.3/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -203,8 +203,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.4/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -217,8 +217,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.0/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -231,8 +231,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.1/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -245,8 +245,8 @@ diff -ru fsl.orig/config/linux_64-gcc3.4/systemvars.mk fsl/config/linux_64-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -259,8 +259,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.0/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -273,8 +273,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.1/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -287,8 +287,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -301,8 +301,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.4/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -315,8 +315,8 @@ diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer @@ -329,8 +329,8 @@ diff -ru fsl.orig/config/sparc-solaris2.9-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer ARCHLDFLAGS = -static -- GitLab From 728603efec8866e01abccde4abd4f37258246e7d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 19:00:39 +0100 Subject: [PATCH 557/811] remove unnecessary (and even wrong) patch files now HDF include dir is 'include/hdf' --- easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb | 2 -- easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb | 2 -- easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb | 3 +-- easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb | 4 ---- easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb | 4 ---- easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb | 4 ---- 6 files changed, 1 insertion(+), 18 deletions(-) diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb index 3eab6d0bff..b0be263266 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb @@ -24,6 +24,4 @@ builddependencies = [('makedepend', '1.0.4')] sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)] -patches = ['NCL_fix-HDF-includes.patch'] - moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb index af6e73e806..241071f2b2 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb @@ -23,6 +23,4 @@ builddependencies = [('makedepend', '1.0.4')] sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)] -patches = ['NCL_fix-HDF-includes.patch'] - moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb index fd25d52c75..7a7a84f29c 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb @@ -24,7 +24,6 @@ builddependencies = [('makedepend', '1.0.4')] sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)] -patches = ['NCL_intel_compound-fix.patch', - 'NCL_fix-HDF-includes.patch'] +patches = ['NCL_intel_compound-fix.patch'] moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb index 0a7b5eac58..3aeb096821 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb @@ -10,10 +10,6 @@ toolchainopts = {'opt': True, 'pic': True, 'usempi': True} sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)] -patches = [ - 'NCL-6.1_fix-HDF-includes.patch', -] - dependencies = [ ('cURL', '7.28.1'), ('netCDF', '4.2.1.1'), diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb index f2f25fd0a4..26058d36f5 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb @@ -10,10 +10,6 @@ toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'openmp': True} sources = ['%(namelower)s_ncarg-%(version)s.tar.gz'] -patches = [ - 'NCL-6.1_fix-HDF-includes.patch', -] - dependencies = [ ('cURL', '7.28.1'), ('netCDF', '4.2.1.1', '-mt'), diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb index 4c676295ad..60e793f09a 100644 --- a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb @@ -10,10 +10,6 @@ toolchainopts = {'opt': True, 'pic': True, 'usempi': True} sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)] -patches = [ - 'NCL-6.1_fix-HDF-includes.patch', -] - dependencies = [ ('cURL', '7.28.1'), ('netCDF', '4.2.1.1'), -- GitLab From a540ba04ec96a7c81ae7877f285100f085dd582f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 20:47:57 +0100 Subject: [PATCH 558/811] style fixes --- .../easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb | 2 +- .../easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb | 3 +-- .../easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb | 2 +- easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb | 2 +- easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb | 2 +- easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb | 3 +-- easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb index 0d2bc981cb..4cec82a9a5 100644 --- a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb +++ b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb @@ -12,7 +12,7 @@ description = """The package contains R-functions to perform an fmri analysis as toolchain = {'name': 'ictce', 'version': '4.0.10'} source_urls = ['http://cran.r-project.org/src/contrib/'] -sources = ['%s_%s.tar.gz' % (name, version)] +sources = ['%(name)s_%(version)s.tar.gz'] r = 'R' rver = '2.15.2' diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb index de5657ceca..6d1befc47f 100644 --- a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb +++ b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb @@ -9,11 +9,10 @@ description = """The package contains R-functions to perform an fmri analysis as NeuroImage, 33:55-62 (2006) and J. Polzehl, H.U. Voss, K. Tabelow, Structural adaptive segmentation for statistical parametric mapping, NeuroImage, 52:515-523 (2010).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://cran.r-project.org/src/contrib/'] -sources = ['%s_%s.tar.gz' % (name, version)] +sources = ['%(name)s_%(version)s.tar.gz'] r = 'R' rver = '2.15.2' diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb b/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb index f685ae9e45..dacaf55d84 100644 --- a/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb +++ b/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb @@ -12,7 +12,7 @@ description = """The package contains R-functions to perform an fmri analysis as toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://cran.r-project.org/src/contrib/'] -sources = ['%s_%s.tar.gz' % (name, version)] +sources = ['%(name)s_%(version)s.tar.gz'] r = 'R' rver = '2.15.3' diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb index 808b442937..e52a011d4b 100644 --- a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb @@ -8,7 +8,7 @@ suitable for a very wide range of uses, including web and desktop applications, toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"' diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb index 812a6ecf52..a8d8d4acdf 100644 --- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] dependencies = [('Tcl', version)] diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb index 6c6af38ce3..b862540b18 100644 --- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb @@ -8,7 +8,7 @@ a graphical user interface (GUI) in many different programming languages.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] dependencies = [('Tcl', version)] diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb index 9be243225c..ffd89a9367 100644 --- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb @@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov toolchain = {'name': 'ictce', 'version': '4.0.10'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] dependencies = [('Tcl', version)] diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb index e153ed3819..63e7f3be76 100644 --- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb @@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov toolchain = {'name': 'ictce', 'version': '4.0.6'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] dependencies = [('Tcl', version)] diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb index 92ba6db539..93b3e36dcc 100644 --- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb @@ -5,11 +5,10 @@ homepage = 'http://www.tcl.tk/' description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for building a graphical user interface (GUI) in many different programming languages.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] dependencies = [('Tcl', version)] diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb index fb3f5af8c8..2c8c0ace46 100644 --- a/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb @@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ["http://prdownloads.sourceforge.net/tcl"] -sources = ['%s%s-src.tar.gz' % (name.lower(), version)] +sources = ['%(namelower)s%(version)s-src.tar.gz'] dependencies = [('Tcl', version)] -- GitLab From 28d2e1d69acf785ff555ffc6b5e13f85f9ff082c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 23 Dec 2013 21:25:11 +0100 Subject: [PATCH 559/811] add checksum for WPS v3.5.1 source tarball, add an use alternative patch for WPS v3.5.1 --- .../w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb | 4 +- .../w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb | 4 +- ...S-3.5.1_netCDF-Fortran_seperate_path.patch | 71 +++++++++++++++++++ .../WPS_netCDF-Fortran_seperate_path.patch | 3 + 4 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb index db34226522..7981e0271c 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb @@ -11,8 +11,10 @@ toolchainopts = {'opt': True} sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] +# WPS v3.5.1 tarball was changed at some point, a previous version had checksum 0dd6b0b51321c836d3e60764f00ecb85 +checksums = ['ce0eb551d29e04f688e02d522d327c2c'] -patches = ['WPS_netCDF-Fortran_seperate_path.patch'] +patches = ['WPS-%(version)s_netCDF-Fortran_seperate_path.patch'] buildtype = "dmpar" versionsuffix = '-%s' % buildtype diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb index 66eecfdfed..f332d97a3e 100644 --- a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb @@ -11,8 +11,10 @@ toolchainopts = {'opt': True} sources = ['%(name)sV%(version)s.TAR.gz'] source_urls = ['http://www.mmm.ucar.edu/wrf/src/'] +# WPS v3.5.1 tarball was changed at some point, a previous version had checksum 0dd6b0b51321c836d3e60764f00ecb85 +checksums = ['ce0eb551d29e04f688e02d522d327c2c'] -patches = ['WPS_netCDF-Fortran_seperate_path.patch'] +patches = ['WPS-%(version)s_netCDF-Fortran_seperate_path.patch'] buildtype = "dmpar" versionsuffix = '-%s' % buildtype diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch b/easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch new file mode 100644 index 0000000000..a0a5dd6390 --- /dev/null +++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch @@ -0,0 +1,71 @@ +diff -ru WPS.orig/arch/Config.pl WPS/arch/Config.pl +--- WPS.orig/arch/Config.pl 2012-04-07 00:07:24.000000000 +0200 ++++ WPS/arch/Config.pl 2012-06-19 15:33:40.998567539 +0200 +@@ -36,6 +36,7 @@ + if(substr( $ARGV[0], 1, 8 ) eq "netcdff=") + { + $sw_netcdff_lib = substr( $ARGV[0], 9); ++ $sw_netcdff_lib =~ s/!/ /g ; + } + if(substr( $ARGV[0], 1, 6 ) eq "phdf5=") + { +diff -ru WPS.orig/configure WPS/configure +--- WPS.orig/configure 2012-04-07 00:07:19.000000000 +0200 ++++ WPS/configure 2012-06-19 15:34:35.543132843 +0200 +@@ -119,9 +119,14 @@ + echo "Will use NETCDF in dir: $NETCDF" + # for 3.6.2 and greater there might be a second library, libnetcdff.a . Check for this and use + # if available +- NETCDFF=" " +- if [ -f "$NETCDF/lib/libnetcdff.a" ] ; then +- NETCDFF="-lnetcdff" ++ USENETCDFF=" " ++ # for netCDF 4.2 and greater, the Fortran library is a seperate install ++ if [ -z "$NETCDFF" ] ++ then ++ NETCDFF=$NETCDF ++ fi ++ if [ -f "$NETCDFF/lib/libnetcdff.a" ] ; then ++ USENETCDFF="-L$NETCDFF/lib!-lnetcdff" + fi + else + echo "Will configure for use without NetCDF" +@@ -151,7 +156,7 @@ + fi + + # Found perl, so proceed with configuration +-perl arch/Config.pl -perl=$PERL -netcdf=$NETCDF -netcdff=$NETCDFF -os=$os -mach=$mach ++perl arch/Config.pl -perl=$PERL -netcdf=$NETCDF -netcdff=$USENETCDFF -os=$os -mach=$mach + + + #Checking cross-compiling capability for some particular environment +@@ -319,9 +324,9 @@ + end program + EOF + FFLAGS=`grep ^FFLAGS configure.wps | cut -d"=" -f2-` +- cp $NETCDF/include/netcdf.inc . ++ cp $NETCDFF/include/netcdf.inc . + FC=`grep ^SFC configure.wps | cut -d"=" -f2-` +- $FC ${FFLAGS} fort_netcdf.f -o fort_netcdf -L${NETCDF}/lib $NETCDFF -lnetcdf > /dev/null 2>&1 ++ $FC ${FFLAGS} fort_netcdf.f -o fort_netcdf -L${NETCDF}/lib -lnetcdf $USENETCDFF > /dev/null 2>&1 + if [ -f "fort_netcdf" ] ; then + fort_netcdf > /dev/null 2>&1 + if [ $? = 0 ]; then +Only in WPS: configure.wps +diff -ru WPS.orig/util/src/Makefile WPS/util/src/Makefile +--- WPS.orig/util/src/Makefile 2012-04-07 00:07:26.000000000 +0200 ++++ WPS/util/src/Makefile 2012-06-19 15:36:39.849421166 +0200 +@@ -40,11 +40,11 @@ + write_met_module.o misc_definitions_module.o met_data_module.o + $(SFC) $(LDFLAGS) -o $@ elev_angle.o cio.o module_debug.o gridinfo_module.o \ + write_met_module.o misc_definitions_module.o met_data_module.o \ +- -L$(NETCDF)/lib -I$(NETCDF)/include -lnetcdf ++ -L$(NETCDFF)/lib -I$(NETCDFF)/include -lnetcdff + + elev_angle.o: elev_angle.F cio.o module_debug.o gridinfo_module.o \ + write_met_module.o misc_definitions_module.o +- $(SFC) -c elev_angle.F -I$(NETCDF)/include ++ $(SFC) -c elev_angle.F -I$(NETCDFF)/include + + calc_ecmwf_p.exe: calc_ecmwf_p.o cio.o module_debug.o module_stringutil.o gridinfo_module.o read_met_module.o \ + write_met_module.o module_date_pack.o misc_definitions_module.o met_data_module.o constants_module.o diff --git a/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch b/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch index 7ffad44e63..d37050c60e 100644 --- a/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch +++ b/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch @@ -1,3 +1,6 @@ +patch file for 'old' WPS v3.5.1 tarball (with MD5 checksum 0dd6b0b51321c836d3e60764f00ecb85) +alternative patch available for last (?) version of v3.5.1 tarball (checksum ce0eb551d29e04f688e02d522d327c2c), +see WPS-3.5.1_netCDF-Fortran_seperate_path.patch diff -ru WPS.orig/arch/Config.pl WPS/arch/Config.pl --- WPS.orig/arch/Config.pl 2012-04-07 00:07:24.000000000 +0200 +++ WPS/arch/Config.pl 2012-06-19 15:33:40.998567539 +0200 -- GitLab From bff96ae3c876a230433d9cccd3e9854c08db9182 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 24 Dec 2013 08:56:18 +0100 Subject: [PATCH 560/811] fix FSL makefile patch for older versions --- .../f/FSL/FSL_makefile_fixes.patch | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch index c1313251ab..be5a449af7 100644 --- a/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch +++ b/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch @@ -28,8 +28,8 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -42,8 +42,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -56,8 +56,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.3/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -70,8 +70,8 @@ diff -ru fsl.orig/config/apple-darwin8-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -84,8 +84,8 @@ diff -ru fsl.orig/config/apple-darwin9-gcc4.0/systemvars.mk fsl/config/apple-dar -CC = cc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = CXXSTATICFLAGS = @@ -98,8 +98,8 @@ diff -ru fsl.orig/config/generic/systemvars.mk fsl/config/generic/systemvars.mk -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -112,8 +112,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.2/systemvars.mk fsl/config/i686-pc- -CC = gcc-2 -CXX = c++-2 -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -126,8 +126,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.3/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -140,8 +140,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.4/systemvars.mk fsl/config/i686-pc- -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -154,8 +154,8 @@ diff -ru fsl.orig/config/linux_32-gcc2.96/systemvars.mk fsl/config/linux_32-gcc2 -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -168,8 +168,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.2/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -182,8 +182,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.3/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -196,8 +196,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.4/systemvars.mk fsl/config/linux_32-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -210,8 +210,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.0/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -224,8 +224,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.1/systemvars.mk fsl/config/linux_32-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -238,8 +238,8 @@ diff -ru fsl.orig/config/linux_64-gcc3.4/systemvars.mk fsl/config/linux_64-gcc3. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -252,8 +252,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.0/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -266,8 +266,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.1/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -280,8 +280,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4. -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} CSTATICFLAGS = -static CXXSTATICFLAGS = -static @@ -294,8 +294,8 @@ diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer @@ -308,8 +308,8 @@ diff -ru fsl.orig/config/sparc-solaris2.9-gcc2.95/systemvars.mk fsl/config/sparc -CC = gcc -CXX = c++ -+CC = ${CC} -+CXX = ${CXX} ++CC := ${CC} ++CXX := ${CXX} ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer ARCHLDFLAGS = -static -- GitLab From c157d0df99aa890c21dac18f161dcd38048d2021 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 24 Dec 2013 08:57:09 +0100 Subject: [PATCH 561/811] disable parallel build for libunistring and PnMPI --- .../libunistring-0.9.3-goalf-1.1.0-no-OFED.eb | 12 +++++++----- .../libunistring/libunistring-0.9.3-goolf-1.4.10.eb | 12 +++++++----- .../libunistring/libunistring-0.9.3-ictce-4.0.6.eb | 12 +++++++----- .../libunistring/libunistring-0.9.3-ictce-5.3.0.eb | 13 +++++++------ .../p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb | 2 ++ 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb index 56bdff5bcc..b5efb81463 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb @@ -10,11 +10,13 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +parallel = 1 + sanity_check_paths = { - 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + - ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', - 'stdio', 'str', 'types', 'wbrk', 'width']], - 'dirs' : [], - } + 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + + ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', + 'stdio', 'str', 'types', 'wbrk', 'width']], + 'dirs' : [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb index 5a3efb3ea5..db896b93ea 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb @@ -9,11 +9,13 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] +parallel = 1 + sanity_check_paths = { - 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + - ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', - 'stdio', 'str', 'types', 'wbrk', 'width']], - 'dirs' : [], - } + 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + + ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', + 'stdio', 'str', 'types', 'wbrk', 'width']], + 'dirs' : [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb index dec6140666..5ef8c4a5c1 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb @@ -12,11 +12,13 @@ source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] patches = ['libunistring_icc_builtin_nan-inf.patch'] +parallel = 1 + sanity_check_paths = { - 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + - ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', - 'stdio', 'str', 'types', 'wbrk', 'width']], - 'dirs' : [], - } + 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + + ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', + 'stdio', 'str', 'types', 'wbrk', 'width']], + 'dirs' : [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb index 6c3d6347d8..363bc42025 100644 --- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb @@ -5,7 +5,6 @@ homepage = 'http://www.gnu.org/software/libunistring/' description = """This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCELOWER_TAR_GZ] @@ -13,11 +12,13 @@ source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()] patches = ['libunistring_icc_builtin_nan-inf.patch'] +parallel = 1 + sanity_check_paths = { - 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + - ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', - 'stdio', 'str', 'types', 'wbrk', 'width']], - 'dirs' : [], - } + 'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + + ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm', + 'stdio', 'str', 'types', 'wbrk', 'width']], + 'dirs' : [], +} moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb index e01b6e0e3b..3b3f47bdf1 100644 --- a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb @@ -25,6 +25,8 @@ builddependencies = [('CMake', '2.8.10.2')] configopts = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False' +parallel = 1 + sanity_check_paths = { 'files': ["bin/pnmpi-patch", "include/pnmpi.h", "lib/libpnmpi.a"], 'dirs': [], -- GitLab From 6348901125abf3b937c895c97df754a8fd89e87e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 24 Dec 2013 11:28:40 +0100 Subject: [PATCH 562/811] bump version to v1.10.0, update release notes --- RELEASE_NOTES | 38 ++++++++++++++++++++++++++++++++++++-- setup.py | 2 +- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index c93f9dee84..d843a5fb38 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,8 +1,42 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 1,939 easyconfig files, for 396 different software packages -and 27 different (compiler) toolchains. +The latest version of easybuild-easyconfig provides 2,203 easyconfig files, for 414 different software packages +and 29 different (compiler) toolchains. + +v1.10.0 (December 24th 2013) +---------------------------- + +feature + bugfix release +- added example easyconfig files for 18 new software packages: + BEDTools (#579, #632, #635), CAP3 (#548), CHARMM (#584), cutadapt (#620), ErlangOTP (#556, #630), + Ghostscript (#547, #632), HTSeq (#554, #632), Jansson (#545), libjpeg-turbo (#574), Molden (#566), + netloc (#545), o2scl (#633), packmol (#566), PP (#405), qtop (#500), TAMkin (#566), vsc-base (#621), + vsc-mympirun (#621) +- added easyconfigs for new toolchains (#545, #609, #629): + gcccuda/2.6.10, gompic/2.6.10, goolfc/2.6.10, ictce/6.0.5, ictce/6.1.5 +- added additional easyconfigs for various supported software packages: version updates, different toolchains, ... + - new versions of icc, ifort, imkl, impi (#609, #629) + - large collection of ictce/5.3.0 easyconfigs (#627) +- various enhancements, including: + - extended list of Python packages as extensions to Python (#625) + - add MPI-enabled version of GROMACS + easyconfigs using ictce (#606, #636) + - clean up templating of source_urls (#637) +- various bug fixes, including: + - provide alternative download URL for Mesa (#532) + - add Python versionsuffix in OpenBabel filenames (#566) + - apply no-gets patch in all M4 v1.4.16 easyconfigs (#623) + - fix patching of Python w.r.t. libffi/_ctypes issues (#625, #642) + - bug fixes in GROMACS easyconfigs (#606) + - change versionsuffix for non-MPI GROMACS easyconfigs to '-mt' + - stop using 'CMakeMake' easyblock for GROMACS now that there's a dedicated GROMACS easyblock, + which correctly specifies building against external BLAS/LAPACK libraries + - fix Qt dependency for CGAL (#642) + - fix libctl, libmatheval, Meep, PSI build issues caused by full paths in guile-config/python-config shebang (#642) + - make sure HDF easyconfigs specify dedicated 'include/hdf' include dir (#642) + - this is required to avoid build issues with NCL, because HDF ships it's own netcdf.h + - this also triggered removal of patch files for NCL that rewrote 'include/hdf' to 'include' + - fix WPS v3.5.1 patch file after upstream source tarball was changed, supply checksum for verification (#642) v1.9.0 (November 17th 2013) --------------------------- diff --git a/setup.py b/setup.py index 97ba63939b..76381703e5 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.10.0.0dev" +VERSION = "1.10.0.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 79e4661e8bc1e66a612fe43ed481daf59d0722ab Mon Sep 17 00:00:00 2001 From: "Fotis Georgatos (sw)" Date: Thu, 26 Dec 2013 09:01:34 +0100 Subject: [PATCH 563/811] fix osdependencies all along openmpi --- .../o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb | 9 ++++++++- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 6 +++++- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 7 +++++++ .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb | 7 +++++++ .../easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 9 ++++++++- .../o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb | 7 +++++++ 6 files changed, 42 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb index 1367d9607e..71cdbbcc12 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb @@ -10,10 +10,17 @@ toolchain = {'name': 'GCC', 'version': '4.6.3'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] +patches = ['pax_disable.patch'] + configopts = '--with-threads=posix --enable-shared --enable-mpi-threads --without-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path -patches = ['pax_disable.patch'] +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb index 64076b3027..85b6dde8be 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -20,7 +20,11 @@ configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading # needed for --with-openib -osdependencies = ['libibverbs-devel'] +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb index 5fc801a2be..cbf73cdc0f 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -16,6 +16,13 @@ configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] + sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb index d3b9362a3d..59774bf489 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb @@ -16,6 +16,13 @@ configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] + sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index f608c64f7f..143a8faa14 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -7,7 +7,7 @@ description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] builddependencies = [ ('Automake', '1.14'), @@ -21,6 +21,13 @@ configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] + sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh", diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb index 9198983666..56842b3577 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb @@ -23,6 +23,13 @@ configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support configopts += '--with-cuda=$CUDA_HOME ' # CUDA-aware build; N.B. --disable-dlopen is incompatible +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] + sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh", -- GitLab From 4a6815e35b942bdea3016602a768909c5a00f3b8 Mon Sep 17 00:00:00 2001 From: "Fotis Georgatos (sw)" Date: Thu, 26 Dec 2013 09:15:54 +0100 Subject: [PATCH 564/811] style fixes only on openmpi easyconfigs --- .../OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb | 2 +- .../o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb | 2 +- .../OpenMPI-1.6.3-iccifort-2011.13.367.eb | 22 +++++++++---------- .../o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb | 4 ++-- .../o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb | 4 ++-- .../o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 2 +- .../OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 2 +- .../OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb | 2 +- .../o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 4 ++-- .../o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb | 8 +++---- 12 files changed, 27 insertions(+), 29 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb index 71cdbbcc12..73ef15bd86 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb @@ -3,7 +3,7 @@ version = '1.4.5' versionsuffix = "-no-OFED" homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.6.3'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb index a35560d536..a2139d520b 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb @@ -2,7 +2,7 @@ name = 'OpenMPI' version = '1.4.5' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.6.3'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb index 91a35df405..bff6b7490b 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb @@ -2,7 +2,7 @@ name = 'OpenMPI' version = '1.6.3' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'iccifort', 'version': '2011.13.367'} @@ -23,16 +23,16 @@ else: osdependencies = ['libibverbs-devel'] sanity_check_paths = { - 'files':["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", - "mpi_f77" ,"mpi_f90", "mpi", - "ompitrace", "open-pal", - "open-rte", "otfaux", "otf", - "vt", "vt-hyb", "vt-mpi", - "vt-mpi-unify"]] + - ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", - "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs':["include/openmpi/ompi/mpi/cxx"], + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", + "mpi_f77" ,"mpi_f90", "mpi", + "ompitrace", "open-pal", + "open-rte", "otfaux", "otf", + "vt", "vt-hyb", "vt-mpi", + "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb index 398f18b92f..52eb8ff6cc 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb @@ -2,14 +2,14 @@ name = 'OpenMPI' version = '1.6.4' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] -dependencies = [ ('hwloc', '1.6.2') ] +dependencies = [('hwloc', '1.6.2')] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb index 7e234f5741..cf9dad4b2a 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb @@ -2,14 +2,14 @@ name = 'OpenMPI' version = '1.6.4' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.6.4'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] -dependencies = [ ('hwloc', '1.6.2') ] +dependencies = [('hwloc', '1.6.2')] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb index bf110b338b..68de1c855d 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb @@ -2,7 +2,7 @@ name = 'OpenMPI' version = '1.6.4' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.7.2'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb index 85b6dde8be..068dd27c21 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -2,7 +2,7 @@ name = 'OpenMPI' version = '1.6.5' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.7.2'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb index cbf73cdc0f..7e752c4b07 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -3,7 +3,7 @@ version = '1.6.5' versionsuffix = "-no-OFED" homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.7.3'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb index 59774bf489..d709fbb5ff 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb @@ -3,7 +3,7 @@ version = '1.6.5' versionsuffix = "-no-OFED" homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.8.1'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb index ec79b10f3d..de0682e622 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb @@ -2,7 +2,7 @@ name = 'OpenMPI' version = '1.6.5' homepage = 'http://www.open-mpi.org/' -description = "The Open MPI Project is an open source MPI-2 implementation." +description = """The Open MPI Project is an open source MPI-2 implementation.""" toolchain = {'name': 'GCC', 'version': '4.8.1'} diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index 143a8faa14..aade02796e 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -11,7 +11,7 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d builddependencies = [ ('Automake', '1.14'), - ('Autoconf', '2.69') + ('Autoconf', '2.69'), ] dependencies = [('hwloc', '1.7.2')] @@ -28,7 +28,7 @@ else: # OK for OS_NAME == redhat, fedora, RHEL, SL, centos osdependencies = ['libibverbs-devel'] -sanity_check_paths = { +sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb index 56842b3577..96444f2853 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb @@ -11,12 +11,10 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d builddependencies = [ ('Automake', '1.14'), - ('Autoconf', '2.69') + ('Autoconf', '2.69'), ] -dependencies = [ - ('hwloc', '1.8'), -] +dependencies = [('hwloc', '1.8')] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path @@ -30,7 +28,7 @@ else: # OK for OS_NAME == redhat, fedora, RHEL, SL, centos osdependencies = ['libibverbs-devel'] -sanity_check_paths = { +sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", -- GitLab From 7d3e6d2a1332ca6cd4ad09fb3d58216a5f5b8077 Mon Sep 17 00:00:00 2001 From: "Fotis Georgatos (sw)" Date: Thu, 26 Dec 2013 09:17:04 +0100 Subject: [PATCH 565/811] EBROOTHWLOC was missing from OpenMPI-1.6.3-iccifort-2011.13.367 --- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb index bff6b7490b..74075a91d5 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb @@ -11,7 +11,7 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path -configopts += '--with-hwloc ' # hwloc support +configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support dependencies = [('hwloc', '1.6')] -- GitLab From 272e939a1e46a4b55fd7c1bbcb8f9b30d5f33ab0 Mon Sep 17 00:00:00 2001 From: "Fotis Georgatos (sw)" Date: Thu, 26 Dec 2013 09:34:38 +0100 Subject: [PATCH 566/811] more style fixes --- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 2 +- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 2 +- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 2 +- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb index 74075a91d5..29c7e35106 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb @@ -32,7 +32,7 @@ sanity_check_paths = { "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb index 52eb8ff6cc..d58110e0fe 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb @@ -31,7 +31,7 @@ sanity_check_paths = { "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb index cf9dad4b2a..d4fafcf23d 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb @@ -31,7 +31,7 @@ sanity_check_paths = { "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb index 68de1c855d..4ac54724d3 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb @@ -31,7 +31,7 @@ sanity_check_paths = { "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb index 068dd27c21..8847c5f6f7 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -32,7 +32,7 @@ sanity_check_paths = { "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"] + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb index 7e752c4b07..b89b4422bf 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -31,7 +31,7 @@ sanity_check_paths = { "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb index d709fbb5ff..acd0faeafd 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb @@ -31,7 +31,7 @@ sanity_check_paths = { "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb index de0682e622..49dc60399c 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb @@ -30,7 +30,7 @@ sanity_check_paths = { "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index aade02796e..93d3cb6e28 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -36,7 +36,7 @@ sanity_check_paths = { "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"] + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb index 96444f2853..240afe49ec 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb @@ -35,7 +35,7 @@ sanity_check_paths = { "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], - 'dirs': ["include/openmpi/ompi/mpi/cxx"] + 'dirs': ["include/openmpi/ompi/mpi/cxx"], } moduleclass = 'mpi' -- GitLab From ad942ae28e3f99cfd87a09d692a1200b9899e755 Mon Sep 17 00:00:00 2001 From: "Fotis Georgatos (sw)" Date: Thu, 26 Dec 2013 09:38:02 +0100 Subject: [PATCH 567/811] fix shared_lib extensions --- easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb index 8847c5f6f7..d0eab128c4 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -28,7 +28,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.so" % (libfile) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], -- GitLab From 0e02c7835a40b623dc9c8ff7423004372b47d657 Mon Sep 17 00:00:00 2001 From: "Fotis Georgatos (sw)" Date: Thu, 26 Dec 2013 09:46:03 +0100 Subject: [PATCH 568/811] mroe style fixes --- .../o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb | 4 ++-- .../easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb | 4 ++-- .../o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb | 10 +++++----- .../o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb | 2 +- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb | 2 +- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 2 +- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb | 2 +- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb index 73ef15bd86..f366dc6b28 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb @@ -25,8 +25,8 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", - "mpi_f77", "mpi_f90", "mpi", - "open-pal", "open-rte"]], + "mpi_f77", "mpi_f90", + "mpi", "open-pal", "open-rte"]], 'dirs': ["include/openmpi/ompi/mpi/cxx"], } diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb index a2139d520b..26789b95ae 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb @@ -22,8 +22,8 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", - "mpi_f77", "mpi_f90", "mpi", - "open-pal", "open-rte"]], + "mpi_f77", "mpi_f90", + "mpi", "open-pal", "open-rte"]], 'dirs': ["include/openmpi/ompi/mpi/cxx"], } diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb index 29c7e35106..df8b6e8bef 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb @@ -25,11 +25,11 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", - "mpi_f77" ,"mpi_f90", "mpi", - "ompitrace", "open-pal", - "open-rte", "otfaux", "otf", - "vt", "vt-hyb", "vt-mpi", - "vt-mpi-unify"]] + + "mpi_f77", "mpi_f90", + "mpi", "ompitrace", "open-pal", + "otfaux", "otf", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", "mpif-mpi-io", "mpi", "mpi_portable_platform"]], 'dirs': ["include/openmpi/ompi/mpi/cxx"], diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb index d58110e0fe..ff863200f4 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb @@ -25,7 +25,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb index d4fafcf23d..053791e834 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb @@ -25,7 +25,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb index 4ac54724d3..fa3425f1ab 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb @@ -25,7 +25,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb index b89b4422bf..e7e5ad26b4 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -25,7 +25,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb index acd0faeafd..947361f584 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb @@ -25,7 +25,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb index 49dc60399c..fcea032966 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb @@ -24,7 +24,7 @@ else: sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + - ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] + -- GitLab From 73faee836dae3ad1fd3a4babd419677ea3ce223e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 27 Dec 2013 11:01:32 +0100 Subject: [PATCH 569/811] bump version to v1.11.0.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 76381703e5..98addcaa37 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.10.0.0" +VERSION = "1.11.0.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 08cc81190754703422bbf905c5b9e95983a6eab4 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 28 Dec 2013 15:33:42 +0100 Subject: [PATCH 570/811] depend on ncurses for Lua, drop patchfile Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb | 2 ++ easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb | 2 +- .../easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb | 2 +- .../l/Lua/lua-5.1.4.5_Makefile-static-linking.patch | 12 ------------ 4 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb index a877d56895..6089259852 100644 --- a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb @@ -14,6 +14,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = ['lua-%s.tar.gz' % version.replace('-', '.')] source_urls = ['http://sourceforge.net/projects/lmod/files/'] +dependencies = [('ncurses', '5.9')] + sanity_check_paths = { 'files': ["bin/lua"], 'dirs': [] diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb index 536d1c4346..88109be8ee 100644 --- a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb @@ -14,7 +14,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = ['lua-%s.tar.gz' % version.replace('-', '.')] source_urls = ['http://sourceforge.net/projects/lmod/files/'] -# patches = ['lua-5.1.4.5_Makefile-static-linking.patch'] # buggy on Debian? +dependencies = [('ncurses', '5.9')] sanity_check_paths = { 'files': ["bin/lua"], diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb index b5e1297c18..e8d1e81e0c 100644 --- a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb @@ -14,7 +14,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['lua-%s.tar.gz' % version.replace('-', '.')] source_urls = ['http://sourceforge.net/projects/lmod/files/'] -# patches = ['lua-5.1.4.5_Makefile-static-linking.patch'] # buggy on Debian? +dependencies = [('ncurses', '5.9')] sanity_check_paths = { 'files': ["bin/lua"], diff --git a/easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch b/easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch deleted file mode 100644 index 761bb38436..0000000000 --- a/easybuild/easyconfigs/l/Lua/lua-5.1.4.5_Makefile-static-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru lua-5.1.4.5.orig/lua/src/Makefile.in lua-5.1.4.5/lua/src/Makefile.in ---- lua-5.1.4.5.orig/lua/src/Makefile.in 2011-02-18 19:49:01.000000000 +0100 -+++ lua-5.1.4.5/lua/src/Makefile.in 2013-06-02 13:22:28.601496000 +0200 -@@ -98,7 +98,7 @@ - $(MAKE) all MYCFLAGS= - - linux: -- $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl @LIBS@ -lncurses" -+ $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -Wl,-Bstatic @LIBS@ -lncurses -Wl,-Bdynamic" - - macosx: - # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX -- GitLab From 6090e60d5669a7b800308320177389892756ce61 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 28 Dec 2013 15:40:59 +0100 Subject: [PATCH 571/811] ncurses-5.9-GCC-4.8.2 Signed-off-by: Fotis Georgatos --- .../n/ncurses/ncurses-5.9-GCC-4.8.2.eb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb new file mode 100644 index 0000000000..cd59ae4ab3 --- /dev/null +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb @@ -0,0 +1,15 @@ +name = 'ncurses' +version = '5.9' + +homepage = 'http://www.gnu.org/software/ncurses/' +description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, + and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and + function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = [GNU_SOURCE] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'devel' -- GitLab From c023e9aae7956c3798f7f14669f2a7d37091849c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 28 Dec 2013 15:48:41 +0100 Subject: [PATCH 572/811] remove sourceme for now Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/sourceme | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 easybuild/easyconfigs/l/Lmod/sourceme diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme deleted file mode 100644 index c0d80e79d7..0000000000 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ /dev/null @@ -1,23 +0,0 @@ -## Contributed by Fotis Georgatos , as means to help others wishing to ride on Lmod -# -# prereq: Lmod/5.2-GCC-4.8.2 - -## Remember to change the following, as per individual case -PREFIX=${PREFIX:-"$HOME/.local/easybuild"} -PREFIXLUA=$PREFIX/software/lua/5.1.4-5-GCC-4.8.2 -PREFIXLMOD=$PREFIX/software/Lmod/5.2-GCC-4.8.2/lmod/5.2 - -export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH - -## Uncommend this if things don't work as expected -# lua -v -# ls -las `which lua` -# ls -las $PREFIXLMOD/init/profile - -source $PREFIXLMOD/init/profile - -export PAGER=cat # Keep it simple, for a start -export LMOD_IGNORE_CACHE=OHYES # Keep it simple, for a start -export LMOD_COLORIZE=YES # YMMV - -echo 'Now, try fi. `module avail -d compiler` and observe output`' -- GitLab From 5af725163f44ab47b0d4abdc5c1fa7e22a152c84 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 28 Dec 2013 15:51:55 +0100 Subject: [PATCH 573/811] embed version inside file sanity check string Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb | 2 +- easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb index 5567974299..769d793890 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb @@ -15,7 +15,7 @@ source_urls = ['http://sourceforge.net/projects/lmod/files/'] dependencies = [("Lua", "5.1.4-5")] sanity_check_paths = { - 'files': ["lmod/%s/init/profile" % version], + 'files': ["lmod/%(version)s/init/profile"], 'dirs': [] } diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb index 37839b6a29..78f3f1e26b 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb @@ -15,7 +15,7 @@ source_urls = ['http://sourceforge.net/projects/lmod/files/'] dependencies = [("Lua", "5.1.4-5")] sanity_check_paths = { - 'files': ["lmod/%s/init/profile" % version], + 'files': ["lmod/%(version)s/init/profile"], 'dirs': [] } diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb index 113bfdc903..f386c53edb 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb @@ -15,7 +15,7 @@ source_urls = ['http://sourceforge.net/projects/lmod/files/'] dependencies = [("Lua", "5.1.4-5")] sanity_check_paths = { - 'files': ["lmod/%s/init/profile" % version], + 'files': ["lmod/%(version)s/init/profile"], 'dirs': [] } -- GitLab From 0d0e658bb38fd3f9605f662b7fb6d46bd18b5337 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 28 Dec 2013 20:26:34 +0100 Subject: [PATCH 574/811] tell about Ghostscript dependency Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb index 30ef74821b..df5338ee11 100644 --- a/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb @@ -23,7 +23,7 @@ dependencies = [ ('GEOS', '3.3.5'), ('Sphinx', '1.1.3', '-Python-2.7.3'), ('netCDF', '4.2.1.1'), - #('Ghostscript', '9.10'), + ('Ghostscript', '9.10'), ] separate_build_dir = True -- GitLab From d11c79feddd2c5cef36612fa63d65daf9ed2911b Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 30 Dec 2013 02:02:14 +0100 Subject: [PATCH 575/811] this fixes hpcugent/easybuild-easyblocks#189 Signed-off-by: Fotis Georgatos --- .../t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb index bb51694ffd..0704526b69 100644 --- a/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb +++ b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb @@ -1,7 +1,7 @@ ## # This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild # -# Copyright:: University of Luxembourg / LCSB +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine # Authors:: Fotis Georgatos # License:: MIT/GPL # $Id$ @@ -26,13 +26,14 @@ source_urls = ['http://developer.download.nvidia.com/compute/cuda/5_5/rel/nvml'] sanity_check_paths = { 'files': ["nvidia-healthmon/nvidia-healthmon", "nvidia-healthmon/nvidia-healthmon_x86"], - 'dirs': [] + 'dirs': ["nvml/lib", "nvml/lib64"] } modextrapaths = { 'PATH': ['nvidia-healthmon'], 'CPATH': ['nvml/include'], 'MANPATH': ['nvml/doc/man'], + 'LD_LIBRARY_PATH': ['nvml/lib', 'nvml/lib64'], } moduleclass = 'system' -- GitLab From 3dca13e09aee3b0f89a6174ea6394fe35f87ff43 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 30 Dec 2013 02:22:38 +0100 Subject: [PATCH 576/811] GNU_SOURCE for grep! Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb b/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb index c933f8d1ea..143a105005 100644 --- a/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb @@ -4,8 +4,8 @@ version = '2.15' description = "grep: GNU grep" homepage = 'http://www.gnu.org/software/grep/grep.html' +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_XZ] -source_urls = ['http://ftp.gnu.org/gnu/grep'] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb index c1f2292316..b449082b00 100644 --- a/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb @@ -4,8 +4,8 @@ version = '2.15' description = "grep: GNU grep" homepage = 'http://www.gnu.org/software/grep/grep.html' +source_urls = [GNU_SOURCE] sources = [SOURCELOWER_TAR_XZ] -source_urls = ['http://ftp.gnu.org/gnu/grep'] toolchain = {'name': 'ictce', 'version': '5.3.0'} -- GitLab From 26f174f0f3075cf4e02af5726a09f7618001e325 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 30 Dec 2013 02:31:53 +0100 Subject: [PATCH 577/811] GNU_SOURCE for sed, too! Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb index 1aa226aec4..03dbd2a52c 100644 --- a/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb @@ -4,8 +4,8 @@ version = '4.2.2' homepage = 'http://www.gnu.org/software/sed/sed.html' description = "sed: GNU implementation of sed, the POSIX stream editor" +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/sed'] toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb index cc1b5fc249..e36edb5e09 100644 --- a/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb @@ -4,8 +4,8 @@ version = '4.2.2' homepage = 'http://www.gnu.org/software/sed/sed.html' description = "sed: GNU implementation of sed, the POSIX stream editor" +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_BZ2] -source_urls = ['http://ftp.gnu.org/gnu/sed'] toolchain = {'name': 'ictce', 'version': '5.3.0'} -- GitLab From 81af4d60610e679ec90f10c131bc711bc45adcbb Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:32:30 +0100 Subject: [PATCH 578/811] Cython w. PYPI now Signed-off-by: Fotis Georgatos --- .../c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb index de9d824b0b..111c644bc1 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb index 666edc42c2..5bcaed9bfc 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb index 16232ee493..9f373a0235 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb index c638c7d869..0e90880443 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb index 7bab5be1c2..5b3b81efb9 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb index b3b3468120..cf243045a0 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb index ec5d60fe4e..5538d35119 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb index 3e23a5c022..91a404a0f3 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' -- GitLab From 8a81cc227ba2625d8399d555f7923713e08a6ddd Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:33:52 +0100 Subject: [PATCH 579/811] Greenlet w. PYPI_LOWER_SOURCE now Signed-off-by: Fotis Georgatos --- .../Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index d3d564e940..d24861f722 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -12,7 +12,7 @@ description = """The greenlet package is a spin-off of Stackless, a version of C toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_ZIP] python = "Python" diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb index 4de1c939b5..59de038289 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb @@ -12,7 +12,7 @@ scheduling; coroutines, in other words. This is useful when you want to control """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_ZIP] python = "Python" diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb index 5384581b45..079811b174 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb @@ -12,7 +12,7 @@ description = """The greenlet package is a spin-off of Stackless, a version of C toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_ZIP] python = "Python" diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb index 1091c7035e..49b94ba41f 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb @@ -10,10 +10,9 @@ description = """The greenlet package is a spin-off of Stackless, a version of C A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_ZIP] python = "Python" -- GitLab From 6ae0f9ebf47dd6143a131dd3b3ac5f09b150c75c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:35:12 +0100 Subject: [PATCH 580/811] HTSeq w. PYPI_SOURCE now Signed-off-by: Fotis Georgatos --- .../h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb | 2 +- .../h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb index a28674575c..b910000b2d 100644 --- a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb @@ -8,7 +8,7 @@ assays.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb index aa8a6d2d2b..efffff5904 100644 --- a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb +++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb @@ -8,7 +8,7 @@ assays.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' -- GitLab From 8606a7a12b091dacfc101b2dd719dbac00bdb346 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:36:24 +0100 Subject: [PATCH 581/811] Jinja2 w. PYPI_SOURCE now Signed-off-by: Fotis Georgatos --- .../j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 67edb41ff9..f06323716c 100644 --- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """Jinja2 is a template engine written in pure Python. It provides toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb index b0fb24dcaa..88fdc36fa5 100644 --- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb @@ -8,7 +8,7 @@ description = """Jinja2 is a template engine written in pure Python. It provides non-XML syntax but supports inline expressions and an optional sandboxed environment.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb index d75a46acae..4707146708 100644 --- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """Jinja2 is a template engine written in pure Python. It provides toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb index 26a5d5e158..a801441c8b 100644 --- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb @@ -7,10 +7,9 @@ homepage = "http://pypi.python.org/pypi/Jinja2" description = """Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" -- GitLab From a3f3477e7fa1142501596082f91790a8e9815777 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:38:36 +0100 Subject: [PATCH 582/811] PyZMQ w. PYPI_SOURCE now Signed-off-by: Fotis Georgatos --- .../PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb | 2 +- .../PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb | 2 +- .../p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb | 2 +- .../p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb | 2 +- .../p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb | 2 +- .../p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb | 2 +- .../p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb | 3 +-- .../p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb | 3 +-- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb index f39ba62b1d..1694442412 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb index e0f4d8199e..8a6e34d1b3 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb index d7b0dabc3f..6db7cc80f2 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb index 64d61708c2..f728d7a714 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb index b2c698d89a..445d81ad7b 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb index 63b8df0e9e..0cc338f4df 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb index 4f2003dfe2..bf37273528 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb @@ -4,10 +4,9 @@ version = '2.2.0.1' homepage = 'http://www.zeromq.org/bindings:python' description = """Python bindings for ZeroMQ""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb index 92979bea53..e2ded8178f 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb @@ -4,10 +4,9 @@ version = '2.2.0.1' homepage = 'http://www.zeromq.org/bindings:python' description = """Python bindings for ZeroMQ""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' -- GitLab From 91df020949cdff61944be5c2d716a244a70b7133 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:40:15 +0100 Subject: [PATCH 583/811] pandas & pysqlite w. PYPI_SOURCE now Signed-off-by: Fotis Georgatos --- .../p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb index 4c33987f04..350eeb2738 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ and data analysis tools for the Python programming language.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb index 1e3b66ee19..683efb783b 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,7 @@ and data analysis tools for the Python programming language.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb index 37af8a2699..9d8a5aeb67 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """pandas is an open source, BSD-licensed library providing high-p toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb index 92edc2ef94..cc1722a205 100644 --- a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """pysqlite is an interface to the SQLite 3.x embedded relational toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['https://pypi.python.org/packages/source/p/pysqlite/'] +source_urls = [PYPI_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb index bf06ddc40b..0f28dccf30 100644 --- a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """pysqlite is an interface to the SQLite 3.x embedded relational toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['https://pypi.python.org/packages/source/p/pysqlite/'] +source_urls = [PYPI_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' -- GitLab From 61bed3dff850cb2a3374483983f919e77fa62371 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:43:43 +0100 Subject: [PATCH 584/811] Shapely, Sphinx, scikit-learn w. PYPI_SOURCE now Signed-off-by: Fotis Georgatos --- .../Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb | 3 +-- .../s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb | 3 +-- .../scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb | 2 +- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 185f5d1c13..87deeb47fe 100644 --- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """Shapely is a BSD-licensed Python package for manipulation and a toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://pypi.python.org/packages/source/S/Shapely/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb index 11331141d5..758a4009e5 100644 --- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from wh toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/S/Shapely/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb index 2c659677e6..b6ecffc690 100644 --- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """Shapely is a BSD-licensed Python package for manipulation and a toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://pypi.python.org/packages/source/S/Shapely/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb index 22947cbeb8..8727c7a7cb 100644 --- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb @@ -7,10 +7,9 @@ homepage = 'http://toblerity.github.com/shapely/' description = """Shapely is a BSD-licensed Python package for manipulation and analysis of planar geometric objects. It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from which GEOS is ported) libraries.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/S/Shapely/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 00f2768036..b9a94e2e9e 100644 --- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -11,7 +11,7 @@ description = """Sphinx is a tool that makes it easy to create intelligent and b toolchain = {'name': "goalf", 'version': "1.1.0-no-OFED"} -source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"] +source_urls = [PYPI_SOURCE] sources = ["%s-%s.tar.gz" % (name.capitalize(), version)] python = "Python" diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb index ff5ff56c85..61173fdddd 100644 --- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb @@ -11,7 +11,7 @@ special support for other languages as well.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"] +source_urls = [PYPI_SOURCE] sources = ["%s-%s.tar.gz" % (name.capitalize(), version)] python = "Python" diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb index 2cbcf34b38..069dffe6d0 100644 --- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb @@ -11,7 +11,7 @@ description = """Sphinx is a tool that makes it easy to create intelligent and b toolchain = {'name': "ictce", 'version': "4.0.6"} -source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"] +source_urls = [PYPI_SOURCE] sources = ["%s-%s.tar.gz" % (name.capitalize(), version)] python = "Python" diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb index 29005c9cd9..300df5535f 100644 --- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb @@ -9,10 +9,9 @@ description = """Sphinx is a tool that makes it easy to create intelligent and b documentation of Python projects, but C/C++ is already supported as well, and it is planned to add special support for other languages as well.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"] +source_urls = [PYPI_SOURCE] sources = ["%s-%s.tar.gz" % (name.capitalize(), version)] python = "Python" diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 14d1f4a445..96310147cf 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -11,7 +11,7 @@ description = """Scikit-learn integrates machine learning algorithms in the tigh toolchain = {'version': '1.1.0-no-OFED', 'name': 'goalf'} -source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb index a4042b85f8..568e256fdc 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb @@ -10,7 +10,7 @@ description = """Scikit-learn integrates machine learning algorithms in the tigh toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb index d7ea94f316..e7e1f0c322 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb @@ -10,7 +10,7 @@ description = """Scikit-learn integrates machine learning algorithms in the tigh toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb index 4e7c9c3f6d..202d34e111 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb @@ -11,7 +11,7 @@ It strives to be simple and efficient, accessible to everybody, and reusable in toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb index d7df74419b..380fb7075a 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb @@ -10,8 +10,8 @@ it provides versatile tools for data mining and analysis in any field of science It strives to be simple and efficient, accessible to everybody, and reusable in various contexts.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" -- GitLab From fcf9e4433332edcfdb6bf26476f014743c225c26 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:45:05 +0100 Subject: [PATCH 585/811] Theano w. PYPI_SOURCE now Signed-off-by: Fotis Georgatos --- .../t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb | 4 ++-- .../t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 44f626558a..ee6e84d4ce 100644 --- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """Theano is a Python library that allows you to define, optimize, toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://pypi.python.org/packages/source/T/%s' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb index 5f6561beb5..7a155fde42 100644 --- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb @@ -5,11 +5,11 @@ version = '0.5.0' homepage = 'http://deeplearning.net/software/theano' description = """Theano is a Python library that allows you to define, optimize, and evaluate mathematical expressions -involving multi-dimensional arrays efficiently.""" + involving multi-dimensional arrays efficiently.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/T/%s' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb index 8d8afe9d71..65e1061c00 100644 --- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """Theano is a Python library that allows you to define, optimize, toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://pypi.python.org/packages/source/T/%s' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb index 4d3ea1e22e..7c1726a3af 100644 --- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb @@ -7,10 +7,9 @@ homepage = 'http://deeplearning.net/software/theano' description = """Theano is a Python library that allows you to define, optimize, and evaluate mathematical expressions involving multi-dimensional arrays efficiently.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/T/%s' % name] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' -- GitLab From 9d75f8a51319451ba733db0b1a72ff01a874df52 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 05:49:55 +0100 Subject: [PATCH 586/811] now use XORG_LIB_SOURCE everywhere needed Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb | 2 +- .../easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb index bffb063aa8..b9be2efae2 100644 --- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """X Inter-Client Exchange library for freedesktop.org""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb index e8b5e70adc..7c9daa8b70 100644 --- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb @@ -7,7 +7,7 @@ description = """X Inter-Client Exchange library for freedesktop.org""" toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb index 18f415d55b..50c2ca78b7 100644 --- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb @@ -7,7 +7,7 @@ description = """X Inter-Client Exchange library for freedesktop.org""" toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb index 2297d22ca5..16060206da 100644 --- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb @@ -8,7 +8,7 @@ description = """X11 Session Management library, which allows for applications t toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libICE', '1.0.8'), diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb index 61007b682e..87bf885311 100644 --- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb @@ -8,7 +8,7 @@ description = """X11 Session Management library, which allows for applications t toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libICE', '1.0.8'), diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb index a05cea05c8..d00cbdc986 100644 --- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb @@ -8,7 +8,7 @@ description = """X11 Session Management library, which allows for applications t toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libICE', '1.0.8'), diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb index 935f6ed825..cd12d86ab2 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """X11 client-side library""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] pythonversion = '-Python-2.7.3' builddependencies = [ diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb index 89cd7c6a13..eb5f4b8d24 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb @@ -7,7 +7,7 @@ description = """X11 client-side library""" toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] pythonversion = '-Python-2.7.3' builddependencies = [ diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb index 0213c75285..583a481c18 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb @@ -7,7 +7,7 @@ description = """X11 client-side library""" toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] pythonversion = '-Python-2.7.3' builddependencies = [ diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb index 7c2488c42c..7ce23e22cf 100644 --- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] sanity_check_paths = { 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']], diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb index a3ce0f8335..a284b7f633 100644 --- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] sanity_check_paths = { 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']], diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb index c5876f3234..7ed70c847e 100644 --- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] sanity_check_paths = { 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']], diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb index 5df92d968d..5ffb688011 100644 --- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libXmu', '1.1.2'), diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb index 9810ba8313..b762b2fc11 100644 --- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libXmu', '1.1.2'), diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb index 7c0ed45c9d..8cda879d73 100644 --- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libXmu', '1.1.2'), diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb index 579e7c6d82..5dc078bfb7 100644 --- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto','7.0.23'), diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb index 66aa620785..d4bdc634f3 100644 --- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto','7.0.23'), diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb index 0c0daa5834..7cc48ce5f8 100644 --- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto','7.0.23'), diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb index 6293ac9f70..5010d2aa95 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """X Fixes extension library""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('fixesproto', '5.0'), diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb index 4c40b8e475..20bf7b1717 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb @@ -7,7 +7,7 @@ description = """X Fixes extension library""" toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('fixesproto', '5.0'), diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb index 6bf02a2a5f..87f1ef0d39 100644 --- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb @@ -7,7 +7,7 @@ description = """X Fixes extension library""" toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('fixesproto', '5.0'), diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb index 4d4672394e..0c7011e540 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb @@ -7,7 +7,7 @@ description = """LibXi provides an X Window System client interface to the XINPU toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb index cbb0ad6be6..7eca8cceb1 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb @@ -7,7 +7,7 @@ description = """LibXi provides an X Window System client interface to the XINPU toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb index 4679a7f203..a0201585d7 100644 --- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb @@ -7,7 +7,7 @@ description = """LibXi provides an X Window System client interface to the XINPU toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('xproto', '7.0.23'), diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb index b4346e2304..fbf39423f6 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb index 464057cb9c..75249d51b9 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libXt', '1.1.4'), diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb index 9a94fcab36..80f4b6f066 100644 --- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libXt', '1.1.4'), diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb index 2c5ebf1f94..2f8d991632 100644 --- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] builddependencies = [ ('xextproto', '7.2.1'), diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb index 5675382c34..65798889ce 100644 --- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] builddependencies = [ ('xextproto', '7.2.1'), diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb index 29bafbff8b..406fdd8a08 100644 --- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] builddependencies = [ ('xextproto', '7.2.1'), diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb index ce7d81eb8d..9f8a24e641 100644 --- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] builddependencies = [('gettext', '0.18.2')] diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb index 1160baf2dd..d0a5514f82 100644 --- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] builddependencies = [('gettext', '0.18.2')] diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb index 08a43f1d0e..dcea15ec39 100644 --- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] builddependencies = [('gettext', '0.18.2')] diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb index ab2d4419aa..df76b64d5e 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libSM', '1.2.1'), diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb index a2b0f3bde8..b713972597 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libSM', '1.2.1'), diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb index 929c20cbe1..0a3a7d2857 100644 --- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] dependencies = [ ('libSM', '1.2.1'), diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb index 3772668400..bfc50f46f5 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] sanity_check_paths = { 'files' : ['include/X11/Xtrans/%s' % x for x in [ diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb index 8b232a5888..b8c63106bf 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb @@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] sanity_check_paths = { 'files' : ['include/X11/Xtrans/%s' % x for x in [ diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb index 11eabbd405..e8f54023d9 100644 --- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True} sources = [SOURCE_TAR_GZ] -source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] +source_urls = [XORG_LIB_SOURCE] sanity_check_paths = { 'files' : ['include/X11/Xtrans/%s' % x for x in [ -- GitLab From 8ea14fd02c3d2c29ed9a78e224f835691c552c4c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 2 Jan 2014 11:42:25 +0100 Subject: [PATCH 587/811] do not touch libreadline, good as-is Signed-off-by: Fotis Georgatos --- .../easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb | 2 +- .../l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb | 2 +- .../l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb | 2 +- .../l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb | 2 +- .../l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb | 2 +- .../l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb index 359b660e46..a7259b4047 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb index 18fe4059db..c6456b8f29 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb index b64442d4ef..feb61ceae0 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb @@ -10,7 +10,7 @@ and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [ ('ncurses', '5.9-20130406'), diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb index 7c6b657fe5..0e4e216088 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgoolf', 'version': '1.1.7'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb index 9dab8be0f9..49936bd7ae 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb index 0bf8fe1872..514d5f68e9 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb @@ -10,7 +10,7 @@ and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gmvolf', 'version': '1.7.12'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb index 1eebe810d9..c8968b6524 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb index a7db566606..8fa1ffa098 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb index 1c868a1400..9eb978ed07 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb index d3fdc7906c..a5b684453b 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb index 5740dd60f2..e31567fc06 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb index e93ffff0df..0d0a6e026e 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.0.10'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb index 438d259161..4a6a305128 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb index ad79306c27..6a60d2f1ee 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb index bc74b8856b..5b55aba61b 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb @@ -10,7 +10,7 @@ to recall and perhaps reedit those lines, and perform csh-like history expansion toolchain = {'name': 'ictce', 'version' : '5.2.0'} sources = ['readline-%s.tar.gz' % version] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] sanity_check_paths = { 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb index be1364c6ff..ed3ad6a0c3 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb index 5a97406731..dc37e974b3 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '5.5.0'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb index cc11d206f2..2d84a83e33 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iomkl', 'version': '4.6.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb index bb973d3cf6..119aab6646 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iqacml', 'version': '3.7.3'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb index 68860b70ee..d66c3236d5 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iqacml', 'version': '4.4.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [GNU_SOURCE] +source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] dependencies = [('ncurses', '5.9')] -- GitLab From 55bc9398ffc3754ec8ee0de402d533370ddf7366 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 5 Jan 2014 16:02:49 +0100 Subject: [PATCH 588/811] libreadline needed a bugfix, now should be ready Signed-off-by: Fotis Georgatos --- .../easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb | 2 +- .../l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb | 2 +- .../l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb | 2 +- .../l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb | 2 +- .../l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb | 2 +- .../l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb | 2 +- .../easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb index a7259b4047..b104105924 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb index c6456b8f29..08386dbd84 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb index feb61ceae0..5bc7206321 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb @@ -10,7 +10,7 @@ and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [ ('ncurses', '5.9-20130406'), diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb index 0e4e216088..ce9ce7a0dc 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'cgoolf', 'version': '1.1.7'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb index 49936bd7ae..4b179d3cea 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gmpolf', 'version': '1.4.8'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb index 514d5f68e9..4a3a76f70d 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb @@ -10,7 +10,7 @@ and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gmvolf', 'version': '1.7.12'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb index c8968b6524..04dfce7349 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9-20130406')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb index 8fa1ffa098..adb8107354 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb index 9eb978ed07..6829e60dce 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb index a5b684453b..9a72756a88 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb index e31567fc06..91a1a3db51 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb index 0d0a6e026e..ebff1e197f 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.0.10'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb index 4a6a305128..ec7c6dfb60 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.0.6'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb index 6a60d2f1ee..3edea96b6d 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '4.1.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb index 5b55aba61b..e77b116c77 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb @@ -10,7 +10,7 @@ to recall and perhaps reedit those lines, and perform csh-like history expansion toolchain = {'name': 'ictce', 'version' : '5.2.0'} sources = ['readline-%s.tar.gz' % version] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] sanity_check_paths = { 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb index ed3ad6a0c3..96c57993e7 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb index dc37e974b3..309a843372 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'ictce', 'version': '5.5.0'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb index 2d84a83e33..7ca5bdbcd1 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iomkl', 'version': '4.6.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb index 119aab6646..f197ec170b 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iqacml', 'version': '3.7.3'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb index d66c3236d5..e8897e4b13 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by toolchain = {'name': 'iqacml', 'version': '4.4.13'} sources = ['readline-%(version)s.tar.gz'] -source_urls = [http://ftp.gnu.org/gnu/%s % name.lower()] +source_urls = ['http://ftp.gnu.org/gnu/readline'] dependencies = [('ncurses', '5.9')] -- GitLab From abbe8f02e0c38cac9f7ccc670001066d9baaec02 Mon Sep 17 00:00:00 2001 From: pescobar Date: Tue, 7 Jan 2014 13:23:04 +0100 Subject: [PATCH 589/811] sickle-1.210-goolf-1.4.10.eb --- .../s/sickle/sickle-1.210-goolf-1.4.10.eb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb new file mode 100644 index 0000000000..6e253681ab --- /dev/null +++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb @@ -0,0 +1,28 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +easyblock='MakeCp' + +name = "sickle" +# version checked running "sickle --version" +version = "1.210" + +homepage = 'https://github.com/najoshi/sickle' +description = """ Windowed Adaptive Trimming for fastq files using quality """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['https://github.com/najoshi/sickle/archive/'] +# commit bab15f7d14b06400be37d50df7c092b1ec6fe0c5 +sources = ['bab15f7d14b06400be37d50df7c092b1ec6fe0c5.tar.gz'] + +files_to_copy = [(['sickle'], 'bin'), "README.md", "test"] + +sanity_check_paths = { + 'files': ['bin/sickle'], + 'dirs': [] + } + +moduleclass = 'bio' -- GitLab From 05381619c5a540eda2ae5e393c35cef7dad8d547 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 7 Jan 2014 17:35:49 +0100 Subject: [PATCH 590/811] CMake: updated to 2.8.12 with GCC 4.8.2 --- .../c/CMake/CMake-2.8.12-GCC-4.8.2.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb new file mode 100644 index 0000000000..3cd64959f9 --- /dev/null +++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb @@ -0,0 +1,20 @@ +name = 'CMake' +version = '2.8.12' + +homepage = 'http://www.cmake.org' +description = """CMake, the cross-platform, open-source build system. + CMake is a family of tools designed to build, test and package software.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From 64c8e7da35cfe937221aa0ce765ec863e4e2a1b3 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 7 Jan 2014 17:36:10 +0100 Subject: [PATCH 591/811] Clang: first attempt to easyconfig for 3.4 --- .../c/Clang/Clang-3.4-GCC-4.8.2.eb | 50 + ...tests-due-to-gcc-installation-prefix.patch | 927 ++++++++++++++++++ 2 files changed, 977 insertions(+) create mode 100644 easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb new file mode 100644 index 0000000000..875ec21d53 --- /dev/null +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb @@ -0,0 +1,50 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2013 Dmitri Gribenko, Ward Poelmans +# Authors:: Dmitri Gribenko +# Authors:: Ward Poelmans +# License:: GPLv2 or later, MIT, three-clause BSD. +# $Id$ +## + +name = "Clang" +version = "3.4" + +homepage = "http://clang.llvm.org/" +description = """C, C++, Objective-C compiler, based on LLVM. Does not + include C++ standard library -- use libstdc++ from GCC.""" + +# Clang also depends on libstdc++ during runtime, but this dependency is +# already specified as the toolchain. +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +source_urls = ["http://llvm.org/releases/%(version)s"] +sources = [ + "llvm-%(version)s.src.tar.gz", + "clang-%(version)s.src.tar.gz", + "compiler-rt-%(version)s.src.tar.gz", +] + +patches = [ + # Remove some tests that fail because of -DGCC_INSTALL_PREFIX. The issue is + # that hardcoded GCC_INSTALL_PREFIX overrides -sysroot. This probably breaks + # cross-compilation. + # http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130401/077539.html + 'Clang-%(version)s-failing-tests-due-to-gcc-installation-prefix.patch', +] + +builddependencies = [('CMake', '2.8.12')] + +sanity_check_paths = { + 'files': ['bin/clang', 'bin/clang++', 'lib/libclang.so', 'lib/clang/%(version)s/include/stddef.h'], + 'dirs': [], +} + +languages = ['c', 'c++'] + +moduleclass = 'compiler' + +assertions = False + +build_targets = ['X86'] diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch new file mode 100644 index 0000000000..a19a8d124f --- /dev/null +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch @@ -0,0 +1,927 @@ +diff -urN llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc +--- llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc 2013-10-17 13:18:11.000000000 +0200 ++++ llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc 2014-01-07 14:43:48.836815229 +0100 +@@ -223,10 +223,8 @@ + + #if SANITIZER_WORDSIZE == 64 + TEST(SanitizerCommon, SizeClassAllocator64GetBlockBegin) { +- SizeClassAllocatorGetBlockBeginStress(); + } + TEST(SanitizerCommon, SizeClassAllocator64CompactGetBlockBegin) { +- SizeClassAllocatorGetBlockBeginStress(); + } + TEST(SanitizerCommon, SizeClassAllocator32CompactGetBlockBegin) { + SizeClassAllocatorGetBlockBeginStress(); +@@ -324,7 +322,6 @@ + + #if SANITIZER_WORDSIZE == 64 + TEST(SanitizerCommon, SizeClassAllocator64Overflow) { +- EXPECT_DEATH(FailInAssertionOnOOM(), "Out of memory"); + } + #endif + +diff -urN llvm-3.4.orig/tools/clang/test/Driver/constructors.c llvm-3.4/tools/clang/test/Driver/constructors.c +--- llvm-3.4.orig/tools/clang/test/Driver/constructors.c 2012-11-22 00:40:23.000000000 +0100 ++++ llvm-3.4/tools/clang/test/Driver/constructors.c 2014-01-07 14:43:48.801815348 +0100 +@@ -5,28 +5,12 @@ + // CHECK-NO-INIT-ARRAY-NOT: -fuse-init-array + // + // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/fake_install_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s +-// +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ + // RUN: -fno-use-init-array \ + // RUN: -target i386-unknown-linux \ + // RUN: --sysroot=%S/Inputs/fake_install_tree \ + // RUN: | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s + // + // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -fno-use-init-array -fuse-init-array \ +-// RUN: -target i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/fake_install_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s +-// +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s +-// +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ + // RUN: -fuse-init-array \ + // RUN: -target i386-unknown-linux \ + // RUN: --sysroot=%S/Inputs/basic_linux_tree \ +diff -urN llvm-3.4.orig/tools/clang/test/Driver/gcc-version-debug.c llvm-3.4/tools/clang/test/Driver/gcc-version-debug.c +--- llvm-3.4.orig/tools/clang/test/Driver/gcc-version-debug.c 2013-08-15 00:10:17.000000000 +0200 ++++ llvm-3.4/tools/clang/test/Driver/gcc-version-debug.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,6 +0,0 @@ +-// RUN: %clang -v --target=i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree 2>&1 | FileCheck %s +- +-// CHECK: Found candidate GCC installation: {{.*}}Inputs{{.}}debian_multiarch_tree{{.}}usr{{.}}lib{{.}}gcc{{.}}i686-linux-gnu{{.}}4.5 +-// CHECK-NEXT: Found candidate GCC installation: {{.*}}Inputs{{.}}debian_multiarch_tree{{.}}usr{{.}}lib{{.}}gcc{{.}}x86_64-linux-gnu{{.}}4.5 +-// CHECK-NEXT: Selected GCC installation: {{.*}}Inputs{{.}}debian_multiarch_tree{{.}}usr{{.}}lib{{.}}gcc{{.}}i686-linux-gnu{{.}}4.5 +diff -urN llvm-3.4.orig/tools/clang/test/Driver/linux-header-search.cpp llvm-3.4/tools/clang/test/Driver/linux-header-search.cpp +--- llvm-3.4.orig/tools/clang/test/Driver/linux-header-search.cpp 2013-08-26 10:59:53.000000000 +0200 ++++ llvm-3.4/tools/clang/test/Driver/linux-header-search.cpp 1970-01-01 01:00:00.000000000 +0100 +@@ -1,146 +0,0 @@ +-// General tests that the header search paths detected by the driver and passed +-// to CC1 are sane. +-// +-// Test a very broken version of multiarch that shipped in Ubuntu 11.04. +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/ubuntu_11.04_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-11-04 %s +-// CHECK-UBUNTU-11-04: "{{.*}}clang{{.*}}" "-cc1" +-// CHECK-UBUNTU-11-04: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5" +-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/i686-linux-gnu" +-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/backward" +-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-UBUNTU-11-04: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-UBUNTU-11-04: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-UBUNTU-11-04: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target x86_64-unknown-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/ubuntu_13.04_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-13-04 %s +-// CHECK-UBUNTU-13-04: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-UBUNTU-13-04: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7" +-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7/backward" +-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/x86_64-linux-gnu/c++/4.7" +-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-UBUNTU-13-04: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-UBUNTU-13-04: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/x86_64-linux-gnu" +-// CHECK-UBUNTU-13-04: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-UBUNTU-13-04: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target arm-linux-gnueabihf \ +-// RUN: --sysroot=%S/Inputs/ubuntu_13.04_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-13-04-CROSS %s +-// CHECK-UBUNTU-13-04-CROSS: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-UBUNTU-13-04-CROSS: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/../../../../include/c++/4.7" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/../../../../include/c++/4.7/backward" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/../../../../include/arm-linux-gnueabihf/c++/4.7" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-UBUNTU-13-04-CROSS: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// +-// Test Ubuntu/Debian's new version of multiarch, with -m32. +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target x86_64-unknown-linux-gnu -m32 \ +-// RUN: --sysroot=%S/Inputs/ubuntu_13.04_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-13-04-M32 %s +-// CHECK-UBUNTU-13-04-M32: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-UBUNTU-13-04-M32: "-triple" "i386-unknown-linux-gnu" +-// CHECK-UBUNTU-13-04-M32: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7" +-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7/x86_64-linux-gnu/32" +-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7/backward" +-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/x86_64-linux-gnu/c++/4.7/32" +-// +-// Thoroughly exercise the Debian multiarch environment. +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target i686-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-X86 %s +-// CHECK-DEBIAN-X86: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-DEBIAN-X86: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../../include/c++/4.5" +-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../../include/c++/4.5/i686-linux-gnu" +-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../../include/c++/4.5/backward" +-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-DEBIAN-X86: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-DEBIAN-X86: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/i386-linux-gnu" +-// CHECK-DEBIAN-X86: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-DEBIAN-X86: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target x86_64-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-X86-64 %s +-// CHECK-DEBIAN-X86-64: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-DEBIAN-X86-64: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../../include/c++/4.5" +-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../../include/c++/4.5/x86_64-linux-gnu" +-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../../include/c++/4.5/backward" +-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-DEBIAN-X86-64: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-DEBIAN-X86-64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/x86_64-linux-gnu" +-// CHECK-DEBIAN-X86-64: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-DEBIAN-X86-64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target powerpc-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-PPC %s +-// CHECK-DEBIAN-PPC: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-DEBIAN-PPC: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../../include/c++/4.5" +-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../../include/c++/4.5/powerpc-linux-gnu" +-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../../include/c++/4.5/backward" +-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-DEBIAN-PPC: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-DEBIAN-PPC: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/powerpc-linux-gnu" +-// CHECK-DEBIAN-PPC: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-DEBIAN-PPC: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target powerpc64-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-PPC64 %s +-// CHECK-DEBIAN-PPC64: "{{[^"]*}}clang{{[^"]*}}" "-cc1" +-// CHECK-DEBIAN-PPC64: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../../include/c++/4.5" +-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../../include/c++/4.5/powerpc64-linux-gnu" +-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../../include/c++/4.5/backward" +-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-DEBIAN-PPC64: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-DEBIAN-PPC64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/powerpc64-linux-gnu" +-// CHECK-DEBIAN-PPC64: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-DEBIAN-PPC64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// +-// Test Gentoo's weirdness both before and after they changed it in their GCC +-// 4.6.4 release. +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target x86_64-unknown-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_4.6.2_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-GENTOO-4-6-2 %s +-// CHECK-GENTOO-4-6-2: "{{.*}}clang{{.*}}" "-cc1" +-// CHECK-GENTOO-4-6-2: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.2/include/g++-v4" +-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.2/include/g++-v4/x86_64-pc-linux-gnu" +-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.2/include/g++-v4/backward" +-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-GENTOO-4-6-2: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-GENTOO-4-6-2: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-GENTOO-4-6-2: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +-// RUN: -target x86_64-unknown-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_4.6.4_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-GENTOO-4-6-4 %s +-// CHECK-GENTOO-4-6-4: "{{.*}}clang{{.*}}" "-cc1" +-// CHECK-GENTOO-4-6-4: "-isysroot" "[[SYSROOT:[^"]+]]" +-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.4/include/g++-v4.6" +-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.4/include/g++-v4.6/x86_64-pc-linux-gnu" +-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.4/include/g++-v4.6/backward" +-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/local/include" +-// CHECK-GENTOO-4-6-4: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include" +-// CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/include" +-// CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" +diff -urN llvm-3.4.orig/tools/clang/test/Driver/linux-ld.c llvm-3.4/tools/clang/test/Driver/linux-ld.c +--- llvm-3.4.orig/tools/clang/test/Driver/linux-ld.c 2013-10-29 11:27:30.000000000 +0100 ++++ llvm-3.4/tools/clang/test/Driver/linux-ld.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,709 +0,0 @@ +-// General tests that ld invocations on Linux targets sane. Note that we use +-// sysroot to make these tests independent of the host system. +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-LD-32 %s +-// CHECK-LD-32-NOT: warning: +-// CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" +-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0" +-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib" +-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.." +-// CHECK-LD-32: "-L[[SYSROOT]]/lib" +-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-LD-64 %s +-// CHECK-LD-64-NOT: warning: +-// CHECK-LD-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-LD-64: "--eh-frame-hdr" +-// CHECK-LD-64: "-m" "elf_x86_64" +-// CHECK-LD-64: "-dynamic-linker" +-// CHECK-LD-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" +-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib" +-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.." +-// CHECK-LD-64: "-L[[SYSROOT]]/lib" +-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib" +-// CHECK-LD-64: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" +-// CHECK-LD-64: "-lc" +-// CHECK-LD-64: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux \ +-// RUN: -static-libgcc \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-LD-64-STATIC-LIBGCC %s +-// CHECK-LD-64-STATIC-LIBGCC-NOT: warning: +-// CHECK-LD-64-STATIC-LIBGCC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-LD-64-STATIC-LIBGCC: "--eh-frame-hdr" +-// CHECK-LD-64-STATIC-LIBGCC: "-m" "elf_x86_64" +-// CHECK-LD-64-STATIC-LIBGCC: "-dynamic-linker" +-// CHECK-LD-64-STATIC-LIBGCC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" +-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib" +-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.." +-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/lib" +-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib" +-// CHECK-LD-64-STATIC-LIBGCC: "-lgcc" "-lgcc_eh" +-// CHECK-LD-64-STATIC-LIBGCC: "-lc" +-// CHECK-LD-64-STATIC-LIBGCC: "-lgcc" "-lgcc_eh" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux \ +-// RUN: -static \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-LD-64-STATIC %s +-// CHECK-LD-64-STATIC-NOT: warning: +-// CHECK-LD-64-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-LD-64-STATIC-NOT: "--eh-frame-hdr" +-// CHECK-LD-64-STATIC: "-m" "elf_x86_64" +-// CHECK-LD-64-STATIC-NOT: "-dynamic-linker" +-// CHECK-LD-64-STATIC: "-static" +-// CHECK-LD-64-STATIC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbeginT.o" +-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib" +-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.." +-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/lib" +-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib" +-// CHECK-LD-64-STATIC: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group" +-// +-// Check that flags can be combined. The -static dominates. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux \ +-// RUN: -static-libgcc -static \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-LD-64-STATIC %s +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m32 \ +-// RUN: --sysroot=%S/Inputs/multilib_32bit_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-32-TO-32 %s +-// CHECK-32-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-32-TO-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib/../lib32" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../lib32" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/lib/../lib32" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/../lib32" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.." +-// CHECK-32-TO-32: "-L[[SYSROOT]]/lib" +-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m64 \ +-// RUN: --sysroot=%S/Inputs/multilib_32bit_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-32-TO-64 %s +-// CHECK-32-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-32-TO-64: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0/64{{/|\\\\}}crtbegin.o" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/64" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib/../lib64" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../lib64" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/lib/../lib64" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/../lib64" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.." +-// CHECK-32-TO-64: "-L[[SYSROOT]]/lib" +-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux -m64 \ +-// RUN: --sysroot=%S/Inputs/multilib_64bit_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-64-TO-64 %s +-// CHECK-64-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-64-TO-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib64" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib64" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/lib/../lib64" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/../lib64" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.." +-// CHECK-64-TO-64: "-L[[SYSROOT]]/lib" +-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux -m32 \ +-// RUN: --sysroot=%S/Inputs/multilib_64bit_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-64-TO-32 %s +-// CHECK-64-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-64-TO-32: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32{{/|\\\\}}crtbegin.o" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib32" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib32" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/lib/../lib32" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/../lib32" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.." +-// CHECK-64-TO-32: "-L[[SYSROOT]]/lib" +-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux -m32 \ +-// RUN: --gcc-toolchain=%S/Inputs/multilib_64bit_linux_tree/usr \ +-// RUN: --sysroot=%S/Inputs/multilib_32bit_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-64-TO-32-SYSROOT %s +-// CHECK-64-TO-32-SYSROOT: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-64-TO-32-SYSROOT: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32{{/|\\\\}}crtbegin.o" +-// CHECK-64-TO-32-SYSROOT: "-L{{[^"]*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32" +-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/lib/../lib32" +-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/usr/lib/../lib32" +-// CHECK-64-TO-32-SYSROOT: "-L{{[^"]*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/lib" +-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m32 \ +-// RUN: -ccc-install-dir %S/Inputs/fake_install_tree/bin \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-INSTALL-DIR-32 %s +-// CHECK-INSTALL-DIR-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-INSTALL-DIR-32: "{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0{{/|\\\\}}crtbegin.o" +-// CHECK-INSTALL-DIR-32: "-L{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0" +-// +-// Check that with 64-bit builds, we don't actually use the install directory +-// as its version of GCC is lower than our sysrooted version. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-unknown-linux -m64 \ +-// RUN: -ccc-install-dir %S/Inputs/fake_install_tree/bin \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-INSTALL-DIR-64 %s +-// CHECK-INSTALL-DIR-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-INSTALL-DIR-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" +-// CHECK-INSTALL-DIR-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0" +-// +-// Check that we support unusual patch version formats, including missing that +-// component. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m32 \ +-// RUN: -ccc-install-dir %S/Inputs/gcc_version_parsing1/bin \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION1 %s +-// CHECK-GCC-VERSION1: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-GCC-VERSION1: "{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7{{/|\\\\}}crtbegin.o" +-// CHECK-GCC-VERSION1: "-L{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m32 \ +-// RUN: -ccc-install-dir %S/Inputs/gcc_version_parsing2/bin \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION2 %s +-// CHECK-GCC-VERSION2: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-GCC-VERSION2: "{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x{{/|\\\\}}crtbegin.o" +-// CHECK-GCC-VERSION2: "-L{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m32 \ +-// RUN: -ccc-install-dir %S/Inputs/gcc_version_parsing3/bin \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION3 %s +-// CHECK-GCC-VERSION3: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-GCC-VERSION3: "{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5{{/|\\\\}}crtbegin.o" +-// CHECK-GCC-VERSION3: "-L{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux -m32 \ +-// RUN: -ccc-install-dir %S/Inputs/gcc_version_parsing4/bin \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-GCC-VERSION4 %s +-// CHECK-GCC-VERSION4: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-GCC-VERSION4: "{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99{{/|\\\\}}crtbegin.o" +-// CHECK-GCC-VERSION4: "-L{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99" +-// +-// Test a very broken version of multiarch that shipped in Ubuntu 11.04. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-unknown-linux \ +-// RUN: --sysroot=%S/Inputs/ubuntu_11.04_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-11-04 %s +-// CHECK-UBUNTU-11-04: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-11-04: "{{.*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5" +-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../i386-linux-gnu" +-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu" +-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.." +-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/lib" +-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib" +-// +-// Check multi arch support on Ubuntu 12.04 LTS. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-unknown-linux-gnueabihf \ +-// RUN: --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM-HF %s +-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crt1.o" +-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crti.o" +-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3{{/|\\\\}}crtbegin.o" +-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3" +-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf" +-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/lib/arm-linux-gnueabihf" +-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/arm-linux-gnueabihf" +-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../.." +-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3{{/|\\\\}}crtend.o" +-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crtn.o" +-// +-// Check Ubuntu 13.10 on x86-64 targeting arm-linux-gnueabihf. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-gnueabihf \ +-// RUN: --sysroot=%S/Inputs/x86-64_ubuntu_13.10 \ +-// RUN: | FileCheck --check-prefix=CHECK-X86-64-UBUNTU-13-10-ARM-HF %s +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-dynamic-linker" "/lib/ld-linux-armhf.so.3" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib{{/|\\\\}}crt1.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib{{/|\\\\}}crti.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8{{/|\\\\}}crtbegin.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/lib/../lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/../lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8{{/|\\\\}}crtend.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib{{/|\\\\}}crtn.o" +-// +-// Check Ubuntu 13.10 on x86-64 targeting arm-linux-gnueabi. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-gnueabi \ +-// RUN: --sysroot=%S/Inputs/x86-64_ubuntu_13.10 \ +-// RUN: | FileCheck --check-prefix=CHECK-X86-64-UBUNTU-13-10-ARM %s +-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "-dynamic-linker" "/lib/ld-linux.so.3" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib{{/|\\\\}}crt1.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib{{/|\\\\}}crti.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7{{/|\\\\}}crtbegin.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabi/4.7" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/lib/../lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/../lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7{{/|\\\\}}crtend.o" +-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib{{/|\\\\}}crtn.o" +-// +-// Check fedora 18 on arm. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=armv7-unknown-linux-gnueabihf \ +-// RUN: --sysroot=%S/Inputs/fedora_18_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-FEDORA-18-ARM-HF %s +-// CHECK-FEDORA-18-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib{{/|\\\\}}crt1.o" +-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib{{/|\\\\}}crti.o" +-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2{{/|\\\\}}crtbegin.o" +-// CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2" +-// CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib" +-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2{{/|\\\\}}crtend.o" +-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib{{/|\\\\}}crtn.o" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-unknown-linux-gnueabi \ +-// RUN: --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM %s +-// CHECK-UBUNTU-12-04-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crt1.o" +-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crti.o" +-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1{{/|\\\\}}crtbegin.o" +-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1" +-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi" +-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/lib/arm-linux-gnueabi" +-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/arm-linux-gnueabi" +-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../.." +-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1{{/|\\\\}}crtend.o" +-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crtn.o" +-// +-// Test the setup that shipped in SUSE 10.3 on ppc64. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=powerpc64-suse-linux \ +-// RUN: --sysroot=%S/Inputs/suse_10.3_ppc64_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-SUSE-10-3-PPC64 %s +-// CHECK-SUSE-10-3-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-SUSE-10-3-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64{{/|\\\\}}crtbegin.o" +-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64" +-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/../../../../lib64" +-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/lib/../lib64" +-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/../lib64" +-// +-// Check dynamic-linker for different archs +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-gnueabi \ +-// RUN: | FileCheck --check-prefix=CHECK-ARM %s +-// CHECK-ARM: "{{.*}}ld{{(.exe)?}}" +-// CHECK-ARM: "-m" "armelf_linux_eabi" +-// CHECK-ARM: "-dynamic-linker" "{{.*}}/lib/ld-linux.so.3" +-// +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-gnueabihf \ +-// RUN: | FileCheck --check-prefix=CHECK-ARM-HF %s +-// CHECK-ARM-HF: "{{.*}}ld{{(.exe)?}}" +-// CHECK-ARM-HF: "-m" "armelf_linux_eabi" +-// CHECK-ARM-HF: "-dynamic-linker" "{{.*}}/lib/ld-linux-armhf.so.3" +-// +-// Check that we do not pass --hash-style=gnu and --hash-style=both to linker +-// and provide correct path to the dynamic linker and emulation mode when build +-// for MIPS platforms. +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips-linux-gnu \ +-// RUN: | FileCheck --check-prefix=CHECK-MIPS %s +-// CHECK-MIPS: "{{.*}}ld{{(.exe)?}}" +-// CHECK-MIPS: "-m" "elf32btsmip" +-// CHECK-MIPS: "-dynamic-linker" "{{.*}}/lib/ld.so.1" +-// CHECK-MIPS-NOT: "--hash-style={{gnu|both}}" +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-gnu \ +-// RUN: | FileCheck --check-prefix=CHECK-MIPSEL %s +-// CHECK-MIPSEL: "{{.*}}ld{{(.exe)?}}" +-// CHECK-MIPSEL: "-m" "elf32ltsmip" +-// CHECK-MIPSEL: "-dynamic-linker" "{{.*}}/lib/ld.so.1" +-// CHECK-MIPSEL-NOT: "--hash-style={{gnu|both}}" +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64-linux-gnu \ +-// RUN: | FileCheck --check-prefix=CHECK-MIPS64 %s +-// CHECK-MIPS64: "{{.*}}ld{{(.exe)?}}" +-// CHECK-MIPS64: "-m" "elf64btsmip" +-// CHECK-MIPS64: "-dynamic-linker" "{{.*}}/lib64/ld.so.1" +-// CHECK-MIPS64-NOT: "--hash-style={{gnu|both}}" +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64el-linux-gnu \ +-// RUN: | FileCheck --check-prefix=CHECK-MIPS64EL %s +-// CHECK-MIPS64EL: "{{.*}}ld{{(.exe)?}}" +-// CHECK-MIPS64EL: "-m" "elf64ltsmip" +-// CHECK-MIPS64EL: "-dynamic-linker" "{{.*}}/lib64/ld.so.1" +-// CHECK-MIPS64EL-NOT: "--hash-style={{gnu|both}}" +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64-linux-gnu -mabi=n32 \ +-// RUN: | FileCheck --check-prefix=CHECK-MIPS64-N32 %s +-// CHECK-MIPS64-N32: "{{.*}}ld{{(.exe)?}}" +-// CHECK-MIPS64-N32: "-m" "elf32btsmipn32" +-// CHECK-MIPS64-N32: "-dynamic-linker" "{{.*}}/lib32/ld.so.1" +-// CHECK-MIPS64-N32-NOT: "--hash-style={{gnu|both}}" +-// RUN: %clang %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64el-linux-gnu -mabi=n32 \ +-// RUN: | FileCheck --check-prefix=CHECK-MIPS64EL-N32 %s +-// CHECK-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" +-// CHECK-MIPS64EL-N32: "-m" "elf32ltsmipn32" +-// CHECK-MIPS64EL-N32: "-dynamic-linker" "{{.*}}/lib32/ld.so.1" +-// CHECK-MIPS64EL-N32-NOT: "--hash-style={{gnu|both}}" +-// +-// Thoroughly exercise the Debian multiarch environment. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i686-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-X86 %s +-// CHECK-DEBIAN-X86: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-X86: "{{.*}}/usr/lib/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5" +-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../i386-linux-gnu" +-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu" +-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=x86_64-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-X86-64 %s +-// CHECK-DEBIAN-X86-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-X86-64: "{{.*}}/usr/lib/gcc/x86_64-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5" +-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../x86_64-linux-gnu" +-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/x86_64-linux-gnu" +-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=powerpc-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-PPC %s +-// CHECK-DEBIAN-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-PPC: "{{.*}}/usr/lib/gcc/powerpc-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5" +-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../powerpc-linux-gnu" +-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/powerpc-linux-gnu" +-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=powerpc64-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-PPC64 %s +-// CHECK-DEBIAN-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5" +-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../powerpc64-linux-gnu" +-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/powerpc64-linux-gnu" +-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS %s +-// CHECK-DEBIAN-MIPS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-MIPS: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5" +-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../../mips-linux-gnu" +-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/mips-linux-gnu" +-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPSEL %s +-// CHECK-DEBIAN-MIPSEL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5" +-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../../mipsel-linux-gnu" +-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/mipsel-linux-gnu" +-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64 %s +-// CHECK-DEBIAN-MIPS64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-MIPS64: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/64{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/64" +-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5" +-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64el-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64EL %s +-// CHECK-DEBIAN-MIPS64EL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/64{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/64" +-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5" +-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64-linux-gnu -mabi=n32 \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64-N32 %s +-// CHECK-DEBIAN-MIPS64-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-MIPS64-N32: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/n32{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/n32" +-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5" +-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64el-linux-gnu -mabi=n32 \ +-// RUN: --sysroot=%S/Inputs/debian_multiarch_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64EL-N32 %s +-// CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/n32{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/n32" +-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5" +-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.." +-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib" +-// +-// Test linker invocation on Android. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-androideabi \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s +-// CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o" +-// CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib" +-// CHECK-ANDROID-NOT: "gcc_s" +-// CHECK-ANDROID: "-lgcc" +-// CHECK-ANDROID: "-ldl" +-// CHECK-ANDROID-NOT: "gcc_s" +-// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-androideabi \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -shared \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -shared \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -shared \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -shared \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s +-// CHECK-ANDROID-SO: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-ANDROID-SO: "-Bsymbolic" +-// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtbegin_so.o" +-// CHECK-ANDROID-SO: "-L[[SYSROOT]]/usr/lib" +-// CHECK-ANDROID-SO-NOT: "gcc_s" +-// CHECK-ANDROID-SO: "-lgcc" +-// CHECK-ANDROID-SO: "-ldl" +-// CHECK-ANDROID-SO-NOT: "gcc_s" +-// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtend_so.o" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-androideabi \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -static \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -static \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -static \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -static \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s +-// CHECK-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtbegin_static.o" +-// CHECK-ANDROID-STATIC: "-L[[SYSROOT]]/usr/lib" +-// CHECK-ANDROID-STATIC-NOT: "gcc_s" +-// CHECK-ANDROID-STATIC: "-lgcc" +-// CHECK-ANDROID-STATIC-NOT: "-ldl" +-// CHECK-ANDROID-STATIC-NOT: "gcc_s" +-// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtend_android.o" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-androideabi \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -pie \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=arm-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -pie \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -pie \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=i386-linux-android \ +-// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +-// RUN: -pie \ +-// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s +-// CHECK-ANDROID-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o" +-// CHECK-ANDROID-PIE: "-L[[SYSROOT]]/usr/lib" +-// CHECK-ANDROID-PIE-NOT: "gcc_s" +-// CHECK-ANDROID-PIE: "-lgcc" +-// CHECK-ANDROID-PIE-NOT: "gcc_s" +-// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtend_android.o" +-// +-// Check linker invocation on Debian 6 MIPS 32/64-bit. +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mipsel-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_6_mips_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPSEL %s +-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib{{/|\\\\}}crt1.o" +-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib{{/|\\\\}}crti.o" +-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4" +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib" +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/lib/../lib" +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/../lib" +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../.." +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64el-linux-gnu \ +-// RUN: --sysroot=%S/Inputs/debian_6_mips_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPS64EL %s +-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64{{/|\\\\}}crt1.o" +-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64{{/|\\\\}}crti.o" +-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/64{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/64" +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64" +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/lib/../lib64" +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/../lib64" +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../.." +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib" +-// +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=mips64el-linux-gnu -mabi=n32 \ +-// RUN: --sysroot=%S/Inputs/debian_6_mips_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPS64EL-N32 %s +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32{{/|\\\\}}crt1.o" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32{{/|\\\\}}crti.o" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/n32{{/|\\\\}}crtbegin.o" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/n32" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/lib/../lib32" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/../lib32" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../.." +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/lib" +-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib" +-// +-// Test linker invocation for Freescale SDK (OpenEmbedded). +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=powerpc-fsl-linux \ +-// RUN: --sysroot=%S/Inputs/freescale_ppc_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-FSL-PPC %s +-// CHECK-FSL-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-FSL-PPC: "-m" "elf32ppclinux" +-// CHECK-FSL-PPC: "{{.*}}{{/|\\\\}}crt1.o" +-// CHECK-FSL-PPC: "{{.*}}{{/|\\\\}}crtbegin.o" +-// CHECK-FSL-PPC: "-L[[SYSROOT]]/usr/lib" +-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +-// RUN: --target=powerpc64-fsl-linux \ +-// RUN: --sysroot=%S/Inputs/freescale_ppc64_tree \ +-// RUN: | FileCheck --check-prefix=CHECK-FSL-PPC64 %s +-// CHECK-FSL-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +-// CHECK-FSL-PPC64: "-m" "elf64ppc" +-// CHECK-FSL-PPC64: "{{.*}}{{/|\\\\}}crt1.o" +-// CHECK-FSL-PPC64: "{{.*}}{{/|\\\\}}crtbegin.o" +-// CHECK-FSL-PPC64: "-L[[SYSROOT]]/usr/lib64/powerpc64-fsl-linux/4.6.2/../.." +-// +-// Check that crtfastmath.o is linked with -ffast-math. +-// RUN: %clang --target=x86_64-unknown-linux -### %s \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s +-// RUN: %clang --target=x86_64-unknown-linux -### %s -ffast-math \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH %s +-// RUN: %clang --target=x86_64-unknown-linux -### %s -funsafe-math-optimizations\ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH %s +-// RUN: %clang --target=x86_64-unknown-linux -### %s -ffast-math -fno-fast-math \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s +-// We don't have crtfastmath.o in the i386 tree, use it to check that file +-// detection works. +-// RUN: %clang --target=i386-unknown-linux -### %s -ffast-math \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s +-// CHECK-CRTFASTMATH: usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtfastmath.o +-// CHECK-NOCRTFASTMATH-NOT: crtfastmath.o +- +-// Check that we link in gcrt1.o when compiling with -pg +-// RUN: %clang -pg --target=x86_64-unknown-linux -### %s \ +-// RUN: --sysroot=%S/Inputs/basic_linux_tree 2>& 1 \ +-// RUN: | FileCheck --check-prefix=CHECK-PG %s +-// CHECK-PG: gcrt1.o -- GitLab From 69a9424744f61a9a2ad33fac61855a25c6110913 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 8 Jan 2014 20:12:42 +0100 Subject: [PATCH 592/811] commit 7 digit truncation. 4 spaces identation --- .../easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb index 6e253681ab..452b13483b 100644 --- a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb @@ -14,15 +14,15 @@ description = """ Windowed Adaptive Trimming for fastq files using quality """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['https://github.com/najoshi/sickle/archive/'] # commit bab15f7d14b06400be37d50df7c092b1ec6fe0c5 -sources = ['bab15f7d14b06400be37d50df7c092b1ec6fe0c5.tar.gz'] +git_commit_id = 'bab15f7' +sources = ['%(git_commit_id)s.tar.gz'] +source_urls = ['https://github.com/najoshi/sickle/archive/'] files_to_copy = [(['sickle'], 'bin'), "README.md", "test"] sanity_check_paths = { - 'files': ['bin/sickle'], - 'dirs': [] - } + 'files': ['bin/sickle'], + 'dirs': [] moduleclass = 'bio' -- GitLab From a46603394317d9c3b4a5906971469fd92817769f Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 8 Jan 2014 20:21:16 +0100 Subject: [PATCH 593/811] fixed syntax error unclosed brace --- easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb index 452b13483b..3a7270ebbe 100644 --- a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb @@ -24,5 +24,6 @@ files_to_copy = [(['sickle'], 'bin'), "README.md", "test"] sanity_check_paths = { 'files': ['bin/sickle'], 'dirs': [] +} moduleclass = 'bio' -- GitLab From 70dff1dd9b3ad1ed75aa413f4491453bf09306c5 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 8 Jan 2014 20:42:29 +0100 Subject: [PATCH 594/811] fix --- easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb index 3a7270ebbe..05d1518a05 100644 --- a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb @@ -16,7 +16,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} # commit bab15f7d14b06400be37d50df7c092b1ec6fe0c5 git_commit_id = 'bab15f7' -sources = ['%(git_commit_id)s.tar.gz'] +sources = ['%s.tar.gz' % git_commit_id] source_urls = ['https://github.com/najoshi/sickle/archive/'] files_to_copy = [(['sickle'], 'bin'), "README.md", "test"] -- GitLab From 3987e40c4618fd649470b1ba5d26e2aadd6391d9 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 8 Jan 2014 23:11:28 +0100 Subject: [PATCH 595/811] added versionsuffix=git_commit_id as @fgeorgatos suggested --- easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb index 05d1518a05..a224586986 100644 --- a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb @@ -8,14 +8,15 @@ easyblock='MakeCp' name = "sickle" # version checked running "sickle --version" version = "1.210" +# git_commit_id bab15f7d14b06400be37d50df7c092b1ec6fe0c5 +versionsuffix = "bab15f7" homepage = 'https://github.com/najoshi/sickle' description = """ Windowed Adaptive Trimming for fastq files using quality """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -# commit bab15f7d14b06400be37d50df7c092b1ec6fe0c5 -git_commit_id = 'bab15f7' +git_commit_id = versionsuffix sources = ['%s.tar.gz' % git_commit_id] source_urls = ['https://github.com/najoshi/sickle/archive/'] -- GitLab From fb453ae206363bbb57a3adc287494d7c07d80fd5 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 9 Jan 2014 10:57:11 +0100 Subject: [PATCH 596/811] Clang: disable optarch, this cause the build to fail --- easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb index 875ec21d53..c131647d76 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb @@ -18,6 +18,8 @@ description = """C, C++, Objective-C compiler, based on LLVM. Does not # Clang also depends on libstdc++ during runtime, but this dependency is # already specified as the toolchain. toolchain = {'name': 'GCC', 'version': '4.8.2'} +# Do not set optarch to True: it will cause the build to fail +toolchainopts = {'optarch': False} source_urls = ["http://llvm.org/releases/%(version)s"] sources = [ @@ -41,8 +43,6 @@ sanity_check_paths = { 'dirs': [], } -languages = ['c', 'c++'] - moduleclass = 'compiler' assertions = False -- GitLab From c3fed1774f451a726f26e819ead15bd7cdfd1ecb Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 9 Jan 2014 12:37:49 +0100 Subject: [PATCH 597/811] Clang: reorganized patches for clang-3.4 --- .../Clang-3.4-failing-sanitizer-tests.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch new file mode 100644 index 0000000000..bc991f2275 --- /dev/null +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch @@ -0,0 +1,24 @@ +# these tests fail for unknown reason: as they are part of the sanitizers in clang, +# I don't think that we should be worried about them. +diff -urN llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc +--- llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc 2013-10-17 13:18:11.000000000 +0200 ++++ llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc 2014-01-07 14:43:48.836815229 +0100 +@@ -223,10 +223,8 @@ + + #if SANITIZER_WORDSIZE == 64 + TEST(SanitizerCommon, SizeClassAllocator64GetBlockBegin) { +- SizeClassAllocatorGetBlockBeginStress(); + } + TEST(SanitizerCommon, SizeClassAllocator64CompactGetBlockBegin) { +- SizeClassAllocatorGetBlockBeginStress(); + } + TEST(SanitizerCommon, SizeClassAllocator32CompactGetBlockBegin) { + SizeClassAllocatorGetBlockBeginStress(); +@@ -324,7 +322,6 @@ + + #if SANITIZER_WORDSIZE == 64 + TEST(SanitizerCommon, SizeClassAllocator64Overflow) { +- EXPECT_DEATH(FailInAssertionOnOOM(), "Out of memory"); + } + #endif + -- GitLab From 4e99c83f5ef696269d9f56fc7ff84693f7f1897b Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 9 Jan 2014 12:45:18 +0100 Subject: [PATCH 598/811] Clang: reorganize the patches correctly --- .../c/Clang/Clang-3.4-GCC-4.8.2.eb | 1 + ...tests-due-to-gcc-installation-prefix.patch | 22 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb index c131647d76..b1cd63b2ee 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb @@ -34,6 +34,7 @@ patches = [ # cross-compilation. # http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130401/077539.html 'Clang-%(version)s-failing-tests-due-to-gcc-installation-prefix.patch', + 'Clang-%(version)s-failing-sanitizer-tests.patch', ] builddependencies = [('CMake', '2.8.12')] diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch index a19a8d124f..46114f93d7 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch @@ -1,25 +1,3 @@ -diff -urN llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc ---- llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc 2013-10-17 13:18:11.000000000 +0200 -+++ llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc 2014-01-07 14:43:48.836815229 +0100 -@@ -223,10 +223,8 @@ - - #if SANITIZER_WORDSIZE == 64 - TEST(SanitizerCommon, SizeClassAllocator64GetBlockBegin) { -- SizeClassAllocatorGetBlockBeginStress(); - } - TEST(SanitizerCommon, SizeClassAllocator64CompactGetBlockBegin) { -- SizeClassAllocatorGetBlockBeginStress(); - } - TEST(SanitizerCommon, SizeClassAllocator32CompactGetBlockBegin) { - SizeClassAllocatorGetBlockBeginStress(); -@@ -324,7 +322,6 @@ - - #if SANITIZER_WORDSIZE == 64 - TEST(SanitizerCommon, SizeClassAllocator64Overflow) { -- EXPECT_DEATH(FailInAssertionOnOOM(), "Out of memory"); - } - #endif - diff -urN llvm-3.4.orig/tools/clang/test/Driver/constructors.c llvm-3.4/tools/clang/test/Driver/constructors.c --- llvm-3.4.orig/tools/clang/test/Driver/constructors.c 2012-11-22 00:40:23.000000000 +0100 +++ llvm-3.4/tools/clang/test/Driver/constructors.c 2014-01-07 14:43:48.801815348 +0100 -- GitLab From 258e9ab171685ce3cf6e7b5a54d83fc1a56fdc1a Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 9 Jan 2014 12:45:50 +0100 Subject: [PATCH 599/811] ClangGCC: updated toolchain to clang-3.4 --- .../easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb diff --git a/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb b/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb new file mode 100644 index 0000000000..ed2fa73c3c --- /dev/null +++ b/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb @@ -0,0 +1,18 @@ +easyblock = "Toolchain" + +name = 'ClangGCC' +version = '1.3.0' + +homepage = '(none)' +description = """Clang and GCC based compiler toolchain. Clang will use libstdc++. +GFortran will be used to compile Fortran code.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp = ('GCC', '4.8.2') +dependencies = [ + comp, + ('Clang', '3.4', '', comp), +] + +moduleclass = 'toolchain' -- GitLab From 0b2cc8d79d5d2c8a3458318b2f9a6b475627bf24 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 10 Jan 2014 00:43:54 +0100 Subject: [PATCH 600/811] MAFFT-7.130-with-extensions-goolf-1.4.10.eb --- ...AFFT-7.130-with-extensions-goolf-1.4.10.eb | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb new file mode 100644 index 0000000000..34f51d0aab --- /dev/null +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -0,0 +1,33 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'MAFFT' +version = '7.130' +versionsuffix='with-extensions' + +homepage = 'http://mafft.cbrc.jp/alignment/software/' +description = """MAFFT is a multiple sequence alignment + program for unix-like operating systems. It offers a + range of multiple alignment methods, L-INS-i (accurate; + for alignment of <∼200 sequences), FFT-NS-2 (fast; + for alignment of <∼10,000 sequences), etc.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://mafft.cbrc.jp/alignment/software/'] +sources = ['%(namelower)s-%(version)s-%(versionsuffix)s-src.tgz'] + +skipsteps = ['configure'] + +premakeopts = 'cd core && ' +preinstallopts = 'cd core && ' +installopts = 'PREFIX=%(installdir)s' + +sanity_check_paths = { + 'files': ['bin/mafft'], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From 6c79a4bda0adabd74ba2a8febe724ef2df52959a Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 10 Jan 2014 00:59:44 +0100 Subject: [PATCH 601/811] cosmetic changes in the description identation --- .../m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb index 34f51d0aab..370e1df51d 100644 --- a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -8,11 +8,10 @@ version = '7.130' versionsuffix='with-extensions' homepage = 'http://mafft.cbrc.jp/alignment/software/' -description = """MAFFT is a multiple sequence alignment - program for unix-like operating systems. It offers a - range of multiple alignment methods, L-INS-i (accurate; - for alignment of <∼200 sequences), FFT-NS-2 (fast; - for alignment of <∼10,000 sequences), etc.""" +description = """MAFFT is a multiple sequence alignment program + for unix-like operating systems. It offers a range of multiple + alignment methods, L-INS-i (accurate; for alignment of <∼200 sequences), + FFT-NS-2 (fast; for alignment of <∼10,000 sequences), etc.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -- GitLab From 36eebdfce579d22b7c93efca84d69c41b23a3b04 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 10 Jan 2014 01:07:16 +0100 Subject: [PATCH 602/811] switched to use start_dir as @fgeorgatos suggested --- .../m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb index 370e1df51d..d03834eb1c 100644 --- a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -19,9 +19,7 @@ source_urls = ['http://mafft.cbrc.jp/alignment/software/'] sources = ['%(namelower)s-%(version)s-%(versionsuffix)s-src.tgz'] skipsteps = ['configure'] - -premakeopts = 'cd core && ' -preinstallopts = 'cd core && ' +start_dir = 'core' installopts = 'PREFIX=%(installdir)s' sanity_check_paths = { -- GitLab From 6e22fd319c5e57062c30e052d9ffb79576eac130 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 10 Jan 2014 01:43:24 +0100 Subject: [PATCH 603/811] remove extra line Signed-off-by: Fotis Georgatos --- .../q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb | 1 - .../q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb | 1 - .../QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb | 1 - .../q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb | 1 - 4 files changed, 4 deletions(-) diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb index 9252372604..9486bafdef 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb @@ -8,7 +8,6 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb index 2c9da47c8d..c426f3eb06 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb @@ -7,7 +7,6 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb index 2acbc21f76..dfa16f0793 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb @@ -8,7 +8,6 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb index 854d3543cf..ded1113c65 100644 --- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb @@ -7,7 +7,6 @@ description = """Quantum ESPRESSO is an integrated suite of computer codes It is based on density-functional theory, plane waves, and pseudopotentials (both norm-conserving and ultrasoft).""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} -- GitLab From 4714b9afb6e30fb77a8c820b0d348c2b2485734d Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 10 Jan 2014 09:47:45 +0100 Subject: [PATCH 604/811] cosmetics: added missed spaces --- .../m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb index d03834eb1c..129a0d9043 100644 --- a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -5,7 +5,7 @@ name = 'MAFFT' version = '7.130' -versionsuffix='with-extensions' +versionsuffix = 'with-extensions' homepage = 'http://mafft.cbrc.jp/alignment/software/' description = """MAFFT is a multiple sequence alignment program -- GitLab From 35e67355c8d55cec9001007cf5a196672029a4d6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 16 Jan 2014 08:50:49 +0100 Subject: [PATCH 605/811] add HDF5 v1.8.12 easyconfig + required patch --- .../h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb | 25 + .../HDF5-1.8.12_mpi-includes_order_fix.patch | 439 ++++++++++++++++++ 2 files changed, 464 insertions(+) create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb new file mode 100644 index 0000000000..a30ee3a186 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb @@ -0,0 +1,25 @@ +name = 'HDF5' +version = '1.8.12' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'HDF5-1.8.12_configure_ictce.patch', + 'configure_libtool.patch', + 'HDF5-%(version)s_mpi-includes_order_fix.patch', +] + +dependencies = [ + ('zlib', '1.2.7'), + ('Szip', '2.1'), +] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch new file mode 100644 index 0000000000..e86ffe564d --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch @@ -0,0 +1,439 @@ +diff -ru hdf5-1.8.10.orig/c++/src/H5AbstractDs.cpp hdf5-1.8.10/c++/src/H5AbstractDs.cpp +--- hdf5-1.8.10.orig/c++/src/H5AbstractDs.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5AbstractDs.cpp 2012-12-10 15:51:13.237522005 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5ArrayType.cpp hdf5-1.8.10/c++/src/H5ArrayType.cpp +--- hdf5-1.8.10.orig/c++/src/H5ArrayType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5ArrayType.cpp 2012-12-10 15:51:13.238521995 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5AtomType.cpp hdf5-1.8.10/c++/src/H5AtomType.cpp +--- hdf5-1.8.10.orig/c++/src/H5AtomType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5AtomType.cpp 2012-12-10 15:51:13.237522005 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5Attribute.cpp hdf5-1.8.10/c++/src/H5Attribute.cpp +--- hdf5-1.8.10.orig/c++/src/H5Attribute.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5Attribute.cpp 2012-12-10 15:51:13.230522180 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5CommonFG.cpp hdf5-1.8.10/c++/src/H5CommonFG.cpp +--- hdf5-1.8.10.orig/c++/src/H5CommonFG.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5CommonFG.cpp 2012-12-10 15:51:13.239522003 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5CompType.cpp hdf5-1.8.10/c++/src/H5CompType.cpp +--- hdf5-1.8.10.orig/c++/src/H5CompType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5CompType.cpp 2012-12-10 15:51:13.239522003 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5DataSet.cpp hdf5-1.8.10/c++/src/H5DataSet.cpp +--- hdf5-1.8.10.orig/c++/src/H5DataSet.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5DataSet.cpp 2012-12-10 15:51:13.239522003 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5DataSpace.cpp hdf5-1.8.10/c++/src/H5DataSpace.cpp +--- hdf5-1.8.10.orig/c++/src/H5DataSpace.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5DataSpace.cpp 2012-12-10 15:51:13.237522005 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5DataType.cpp hdf5-1.8.10/c++/src/H5DataType.cpp +--- hdf5-1.8.10.orig/c++/src/H5DataType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5DataType.cpp 2012-12-10 15:51:13.236521976 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5DcreatProp.cpp hdf5-1.8.10/c++/src/H5DcreatProp.cpp +--- hdf5-1.8.10.orig/c++/src/H5DcreatProp.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5DcreatProp.cpp 2012-12-10 15:51:13.236521976 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5DxferProp.cpp hdf5-1.8.10/c++/src/H5DxferProp.cpp +--- hdf5-1.8.10.orig/c++/src/H5DxferProp.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5DxferProp.cpp 2012-12-10 15:51:13.236521976 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5EnumType.cpp hdf5-1.8.10/c++/src/H5EnumType.cpp +--- hdf5-1.8.10.orig/c++/src/H5EnumType.cpp 2012-10-11 19:31:51.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5EnumType.cpp 2012-12-10 15:51:13.237522005 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5Exception.cpp hdf5-1.8.10/c++/src/H5Exception.cpp +--- hdf5-1.8.10.orig/c++/src/H5Exception.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5Exception.cpp 2012-12-10 15:51:13.230522180 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5FaccProp.cpp hdf5-1.8.10/c++/src/H5FaccProp.cpp +--- hdf5-1.8.10.orig/c++/src/H5FaccProp.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5FaccProp.cpp 2012-12-10 15:51:13.235521927 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5FcreatProp.cpp hdf5-1.8.10/c++/src/H5FcreatProp.cpp +--- hdf5-1.8.10.orig/c++/src/H5FcreatProp.cpp 2012-10-11 19:31:51.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5FcreatProp.cpp 2012-12-10 15:51:13.237522005 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5File.cpp hdf5-1.8.10/c++/src/H5File.cpp +--- hdf5-1.8.10.orig/c++/src/H5File.cpp 2012-10-11 19:31:51.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5File.cpp 2012-12-10 15:51:13.240521935 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5FloatType.cpp hdf5-1.8.10/c++/src/H5FloatType.cpp +--- hdf5-1.8.10.orig/c++/src/H5FloatType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5FloatType.cpp 2012-12-10 15:51:13.238521995 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5Group.cpp hdf5-1.8.10/c++/src/H5Group.cpp +--- hdf5-1.8.10.orig/c++/src/H5Group.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5Group.cpp 2012-12-10 15:51:13.240521935 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5IdComponent.cpp hdf5-1.8.10/c++/src/H5IdComponent.cpp +--- hdf5-1.8.10.orig/c++/src/H5IdComponent.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5IdComponent.cpp 2012-12-10 15:54:57.715521900 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5IntType.cpp hdf5-1.8.10/c++/src/H5IntType.cpp +--- hdf5-1.8.10.orig/c++/src/H5IntType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5IntType.cpp 2012-12-10 15:51:13.238521995 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5Library.cpp hdf5-1.8.10/c++/src/H5Library.cpp +--- hdf5-1.8.10.orig/c++/src/H5Library.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5Library.cpp 2012-12-10 15:51:13.235521927 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5CppDoc.h" // included only for Doxygen to generate part of RM +diff -ru hdf5-1.8.10.orig/c++/src/H5Object.cpp hdf5-1.8.10/c++/src/H5Object.cpp +--- hdf5-1.8.10.orig/c++/src/H5Object.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5Object.cpp 2012-12-10 15:51:13.235521927 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5PredType.cpp hdf5-1.8.10/c++/src/H5PredType.cpp +--- hdf5-1.8.10.orig/c++/src/H5PredType.cpp 2012-10-11 19:31:51.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5PredType.cpp 2012-12-10 15:51:13.238521995 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5PropList.cpp hdf5-1.8.10/c++/src/H5PropList.cpp +--- hdf5-1.8.10.orig/c++/src/H5PropList.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5PropList.cpp 2012-12-10 15:51:13.236521976 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/src/H5StrType.cpp hdf5-1.8.10/c++/src/H5StrType.cpp +--- hdf5-1.8.10.orig/c++/src/H5StrType.cpp 2012-10-11 19:31:50.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5StrType.cpp 2012-12-10 15:51:13.238521995 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/src/H5VarLenType.cpp hdf5-1.8.10/c++/src/H5VarLenType.cpp +--- hdf5-1.8.10.orig/c++/src/H5VarLenType.cpp 2012-10-11 19:31:51.000000000 +0200 ++++ hdf5-1.8.10/c++/src/H5VarLenType.cpp 2012-12-10 15:51:13.239522003 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" +diff -ru hdf5-1.8.10.orig/c++/test/dsets.cpp hdf5-1.8.10/c++/test/dsets.cpp +--- hdf5-1.8.10.orig/c++/test/dsets.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/dsets.cpp 2012-12-10 15:51:13.240521935 +0100 +@@ -25,6 +25,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/h5cpputil.cpp hdf5-1.8.10/c++/test/h5cpputil.cpp +--- hdf5-1.8.10.orig/c++/test/h5cpputil.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/h5cpputil.cpp 2012-12-10 15:51:13.242521899 +0100 +@@ -21,6 +21,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/tattr.cpp hdf5-1.8.10/c++/test/tattr.cpp +--- hdf5-1.8.10.orig/c++/test/tattr.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/tattr.cpp 2012-12-10 15:51:13.240521935 +0100 +@@ -20,6 +20,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/tcompound.cpp hdf5-1.8.10/c++/test/tcompound.cpp +--- hdf5-1.8.10.orig/c++/test/tcompound.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/tcompound.cpp 2012-12-10 15:51:13.241522020 +0100 +@@ -19,6 +19,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/testhdf5.cpp hdf5-1.8.10/c++/test/testhdf5.cpp +--- hdf5-1.8.10.orig/c++/test/testhdf5.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/testhdf5.cpp 2012-12-10 15:51:13.241522020 +0100 +@@ -41,6 +41,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/tfile.cpp hdf5-1.8.10/c++/test/tfile.cpp +--- hdf5-1.8.10.orig/c++/test/tfile.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/tfile.cpp 2012-12-10 15:51:13.241522020 +0100 +@@ -23,6 +23,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/tfilter.cpp hdf5-1.8.10/c++/test/tfilter.cpp +--- hdf5-1.8.10.orig/c++/test/tfilter.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/tfilter.cpp 2012-12-10 15:51:13.241522020 +0100 +@@ -19,6 +19,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/th5s.cpp hdf5-1.8.10/c++/test/th5s.cpp +--- hdf5-1.8.10.orig/c++/test/th5s.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/th5s.cpp 2012-12-10 15:51:13.241522020 +0100 +@@ -22,6 +22,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/tlinks.cpp hdf5-1.8.10/c++/test/tlinks.cpp +--- hdf5-1.8.10.orig/c++/test/tlinks.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/tlinks.cpp 2012-12-10 15:51:13.242521899 +0100 +@@ -19,6 +19,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/trefer.cpp hdf5-1.8.10/c++/test/trefer.cpp +--- hdf5-1.8.10.orig/c++/test/trefer.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/trefer.cpp 2012-12-10 15:51:13.242521899 +0100 +@@ -20,6 +20,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/ttypes.cpp hdf5-1.8.10/c++/test/ttypes.cpp +--- hdf5-1.8.10.orig/c++/test/ttypes.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/ttypes.cpp 2012-12-10 15:51:13.242521899 +0100 +@@ -19,6 +19,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/c++/test/tvlstr.cpp hdf5-1.8.10/c++/test/tvlstr.cpp +--- hdf5-1.8.10.orig/c++/test/tvlstr.cpp 2012-10-11 19:31:49.000000000 +0200 ++++ hdf5-1.8.10/c++/test/tvlstr.cpp 2012-12-10 15:51:13.243522021 +0100 +@@ -21,6 +21,7 @@ + + ***************************************************************************/ + ++#include + #ifdef OLD_HEADER_FILENAME + #include + #else +diff -ru hdf5-1.8.10.orig/src/H5make_libsettings.c hdf5-1.8.10/src/H5make_libsettings.c +--- hdf5-1.8.10.orig/src/H5make_libsettings.c 2012-10-11 19:30:56.000000000 +0200 ++++ hdf5-1.8.10/src/H5make_libsettings.c 2012-12-10 15:51:13.242521899 +0100 +@@ -41,6 +41,7 @@ + *------------------------------------------------------------------------- + */ + ++#include + #include + #include + #include "H5private.h" +--- hdf5-1.8.12/c++/src/H5Location.cpp.orig 2014-01-13 16:25:41.242265318 +0100 ++++ hdf5-1.8.12/c++/src/H5Location.cpp 2014-01-13 16:25:53.952336995 +0100 +@@ -13,6 +13,7 @@ + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + ++#include + #include + + #include "H5Include.h" -- GitLab From e13e210474860878831248a5a52f77baab6852d0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 16 Jan 2014 09:13:54 +0100 Subject: [PATCH 606/811] add easyconfigs for Python 2.7.6 + various Python packages on top --- .../Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb | 28 ++++++ ...tplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb | 37 ++++++++ .../numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb | 34 ++++++++ .../PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb | 30 +++++++ .../p/Python/Python-2.7.6-ictce-5.5.0.eb | 85 +++++++++++++++++++ .../pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb | 31 +++++++ ...pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb | 40 +++++++++ ...kit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb | 28 ++++++ .../z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb | 32 +++++++ 9 files changed, 345 insertions(+) create mode 100644 easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..3234e4ff25 --- /dev/null +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,28 @@ +easyblock = "PythonPackage" + +name = 'Cython' +version = '0.19.2' + +homepage = 'http://pypi.python.org/pypi/Cython/' +description = """The Cython language makes writing C extensions for the Python language as easy as Python itself. + Cython is a source code translator based on the well-known Pyrex, but supports more cutting edge functionality and optimizations.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.6' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +pylibdir = 'lib/python%s/site-packages' % pythonshortver +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [(python, pythonver)] + +sanity_check_paths = { + 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], + 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..5ee25a7abe --- /dev/null +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,37 @@ +easyblock = "PythonPackage" + +name = 'matplotlib' +version = '1.3.1' + +homepage = 'http://matplotlib.org' +description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of + hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python + and ipython shell, web application servers, and six graphical user interface toolkits.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +python = "Python" +pythonversion = '2.7.6' +pyshortver = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('zlib', '1.2.7'), + ('freetype', '2.5.0.1'), + ('libpng', '1.6.6'), +] + +# is this actually needed? the PythonPackage will check if import matplotlib succeeds, which is as good as this? +pyprefix = 'lib/python%s/site-packages' % pyshortver +eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver +sanity_check_paths = { + 'files': [], + 'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..4f89921346 --- /dev/null +++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,34 @@ +easyblock = "PythonPackage" + +name = 'numexpr' +version = '2.2.2' + +homepage = 'http://code.google.com/p/numexpr/' +description = """The numexpr package evaluates multiple-operator array expressions many times faster than NumPy can. + It accepts the expression as a string, analyzes it, rewrites it more efficiently, and compiles it on the fly into + code for its internal virtual machine (VM). Due to its integrated just-in-time (JIT) compiler, it does not require a + compiler at runtime.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +source_urls = ['http://numexpr.googlecode.com/files/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.6' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('HDF5', '1.8.12'), +] + +eggname = '%s-%s-py%s-linux-x86_64.egg' % (name, version, pythonshortver) +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%s/%s' % (pythonshortver, eggname, name)], +} + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..6939bcf426 --- /dev/null +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,30 @@ +name = 'PyZMQ' +version = '14.0.1' + +homepage = 'http://www.zeromq.org/bindings:python' +description = """Python bindings for ZeroMQ""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +sources = [SOURCELOWER_TAR_GZ] + +python = 'Python' +pythonversion = '2.7.6' +pythonshortversion = ".".join(pythonversion.split(".")[0:2]) + +versionsuffix = '-%s-%s' % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('ZeroMQ', '4.0.3'), +] + +options = {'modulename': 'zmq'} + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb new file mode 100644 index 0000000000..441f9171ad --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb @@ -0,0 +1,85 @@ +name = 'Python' +version = '2.7.6' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.8.0' +scipyversion = '0.13.1' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +# libffi build in python is still broken, see http://bugs.python.org/issue4130 +patches = ['python-2.7_libffi-include-xmmintrin.patch'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.4.2', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('pip', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s-mkl.patch' % numpyversion, + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3.1', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.2', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.2', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..03c972512f --- /dev/null +++ b/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,31 @@ +easyblock = "PythonPackage" + +name = "pandas" +version = "0.12.0" + +homepage = "http://pypi.python.org/pypi/pandas/" +description = """pandas is an open source, BSD-licensed library providing high-performance, easy-to-use data structures + and data analysis tools for the Python programming language.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = "2.7.6" + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [(python, pythonversion)] + +py_short_ver = ".".join(pythonversion.split(".")[0:2]) +pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name) + +sanity_check_paths = { + 'files': [("%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver), + "%s-%%(version)s-py%s-linux-x86_64.egg" % (pylibdir, py_short_ver))], + 'dirs': [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..8219cdaef1 --- /dev/null +++ b/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,40 @@ +easyblock = "PythonPackage" + +name = 'pyTables' +version = '3.0.0' + +homepage = 'http://www.pytables.org/moin' +description = """PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope + with extremely large amounts of data. PyTables is built on top of the HDF5 library, using the Python language and the + NumPy package. It features an object-oriented interface that, combined with C extensions for the performance-critical + parts of the code (generated using Cython), makes it a fast, yet extremely easy to use tool for interactively browse, + process and search very large amounts of data. One important feature of PyTables is that it optimizes memory and disk + resources so that data takes much less space (specially if on-flight compression is used) than other solutions such as + relational or object oriented databases.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +source_urls = [('http://sourceforge.net/projects/pytables/files/pytables/%s' % version, 'download')] +sources = ['tables-%s.tar.gz' % version] + +python = 'Python' +pythonver = '2.7.6' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('numexpr', '2.2.2', versionsuffix), + ('HDF5', '1.8.12'), + ('Cython', '0.19.2', versionsuffix), +] + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['pt2to3', 'ptdump', 'ptrepack']], + 'dirs': ['lib/python%s/site-packages/tables' % pythonshortver], +} + +options = {'modulename': 'tables'} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..b15833e4de --- /dev/null +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,28 @@ +easyblock = "PythonPackage" + +name = "scikit-learn" +version = "0.14" + +homepage = 'http://scikit-learn.org/stable/index.html' +description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world, +building upon numpy, scipy, and matplotlib. As a machine-learning module, +it provides versatile tools for data mining and analysis in any field of science and engineering. +It strives to be simple and efficient, accessible to everybody, and reusable in various contexts.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] +sources = [SOURCE_TAR_GZ] + +python = "Python" +pythonversion = '2.7.6' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) +dependencies = [ + (python, pythonversion), + ('matplotlib', '1.3.1', versionsuffix), +] + +options = {'modulename': "sklearn"} + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..8d73e9399b --- /dev/null +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb @@ -0,0 +1,32 @@ +name = 'ZeroMQ' +version = '4.0.3' + +homepage = 'http://www.zeromq.org/' +description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework. + It gives you sockets that carry atomic messages across various transports like in-process, + inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout, + pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered + products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous + message-processing tasks. It has a score of language APIs and runs on most operating systems.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://download.zeromq.org/'] +sources = [SOURCELOWER_TAR_GZ] + +# --with-pgm will use shipped OpenPGM (in foreign subdir) +configopts = '--with-pic --with-system-pgm ' +configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" ' +configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' + +dependencies = [ + ('OpenPGM', '5.2.122'), + ('util-linux', '2.24'), +] + +sanity_check_paths = { + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} + +moduleclass = 'devel' -- GitLab From 5f0dbcd5d1ae8131b9233635f7702c96e1e756d6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 16 Jan 2014 09:20:20 +0100 Subject: [PATCH 607/811] add easyconfig for EasyBuild v1.10 --- .../e/EasyBuild/EasyBuild-1.10.0.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb new file mode 100644 index 0000000000..99d04a46aa --- /dev/null +++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb @@ -0,0 +1,29 @@ +easyblock = 'EB_EasyBuildMeta' + +name = 'EasyBuild' +version = '1.10.0' + +homepage = 'http://hpcugent.github.com/easybuild/' +description = """EasyBuild is a software build and installation framework + written in Python that allows you to install software in a structured, + repeatable and robust way.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://pypi.python.org/packages/source/e/easybuild-framework/', + 'http://pypi.python.org/packages/source/e/easybuild-easyblocks/', + 'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/', +] +# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?) +sources = [ + 'easybuild-framework-%(version)s.tar.gz', + 'easybuild-easyblocks-%(version)s.tar.gz', + 'easybuild-easyconfigs-%(version)s.0.tar.gz', +] + +# EasyBuild is a (set of) Python packages, so it depends on Python +# usually, we want to use the system Python, so no actual Python dependency is listed +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] + +moduleclass = 'tools' -- GitLab From ce12ab6209cb359c774f5919cf3972f8eeeef676 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 16 Jan 2014 09:35:37 +0100 Subject: [PATCH 608/811] add easyconfig file for netCDF 4.3.0 + required patch and easyconfigs for deps --- .../b/Bison/Bison-2.7.1-ictce-5.5.0.eb | 20 ++ .../c/cURL/cURL-7.34.0-ictce-5.5.0.eb | 22 ++ .../d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb | 18 ++ .../n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb | 36 +++ .../n/netCDF/netCDF-4.3.0_nc-config.in.cmake | 295 ++++++++++++++++++ 5 files changed, 391 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..83da9c3f17 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb @@ -0,0 +1,20 @@ +name = 'Bison' +version = '2.7.1' + +homepage = 'http://www.gnu.org/software/bison' +description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar + into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [GNU_SOURCE] + +builddependencies = [('M4', '1.4.17')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'dirs': [], +} + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb new file mode 100644 index 0000000000..a645910806 --- /dev/null +++ b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb @@ -0,0 +1,22 @@ +name = 'cURL' +version = '7.34.0' + +homepage = 'http://curl.haxx.se' +description = """libcurl is a free and easy-to-use client-side URL transfer library, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports + SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, + proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, + Kerberos), file transfer resume, http proxy tunneling and more.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://curl.haxx.se/download/'] + +sanity_check_paths = { + 'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb new file mode 100644 index 0000000000..ac0d35a6d5 --- /dev/null +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb @@ -0,0 +1,18 @@ +name = 'Doxygen' +version = '1.8.6' + +homepage = 'http://www.doxygen.org' +description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, +IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = ['%(namelower)s-%(version)s.src.tar.gz'] +source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] + +builddependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7.1'), +] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb new file mode 100644 index 0000000000..78d6d431c3 --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb @@ -0,0 +1,36 @@ +name = 'netCDF' +version = '4.3.0' + +homepage = 'http://www.unidata.ucar.edu/software/netcdf/' +description = """NetCDF (network Common Data Form) is a set of software libraries + and machine-independent data formats that support the creation, access, and sharing of array-oriented + scientific data.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True, 'usempi': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/'] + +patches = [('netCDF-4.3.0_nc-config.in.cmake', 'netcdf-4.3.0')] + +dependencies = [('HDF5', '1.8.12')] + +builddependencies = [ + ('CMake', '2.8.12'), + ('Doxygen', '1.8.6'), + ('cURL', '7.34.0'), +] + +# we need to specify correct start dir, since unpacked tarball also contains e.g. ._netcdf-4.3.0 +start_dir = '%(namelower)s-%(version)s' + +preconfigopts = 'mv netCDF-4.3.0_nc-config.in.cmake nc-config.in.cmake && ' + +# make sure both static and shared libs are built +configopts = [ + "-DCURL_LIBRARY=$EBROOTCURL/lib/libcurl.so -DCURL_INCLUDE_DIR=$EBROOTCURL/include -DBUILD_SHARED_LIBS=ON", + "-DCURL_LIBRARY=$EBROOTCURL/lib/libcurl.so -DCURL_INCLUDE_DIR=$EBROOTCURL/include -DBUILD_SHARED_LIBS=OFF", +] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake new file mode 100644 index 0000000000..c97f8bf3eb --- /dev/null +++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake @@ -0,0 +1,295 @@ +#! /bin/sh +# +# This forms the basis for the nc-config utility, which tells you +# various things about the netCDF installation. This code was +# contributed by netCDF user Arlindo DaSilva. Thanks Arlindo! + +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_PREFIX@/lib +includedir=@CMAKE_INSTALL_PREFIX@/include + +cc="@CMAKE_C_COMPILER@" +cflags="-I@CMAKE_INSTALL_PREFIX@/include @CMAKE_C_FLAGS@ @CMAKE_CPP_FLAGS@" +libs="-L@CMAKE_INSTALL_PREFIX@/lib -l@ALL_TLL_LIBS@" + +has_dap="@USE_DAP@" +if [ -z $has_dap ]; then + has_dap="no" +else + has_dap="yes" +fi + +has_nc2="@BUILD_V2@" + +if [ -z $has_nc2 ]; then + has_nc2="no" +else + has_nc2="yes" +fi + +has_nc4="@USE_NETCDF4@" +if [ -z $has_nc4 ]; then + has_nc4="no" +else + has_nc4="yes" +fi + +has_hdf4="@USE_HDF4@" +if [ -z $has_hdf4 ]; then + has_hdf4="no" +else + has_hdf4="yes" +fi + +has_pnetcdf="@USE_PNETCDF@" +if [ -z $has_pnetcdf ]; then + has_pnetcdf="no" +else + has_pnetcdf="yes" +fi + +has_hdf5="@USE_HDF5@" +if [ -z $has_hdf5 ]; then + has_hdf5="no" +else + has_hdf5="yes" +fi + +has_szlib="@USE_SZLIB@" +if [ -z $has_szlib ]; then + has_szlib="no" +else + has_szlib="yes" +fi + + +version="@PACKAGE@ @VERSION@" + +has_f90="no" +if type -p nf-config > /dev/null 2>&1; then + fc=`nf-config --fc` + fflags=`nf-config --fflags` + flibs=`nf-config --flibs` + has_f90=`nf-config --has-f90` +fi + +has_cxx="no" +has_cxx4="no" +if type -p ncxx4-config > /dev/null 2>&1; then + cxx4=`ncxx4-config --cxx` + has_cxx4="yes" +elif type -p ncxx-config > /dev/null 2>&1; then + cxx=`ncxx-config --cxx` + has_cxx="yes" +fi + +usage() +{ + cat < /dev/null 2>&1; then + cat < /dev/null 2>&1; then + cat < /dev/null 2>&1; then + cat < $cc" + echo " --cflags -> $cflags" + echo " --libs -> $libs" + echo + echo " --has-c++ -> $has_cxx" + echo " --cxx -> $cxx" + echo " --has-c++4 -> $has_cxx4" + echo " --cxx4 -> $cxx4" + echo + echo " --fc -> $fc" + echo " --fflags -> $fflags" + echo " --flibs -> $flibs" + echo " --has-f90 -> $has_f90" + echo + echo " --has-dap -> $has_dap" + echo " --has-nc2 -> $has_nc2" + echo " --has-nc4 -> $has_nc4" + echo " --has-hdf5 -> $has_hdf5" + echo " --has-hdf4 -> $has_hdf4" + echo " --has-pnetcdf-> $has_pnetcdf" + echo " --has-szlib -> $has_szlib" + echo + echo " --prefix -> $prefix" + echo " --includedir-> $includedir" + echo " --version -> $version" + echo +} + +if test $# -eq 0; then + usage 1 +fi + +while test $# -gt 0; do + case "$1" in + # this deals with options in the style + # --option=value and extracts the value part + # [not currently used] + -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) value= ;; + esac + + case "$1" in + + --help) + usage 0 + ;; + + --all) + all + ;; + + --cc) + echo $cc + ;; + + --cflags) + echo $cflags + ;; + + --has-dap) + echo $has_dap + ;; + + --has-nc2) + echo $has_nc2 + ;; + + --has-nc4) + echo $has_nc4 + ;; + + --has-hdf5) + echo $has_hdf5 + ;; + + --has-hdf4) + echo $has_hdf4 + ;; + + --has-pnetcdf) + echo $has_pnetcdf + ;; + + --has-szlib) + echo $has_szlib + ;; + + --libs) + echo $libs + ;; + + --prefix) + echo "${prefix}" + ;; + + --includedir) + echo "${includedir}" + ;; + + --version) + echo $version + ;; + + --has-c++) + echo $has_cxx + ;; + + --cxx) + echo $cxx + ;; + + --has-c++4) + echo $has_cxx4 + ;; + + --cxx4) + echo $cxx4 + ;; + +# --cxxflags) +# echo $cxxflags +# ;; +# +# --cxxlibs) +# echo $cxxlibs +# ;; + + --fc) + echo $fc + ;; + + --fflags) + echo $fflags + ;; + + --flibs) + echo $flibs + ;; + + --has-f90) + echo $has_f90 + ;; + + *) + echo "unknown option: $1" + usage + exit 1 + ;; + esac + shift +done + +exit 0 -- GitLab From fc9e8883cf68f5abfa52c42b0efa8345ddf68c1c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 16 Jan 2014 09:37:35 +0100 Subject: [PATCH 609/811] add easyconfig for netcdf4-python --- ...4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb diff --git a/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..4705fe247a --- /dev/null +++ b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,25 @@ +name = 'netcdf4-python' +version = '1.0.7' + +homepage = 'https://code.google.com/p/netcdf4-python/' +description = """Python/numpy interface to netCDF.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +source_urls = ['https://netcdf4-python.googlecode.com/files'] +sources = ['netCDF4-%(version)s.tar.gz'] + +python = 'Python' +pythonver = '2.7.6' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('HDF5', '1.8.12'), + ('Cython', '0.19.2', versionsuffix), + ('netCDF', '4.3.0'), +] + +moduleclass = 'data' -- GitLab From 5014d085331114aff1facd5232c735dce0f8ba82 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 17 Jan 2014 11:42:58 +0100 Subject: [PATCH 610/811] Update vsc-mympirun-3.2.1.eb --- easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index 12fd4698df..5aad39eba9 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -2,7 +2,7 @@ easyblock = 'VersionIndependendPythonPackage' name = 'vsc-mympirun' version = '3.2.1' -homepage = 'http://hpcugent.github.com/vsc-mympirun/' +homepage = 'http://github.com/hpcugent/vsc-mympirun/' description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" # we build this to work with every python version -- GitLab From 571c40fea5e2d678bfea4b25989c5b6b9f1f6b3d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 19 Jan 2014 21:38:41 +0100 Subject: [PATCH 611/811] add easyconfigs for vsc-mympirun-scoop + dependencies --- ...Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb | 33 ++++++++ .../o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb | 25 ++++++ .../PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb | 30 +++++++ .../p/Python/Python-2.7.6-ictce-5.5.0.eb | 84 +++++++++++++++++++ .../SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb | 29 +++++++ .../s/setuptools/setuptools-1.4.2.eb | 19 +++++ .../util-linux/util-linux-2.24-ictce-5.5.0.eb | 27 ++++++ ...un-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb | 27 ++++++ .../v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 2 +- .../v/vsc-mympirun/vsc-mympirun-3.3.0.eb | 27 ++++++ .../vsc-processcontrol-1.0.eb | 22 +++++ .../z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb | 32 +++++++ 12 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb create mode 100644 easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb create mode 100644 easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb create mode 100644 easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..ae5c1573ae --- /dev/null +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,33 @@ +easyblock = "PythonPackage" + +name = 'Greenlet' +version = '0.4.2' + +homepage = 'https://github.com/python-greenlet/greenlet' +description = """The greenlet package is a spin-off of Stackless, a version of CPython that +supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single +or a few OS-level threads) and are synchronized with data exchanges on "channels". +A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit +scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs. +""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://pypi.python.org/packages/source/g/greenlet/'] +sources = ['%s-%s.zip' % (name.lower(), version)] + +python = "Python" +pythonversion = '2.7.6' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [(python, pythonversion)] + +patches = ['Greenlet-%(version)s_icc_no_amd64_predefined_in_prepocessor.patch'] + +sanity_check_paths = { + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion], + 'dirs': [], +} diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb new file mode 100644 index 0000000000..459c7147c9 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb @@ -0,0 +1,25 @@ +name = 'OpenPGM' +version = '5.2.122' + +homepage = 'http://code.google.com/p/openpgm/' +description = """OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM) + specification in RFC 3208 available at www.ietf.org. PGM is a reliable and scalable multicast protocol + that enables receivers to detect loss, request retransmission of lost data, or notify an application + of unrecoverable loss. PGM is a receiver-reliable protocol, which means the receiver is responsible + for ensuring all data is received, absolving the sender of reception responsibility.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://%s.googlecode.com/files/' % (name.lower())] +sources = ['%s-%s.tar.gz' % ('libpgm', version)] + +configopts = '--with-pic' + +start_dir = 'pgm' + +sanity_check_paths = { + 'files': ['lib/libpgm.so', 'lib/libpgm.a'], + 'dirs': ['include'], +} + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..6939bcf426 --- /dev/null +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,30 @@ +name = 'PyZMQ' +version = '14.0.1' + +homepage = 'http://www.zeromq.org/bindings:python' +description = """Python bindings for ZeroMQ""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +sources = [SOURCELOWER_TAR_GZ] + +python = 'Python' +pythonversion = '2.7.6' +pythonshortversion = ".".join(pythonversion.split(".")[0:2]) + +versionsuffix = '-%s-%s' % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ('ZeroMQ', '4.0.3'), +] + +options = {'modulename': 'zmq'} + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb new file mode 100644 index 0000000000..fa31f87152 --- /dev/null +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb @@ -0,0 +1,84 @@ +name = 'Python' +version = '2.7.6' + +homepage = 'http://python.org/' +description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +numpyversion = '1.8.0' +scipyversion = '0.13.1' + +source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] +sources = ['%(name)s-%(version)s.tgz'] + +patches = ['python-2.7_libffi-include-xmmintrin.patch'] + +# python needs bzip2 to build the bz2 package +dependencies = [ + ('bzip2', '1.0.6'), + ('zlib', '1.2.7'), + ('libreadline', '6.2'), + ('ncurses', '5.9'), +] + +# order is important! +exts_list = [ + ('setuptools', '1.4.2', { + 'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'], + }), + ('pip', '1.4.1', { + 'source_urls': ['http://pypi.python.org/packages/source/p/pip/'], + }), + ('nose', '1.3.0', { + 'source_urls': ['http://pypi.python.org/packages/source/n/nose/'], + }), + ('numpy', numpyversion, { + 'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')], + 'patches': [ + 'numpy-%s-mkl.patch' % numpyversion, + ], + }), + ('scipy', scipyversion, { + 'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')], + }), + ('mpi4py', '1.3.1', { + 'source_urls': ['https://mpi4py.googlecode.com/files/'], + }), + ('paycheck', '1.0.2', { + 'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'], + }), + ('argparse', '1.2.1', { + 'source_urls': ['http://argparse.googlecode.com/files/'], + }), + ('lockfile', '0.9.1', { + 'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'], + }), + ('Cython', '0.19.2', { + 'source_urls': ['http://www.cython.org/release/'], + }), + ('dateutil', '2.2', { + 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', + 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], + }), + ('deap', '0.9.1', { + 'source_urls': ['https://deap.googlecode.com/files/'], + }), + ('decorator', '3.4.0', { + 'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'], + }), + ('arff', '1.1', { + 'source_tmpl': 'liac-%(name)s-%(version)s.zip', + 'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'], + }), + ('pycrypto', '2.6.1', { + 'modulename': 'Crypto', + 'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'], + }), + ('paramiko', '1.12.0', { + 'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'], + }), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..691005bdb4 --- /dev/null +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,29 @@ +easyblock = "PythonPackage" + +name = 'SCOOP' +version = '0.6.2' + +homepage = 'http://code.google.com/p/scoop/' +description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module +allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ["http://scoop.googlecode.com/files/"] +sources = ['%s-%s.release.tar.gz' % (name.lower(), version)] + +python = 'Python' +pythonversion = '2.7.6' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +versionsuffix = '-%s-%s' % (python, pythonversion) + +dependencies = [ + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.2', versionsuffix), + ('PyZMQ', '14.0.1', versionsuffix), +] + +sanity_check_paths = { + 'files': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s.release-py%(pyv)s.egg' % {'pyv': pythonshortversion}], + 'dirs': [], +} diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb b/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb new file mode 100644 index 0000000000..24d2c3cca6 --- /dev/null +++ b/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb @@ -0,0 +1,19 @@ +easyblock = "VersionIndependendPythonPackage" + +name = "setuptools" +version = "1.4.2" + +homepage = "http://pypi.python.org/pypi/setuptools/" +description = """Download, build, install, upgrade, and uninstall Python packages -- easily!""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = ['http://pypi.python.org/packages/source/s/%(name)s/'] +sources = [SOURCE_TAR_GZ] + +sanity_check_paths = { + 'files': ["bin/easy_install"], + 'dirs': ["lib/setuptools"], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb new file mode 100644 index 0000000000..25c0719157 --- /dev/null +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb @@ -0,0 +1,27 @@ +name = 'util-linux' +version = '2.24' + +homepage = 'http://www.kernel.org/pub/linux/utils/util-linux' +description = """Set of Linux utilities""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['%s/v%%(version)s' % homepage] +sources = [SOURCELOWER_TAR_GZ] + +# disable account related utilities (they need OS dependant pam-devel files) +# disable wall and friends (requires group changing permissions for install user) +# install systemd service files in install dir +configopts = '--disable-chfn-chsh --disable-login --disable-su ' +configopts += '--disable-wall --disable-use-tty-group ' +configopts += '--disable-makeinstall-chown --disable-makeinstall-setuid ' +configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..c1d224e11e --- /dev/null +++ b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,27 @@ +easyblock = 'VSCPythonPackage' + +name = 'vsc-mympirun-scoop' +version = '3.3.0' + +homepage = 'http://hpcugent.github.com/vsc-mympirun/' +description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" + +# we build this to work with every python version +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['https://github.com/hpcugent/vsc-mympirun-scoop/archive/'] + +python = 'Python' +pyver = '2.7.6' +versionsuffix = '-%s-%s' % (python, pyver) +dependencies = [ + ('vsc-processcontrol', '1.0', '', True), + ('vsc-mympirun', version, '', True), + (python, pyver), + ('SCOOP', '0.6.2', versionsuffix), +] + +options = {'modulename': 'vsc.mympirun.scoop'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index 12fd4698df..e2487f31df 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -6,7 +6,7 @@ homepage = 'http://hpcugent.github.com/vsc-mympirun/' description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" # we build this to work with every python version -toolchain = {'name': 'dummy', 'version': 'dummy'} +toolchain = {'name': 'dummy', 'version': ''} sources = [SOURCE_TAR_GZ] source_urls = [ diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb new file mode 100644 index 0000000000..8a7e36cbc8 --- /dev/null +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb @@ -0,0 +1,27 @@ +easyblock = 'VSCPythonPackage' + +name = 'vsc-mympirun' +version = '3.3.0' + +homepage = 'http://hpcugent.github.com/vsc-mympirun/' +description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" + +# we build this to work with every python version +toolchain = {'name': 'dummy', 'version': ''} + +sources = [SOURCE_TAR_GZ] +source_urls = [ + 'https://github.com/hpcugent/vsc-mympirun/archive/', +] + +dependencies = [ + ('vsc-base', '1.7.3'), + ('setuptools', '1.4.2'), +] + +# we ship something in bin/fake +modextrapaths = {'PATH': 'bin/fake'} + +options = {'modulename': 'vsc.mympirun'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb new file mode 100644 index 0000000000..a8c92aec1c --- /dev/null +++ b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb @@ -0,0 +1,22 @@ +easyblock = 'VSCPythonPackage' + +name = 'vsc-processcontrol' +version = '1.0' + +homepage = 'http://hpcugent.github.com/vsc-processcontrol/' +description = """vsc-processcontrol is a module to abstract process control like scheduler settings and affinity + from actual implementations like vsc.affintiy and psutil.""" + +# we build this to work with every python version +toolchain = {'name': 'dummy', 'version': ''} + +sources = [SOURCE_TAR_GZ] +source_urls = [ + 'https://github.com/hpcugent/vsc-processcontrol/archive/', +] + +dependencies = [('vsc-base', '1.7.3')] + +options = {'modulename': 'sys; print sys.path; import vsc; print vsc.__path__; import vsc.processcontrol'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..8d73e9399b --- /dev/null +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb @@ -0,0 +1,32 @@ +name = 'ZeroMQ' +version = '4.0.3' + +homepage = 'http://www.zeromq.org/' +description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework. + It gives you sockets that carry atomic messages across various transports like in-process, + inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout, + pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered + products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous + message-processing tasks. It has a score of language APIs and runs on most operating systems.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://download.zeromq.org/'] +sources = [SOURCELOWER_TAR_GZ] + +# --with-pgm will use shipped OpenPGM (in foreign subdir) +configopts = '--with-pic --with-system-pgm ' +configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" ' +configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' + +dependencies = [ + ('OpenPGM', '5.2.122'), + ('util-linux', '2.24'), +] + +sanity_check_paths = { + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} + +moduleclass = 'devel' -- GitLab From d87c075ed8937eda642ff9ce85905a5862ec3f63 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 19 Jan 2014 21:53:19 +0100 Subject: [PATCH 612/811] add missing vsc-base v1.7.3 easyconfig, correct easyblock to VersionIndependentPythonPackage --- .../s/setuptools/setuptools-1.4.2.eb | 2 +- .../easyconfigs/v/vsc-base/vsc-base-1.6.9.eb | 3 ++- .../easyconfigs/v/vsc-base/vsc-base-1.7.3.eb | 20 +++++++++++++++++++ .../v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 3 ++- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb b/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb index 24d2c3cca6..87db02a9fa 100644 --- a/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb +++ b/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb @@ -1,4 +1,4 @@ -easyblock = "VersionIndependendPythonPackage" +easyblock = "VersionIndependentPythonPackage" name = "setuptools" version = "1.4.2" diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb index 3f28389ec6..e5bcfce5d5 100644 --- a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb @@ -1,4 +1,5 @@ -easyblock = 'VersionIndependendPythonPackage' +easyblock = 'VersionIndependentPythonPackage' + name = 'vsc-base' version = '1.6.9' diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb new file mode 100644 index 0000000000..14b2ff9229 --- /dev/null +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb @@ -0,0 +1,20 @@ +easyblock = 'VersionIndependentPythonPackage' + +name = 'vsc-base' +version = '1.7.3' + +homepage = 'http://hpcugent.github.com/vsc-mympirun/' +description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" + +# we build this to work with every python version +toolchain = {'name': 'dummy', 'version': 'dummy'} + + +sources = [SOURCE_TAR_GZ] +source_urls = [ + 'https://github.com/hpcugent/vsc-base/archive/', +] + +options = {'modulename': 'vsc.utils'} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index e2487f31df..fb13fb6328 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -1,4 +1,5 @@ -easyblock = 'VersionIndependendPythonPackage' +easyblock = 'VersionIndependentPythonPackage' + name = 'vsc-mympirun' version = '3.2.1' -- GitLab From 662ec34ea25c5b378227594938916142061d8aab Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 19 Jan 2014 22:10:05 +0100 Subject: [PATCH 613/811] use VSCPythonPackage easyblock in recent vsc-base easyconfig --- easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb index 14b2ff9229..7f81750f1e 100644 --- a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb @@ -1,4 +1,4 @@ -easyblock = 'VersionIndependentPythonPackage' +easyblock = 'VSCPythonPackage' name = 'vsc-base' version = '1.7.3' -- GitLab From dcf3157cbfd44c14465e6ea41b76348e7cf74fe4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 19 Jan 2014 22:12:09 +0100 Subject: [PATCH 614/811] add missing patch file for Greenlet --- ....2_icc_no_amd64_predefined_in_prepocessor.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch new file mode 100644 index 0000000000..fc194827fc --- /dev/null +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch @@ -0,0 +1,14 @@ +--- greenlet-0.4.2/slp_platformselect.h.orig 2014-01-06 23:48:38.000000000 +0100 ++++ greenlet-0.4.2/slp_platformselect.h 2014-01-17 17:44:34.793309559 +0100 +@@ -6,9 +6,9 @@ + #include "platform/switch_x86_msvc.h" /* MS Visual Studio on X86 */ + #elif defined(MS_WIN64) && defined(_M_X64) && defined(_MSC_VER) + #include "platform/switch_x64_msvc.h" /* MS Visual Studio on X64 */ +-#elif defined(__GNUC__) && defined(__amd64__) && defined(__ILP32__) ++#elif defined(__GNUC__) && defined(__x86_64__) && defined(__ILP32__) + #include "platform/switch_x32_unix.h" /* gcc on amd64 with x32 ABI */ +-#elif defined(__GNUC__) && defined(__amd64__) ++#elif defined(__GNUC__) && defined(__x86_64__) + #include "platform/switch_amd64_unix.h" /* gcc on amd64 */ + #elif defined(__GNUC__) && defined(__i386__) + #include "platform/switch_x86_unix.h" /* gcc on X86 */ -- GitLab From 61bf0768e6b18bb8472ca3d0a078dcbf33df266b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 19 Jan 2014 22:25:37 +0100 Subject: [PATCH 615/811] fix toolchain spec --- .../easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb index 25c0719157..08d7675cec 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb @@ -4,7 +4,7 @@ version = '2.24' homepage = 'http://www.kernel.org/pub/linux/utils/util-linux' description = """Set of Linux utilities""" -toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchain = {'name': 'ictce', 'version': '5.5.0'} source_urls = ['%s/v%%(version)s' % homepage] sources = [SOURCELOWER_TAR_GZ] -- GitLab From 93aebba7deb33d0b10a65d3546599194a95c530f Mon Sep 17 00:00:00 2001 From: pescobar Date: Mon, 20 Jan 2014 00:15:51 +0100 Subject: [PATCH 616/811] TREE-PUZZLE-5.2-goolf-1.4.10.eb --- .../TREE-PUZZLE-5.2-goolf-1.4.10.eb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..b8f881674e --- /dev/null +++ b/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb @@ -0,0 +1,26 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'TREE-PUZZLE' +version = '5.2' + +homepage = 'http://www.tree-puzzle.de/' +description = """ TREE-PUZZLE is a computer program to reconstruct + phylogenetic trees from molecular sequence data by maximum likelihood. + It implements a fast tree search algorithm, quartet puzzling, that allows + analysis of large data sets and automatically assigns estimations of + support to each internal branch. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://www.tree-puzzle.de'] +sources = ['%(namelower)s-%(version)s.tar.gz'] + +sanity_check_paths = { + 'files': ['bin/puzzle','bin/ppuzzle'], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From 29667bb78653de12253532356b44a07e945b7059 Mon Sep 17 00:00:00 2001 From: pescobar Date: Mon, 20 Jan 2014 00:35:06 +0100 Subject: [PATCH 617/811] PhyML-20120412-goolf-1.4.10.eb PhyML-20131016-devel-goolf-1.4.10.eb --- .../p/PhyML/PhyML-20120412-goolf-1.4.10.eb | 29 ++++++++++++++++++ .../PhyML-20131016-devel-goolf-1.4.10.eb | 30 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb new file mode 100644 index 0000000000..b481a07466 --- /dev/null +++ b/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb @@ -0,0 +1,29 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'PhyML' +version = '20120412' + +homepage = 'http://code.google.com/p/phyml' +description = """ PhyML is a software that estimates maximum likelihood + phylogenies from alignments of nucleotide or amino acid sequences. + The main strength of PhyML lies in the large number of substitution + models coupled to various options to search the space of phylogenetic + tree topologies, going from very fast and efficient methods to slower + but generally more accurate approaches. PhyML was designed to process + moderate to large data sets. In theory, alignments with up to 4,000 + sequences 2,000,000 character-long can be processed. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://phyml.googlecode.com/files/'] +sources = ['%(namelower)s-%(version)s.tar.gz'] + +sanity_check_paths = { + 'files': ['bin/phyml'], + 'dirs': [], +} + +moduleclass = 'bio' diff --git a/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb new file mode 100644 index 0000000000..dc9be10790 --- /dev/null +++ b/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb @@ -0,0 +1,30 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'PhyML' +version = '20131016' +versionsuffix = 'devel' + +homepage = 'http://code.google.com/p/phyml' +description = """ PhyML is a software that estimates maximum likelihood + phylogenies from alignments of nucleotide or amino acid sequences. + The main strength of PhyML lies in the large number of substitution + models coupled to various options to search the space of phylogenetic + tree topologies, going from very fast and efficient methods to slower + but generally more accurate approaches. PhyML was designed to process + moderate to large data sets. In theory, alignments with up to 4,000 + sequences 2,000,000 character-long can be processed. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['http://phyml.googlecode.com/files/'] +sources = ['%(namelower)s-%(version)s.tar.gz'] + +sanity_check_paths = { + 'files': ['bin/phyml'], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From 75250e8176cf7310ced651412438b18544c260d7 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 20 Jan 2014 12:37:15 +0100 Subject: [PATCH 618/811] Added CLooG for Clang --- easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb diff --git a/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb b/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb new file mode 100644 index 0000000000..8dce651ef0 --- /dev/null +++ b/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb @@ -0,0 +1,25 @@ +name = 'CLooG' +version = '0.18.1' + +homepage = 'http://www.bastoul.net/cloog/index.php' +description = """CLooG is a free software and library to generate code for scanning Z-polyhedra. +That is, it finds a code (e.g. in C, FORTRAN...) that reaches each integral point of one or more parameterized polyhedra. +CLooG has been originally written to solve the code generation problem for optimizing compilers based on the polytope model. +Nevertheless it is used now in various area e.g. to build control automata for high-level synthesis or to find the best +polynomial approximation of a function. CLooG may help in any situation where scanning polyhedra matters. While the user +has full control on generated code quality, CLooG is designed to avoid control overhead and to produce a very effective code. +""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.bastoul.net/cloog/pages/download/'] + +dependencies = [('GMP', '5.1.3')] + +sanity_check_paths = { + 'files': ['bin/cloog', 'lib/libcloog-isl.so', 'lib/libisl.so'], + 'dirs': [] +} + +moduleclass = 'compiler' -- GitLab From ac16c2c46b385081497d2896dae4774beb07fcc8 Mon Sep 17 00:00:00 2001 From: pescobar Date: Tue, 21 Jan 2014 11:33:15 +0100 Subject: [PATCH 619/811] Vim-7.4-goolf-1.4.10.eb --- .../easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb new file mode 100644 index 0000000000..a4f2e4dec1 --- /dev/null +++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb @@ -0,0 +1,27 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'Vim' +version = '7.4' + +homepage = 'http://www.vim.org' +description = """ Vim is an advanced text editor that seeks + to provide the power of the de-facto Unix editor 'Vi', + with a more complete feature set. + """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = ['ftp://ftp.vim.org/pub/vim/unix/'] +sources = ['%(namelower)s-%(version)s.tar.bz2'] + +configopts = '--with-features=big --enable-pythoninterp=yes' + +sanity_check_paths = { + 'files': ['bin/vim','bin/vimdiff'], + 'dirs': [], +} + +moduleclass = 'tools' -- GitLab From 41a761125af3d5158833888998d8ead9d27be010 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 21 Jan 2014 15:00:15 +0100 Subject: [PATCH 620/811] Renamed CLooG to include toolchain --- .../c/CLooG/{CLooG-0.18.1.eb => CLooG-0.18.1-GCC-4.8.2.eb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/c/CLooG/{CLooG-0.18.1.eb => CLooG-0.18.1-GCC-4.8.2.eb} (100%) diff --git a/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb b/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb similarity index 100% rename from easybuild/easyconfigs/c/CLooG/CLooG-0.18.1.eb rename to easybuild/easyconfigs/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb -- GitLab From 82df8c3dff7de40fd7c606f147fb8c34aafedfef Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 21 Jan 2014 16:14:09 +0100 Subject: [PATCH 621/811] fix easyconfigs unit tests after redefining EasyConfig class parameters --- test/easyconfigs/easyconfigs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index b729fca376..2bc76390b3 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -174,7 +174,7 @@ def template_easyconfig_test(self, spec): self.assertTrue(False, "Obtained software name directly from easyconfig file") # parse easyconfig - ec = EasyConfig(spec, validate=False) + ec = EasyConfig(spec, build_options{'validate': False}) # sanity check for software name self.assertTrue(ec['name'], name) -- GitLab From 2f802ab8e2af5ef77bfbe169854e6cd1983c6ae2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 21 Jan 2014 16:17:25 +0100 Subject: [PATCH 622/811] fix typo --- test/easyconfigs/easyconfigs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 2bc76390b3..efe935b2c0 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -174,7 +174,7 @@ def template_easyconfig_test(self, spec): self.assertTrue(False, "Obtained software name directly from easyconfig file") # parse easyconfig - ec = EasyConfig(spec, build_options{'validate': False}) + ec = EasyConfig(spec, build_options={'validate': False}) # sanity check for software name self.assertTrue(ec['name'], name) -- GitLab From 099e3ae4ec4dffb354d9edcaa11416a540cb06a9 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 21 Jan 2014 16:21:01 +0100 Subject: [PATCH 623/811] fix easyconfigs unit tests after redefining EasyBlock class parameters --- test/easyconfigs/easyconfigs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index efe935b2c0..cbb7158bca 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -186,7 +186,7 @@ def template_easyconfig_test(self, spec): # instantiate easyblock with easyconfig file app_class = get_class(easyblock, name=name) - app = app_class(spec, validate_ec=False) + app = app_class(spec, build_options={'validate_ec': False}) # more sanity checks self.assertTrue(name, app.name) -- GitLab From b710db54852a558dc534265f41eb29e730267273 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 21 Jan 2014 16:57:15 +0100 Subject: [PATCH 624/811] Clang: build with polly by default --- easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb | 2 ++ easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb | 2 ++ easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb b/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb index c103be3881..36fb222244 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb @@ -43,3 +43,5 @@ languages = ['c', 'c++'] moduleclass = 'compiler' assertions = False + +usepolly = False diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb b/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb index 9f1a57dbbc..e498edc086 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb @@ -50,3 +50,5 @@ moduleclass = 'compiler' assertions = False build_targets = ['X86'] + +usepolly = False diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb index b1cd63b2ee..5a750d9a0c 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb @@ -26,6 +26,7 @@ sources = [ "llvm-%(version)s.src.tar.gz", "clang-%(version)s.src.tar.gz", "compiler-rt-%(version)s.src.tar.gz", + "polly-%(version)s.src.tar.gz", ] patches = [ @@ -39,6 +40,11 @@ patches = [ builddependencies = [('CMake', '2.8.12')] +dependencies = [ + ('GMP', '5.1.3'), + ('CLooG', '0.18.1'), +] + sanity_check_paths = { 'files': ['bin/clang', 'bin/clang++', 'lib/libclang.so', 'lib/clang/%(version)s/include/stddef.h'], 'dirs': [], -- GitLab From a23bb7e68c1472e6d82799c22dfb65167ecb330e Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 22 Jan 2014 17:20:48 +0100 Subject: [PATCH 625/811] Clustal-Omega-1.2.0-goolf-1.4.10.eb and argtable-2.13-goolf-1.4.10.eb for dependencies --- .../a/argtable/argtable-2.13-goolf-1.4.10.eb | 23 ++++++++++++++++ .../Clustal-Omega-1.2.0-goolf-1.4.10.eb | 27 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb new file mode 100644 index 0000000000..9dae0dc5da --- /dev/null +++ b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb @@ -0,0 +1,23 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'argtable' +version = '2.13' + +homepage = 'http://argtable.sourceforge.net/' +description = """ Argtable is an ANSI C library for parsing GNU style + command line options with a minimum of fuss. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = ['%s%s.tar.gz' % (name, version.replace('.','-'))] + +sanity_check_paths = { + 'files': ['lib/libargtable2.so', 'lib/libargtable2.la'], + 'dirs': ['include', 'lib', 'share'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..ccd77d5af9 --- /dev/null +++ b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb @@ -0,0 +1,27 @@ +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# Author: Pablo Escobar Lopez +# Swiss Institute of Bioinformatics +# Biozentrum - University of Basel + +name = 'Clustal-Omega' +version = '1.2.0' + +homepage = 'http://www.clustal.org/omega/' +description = """ Clustal Omega is a multiple sequence alignment + program for proteins. It produces biologically meaningful multiple + sequence alignments of divergent sequences. Evolutionary relationships + can be seen via viewing Cladograms or Phylograms """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +dependencies = [('argtable', '2.13')] + +source_urls = ['http://www.clustal.org/omega/'] +sources = ['%(namelower)s-%(version)s.tar.gz'] + +sanity_check_paths = { + 'files': ['bin/clustalo'], + 'dirs': [], +} + +moduleclass = 'bio' -- GitLab From 930ac5d3852703ce886c97c879d3569d5f97939a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 22 Jan 2014 17:24:18 +0100 Subject: [PATCH 626/811] add SuiteSparse easyconfigs + ParMETIS deps --- .../p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb | 22 +++++++++++++++++++ .../p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb | 22 +++++++++++++++++++ ...parse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb | 18 +++++++++++++++ ...Sparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb | 18 +++++++++++++++ ...parse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb | 18 +++++++++++++++ ...Sparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb | 18 +++++++++++++++ 6 files changed, 116 insertions(+) create mode 100644 easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb create mode 100644 easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb create mode 100644 easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb create mode 100644 easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb new file mode 100644 index 0000000000..c745675e3d --- /dev/null +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb @@ -0,0 +1,22 @@ +name = 'ParMETIS' +version = '4.0.3' + +homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' +description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, +meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes +routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in +ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning +schemes.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} + +source_urls = [ + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD', +] +sources = [SOURCELOWER_TAR_GZ] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb new file mode 100644 index 0000000000..6c8b6f15d8 --- /dev/null +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb @@ -0,0 +1,22 @@ +name = 'ParMETIS' +version = '4.0.3' + +homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' +description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, +meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes +routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in +ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning +schemes.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} + +source_urls = [ + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD', +] +sources = [SOURCELOWER_TAR_GZ] + +builddependencies = [('CMake', '2.8.12')] + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb new file mode 100644 index 0000000000..62896760f1 --- /dev/null +++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb @@ -0,0 +1,18 @@ +name = 'SuiteSparse' +version = '3.7.1' + +homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' +description = """SuiteSparse is a collection of libraries manipulate sparse matrices.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True} + +source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/'] +sources = [SOURCE_TAR_GZ] + +parmetis = 'ParMETIS' +parmetis_ver = '4.0.3' +versionsuffix = '-%s-%s' % (parmetis, parmetis_ver) +dependencies = [(parmetis, parmetis_ver)] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb new file mode 100644 index 0000000000..02396e3728 --- /dev/null +++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb @@ -0,0 +1,18 @@ +name = 'SuiteSparse' +version = '3.7.1' + +homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' +description = """SuiteSparse is a collection of libraries manipulate sparse matrices.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True} + +source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/'] +sources = [SOURCE_TAR_GZ] + +parmetis = 'ParMETIS' +parmetis_ver = '4.0.3' +versionsuffix = '-%s-%s' % (parmetis, parmetis_ver) +dependencies = [(parmetis, parmetis_ver)] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb new file mode 100644 index 0000000000..1193a31b09 --- /dev/null +++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb @@ -0,0 +1,18 @@ +name = 'SuiteSparse' +version = '4.2.1' + +homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' +description = """SuiteSparse is a collection of libraries manipulate sparse matrices.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True} + +source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/'] +sources = [SOURCE_TAR_GZ] + +parmetis = 'ParMETIS' +parmetis_ver = '4.0.3' +versionsuffix = '-%s-%s' % (parmetis, parmetis_ver) +dependencies = [(parmetis, parmetis_ver)] + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb new file mode 100644 index 0000000000..c537c65755 --- /dev/null +++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb @@ -0,0 +1,18 @@ +name = 'SuiteSparse' +version = '4.2.1' + +homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' +description = """SuiteSparse is a collection of libraries manipulate sparse matrices.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True} + +source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/'] +sources = [SOURCE_TAR_GZ] + +parmetis = 'ParMETIS' +parmetis_ver = '4.0.3' +versionsuffix = '-%s-%s' % (parmetis, parmetis_ver) +dependencies = [(parmetis, parmetis_ver)] + +moduleclass = 'numlib' -- GitLab From 48936e279758e541f1da7b24f991f807cc330118 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 22 Jan 2014 20:22:32 +0100 Subject: [PATCH 627/811] changed --with-features=big to --with-features=huge --- easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb index a4f2e4dec1..e305c94bc2 100644 --- a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb @@ -17,7 +17,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['ftp://ftp.vim.org/pub/vim/unix/'] sources = ['%(namelower)s-%(version)s.tar.bz2'] -configopts = '--with-features=big --enable-pythoninterp=yes' +configopts = '--with-features=huge --enable-pythoninterp=yes' sanity_check_paths = { 'files': ['bin/vim','bin/vimdiff'], -- GitLab From b37f7a81b30814b3bf637e642523862078f4930e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 23 Jan 2014 14:26:41 +0100 Subject: [PATCH 628/811] -no-OFED does not care about libib packages Signed-off-by: Fotis Georgatos --- .../o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb index f366dc6b28..6d2e812c6e 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb @@ -15,13 +15,6 @@ patches = ['pax_disable.patch'] configopts = '--with-threads=posix --enable-shared --enable-mpi-threads --without-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path -# needed for --with-openib -if OS_NAME in ['debian', 'ubuntu']: - osdependencies = ['libibverbs-dev'] -else: - # OK for OS_NAME == redhat, fedora, RHEL, SL, centos - osdependencies = ['libibverbs-devel'] - sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", -- GitLab From ac61d1da47d5b24f4db67b921ae773b557515127 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 23 Jan 2014 22:39:21 +0100 Subject: [PATCH 629/811] fix use of process_easyconfig in unit tests --- test/easyconfigs/easyconfigs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index cbb7158bca..f26b87817f 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -79,7 +79,7 @@ class EasyConfigTest(TestCase): # parse all easyconfigs easyconfigs = [] for spec in specs: - easyconfigs.extend(process_easyconfig(spec, validate=False)) + easyconfigs.extend(process_easyconfig(spec, build_options={'validate': False})) self.ordered_specs = resolve_dependencies(easyconfigs, easyconfigs_path, force=True) -- GitLab From ac187110d3cafea4577fcfc55b259c9e65c492fe Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 24 Jan 2014 02:45:11 +0100 Subject: [PATCH 630/811] no-OFEDs, no ib, simple Signed-off-by: Fotis Georgatos --- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 7 ------- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb | 7 ------- 2 files changed, 14 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb index e7e5ad26b4..ea1c8c9999 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -16,13 +16,6 @@ configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading -# needed for --with-openib -if OS_NAME in ['debian', 'ubuntu']: - osdependencies = ['libibverbs-dev'] -else: - # OK for OS_NAME == redhat, fedora, RHEL, SL, centos - osdependencies = ['libibverbs-devel'] - sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb index 947361f584..35d42cd257 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb @@ -16,13 +16,6 @@ configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading -# needed for --with-openib -if OS_NAME in ['debian', 'ubuntu']: - osdependencies = ['libibverbs-dev'] -else: - # OK for OS_NAME == redhat, fedora, RHEL, SL, centos - osdependencies = ['libibverbs-devel'] - sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", -- GitLab From a4e1133230217a2689b1854919d082f1d9174ca7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 24 Jan 2014 06:58:14 +0100 Subject: [PATCH 631/811] fix use of resolve_dependencies --- test/easyconfigs/easyconfigs.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index f26b87817f..c7a289a50f 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -81,7 +81,11 @@ class EasyConfigTest(TestCase): for spec in specs: easyconfigs.extend(process_easyconfig(spec, build_options={'validate': False})) - self.ordered_specs = resolve_dependencies(easyconfigs, easyconfigs_path, force=True) + build_options = { + 'robot_path': easyconfigs_path, + 'force': True, + } + self.ordered_specs = resolve_dependencies(easyconfigs, build_options=build_options) def test_dep_graph(self): """Unit test that builds a full dependency graph.""" -- GitLab From 4caa17e4465553e8f205d1e40269ec0b05801e06 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 24 Jan 2014 16:41:07 +0100 Subject: [PATCH 632/811] switch ftp url to http contracted the description to just two lines switched to template: SOURCELOWER_TAR_BZ2 --- easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb index e305c94bc2..4e71923e57 100644 --- a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb @@ -7,15 +7,13 @@ name = 'Vim' version = '7.4' homepage = 'http://www.vim.org' -description = """ Vim is an advanced text editor that seeks - to provide the power of the de-facto Unix editor 'Vi', - with a more complete feature set. - """ +description = """ Vim is an advanced text editor that seeks to provide the power + of the de-facto Unix editor 'Vi', with a more complete feature set. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['ftp://ftp.vim.org/pub/vim/unix/'] -sources = ['%(namelower)s-%(version)s.tar.bz2'] +source_urls = ['http://ftp.vim.org/pub/vim/unix/'] +sources = ['SOURCELOWER_TAR_BZ2'] configopts = '--with-features=huge --enable-pythoninterp=yes' -- GitLab From b39d366c92179eab7f7401b7ee33505217d45011 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 24 Jan 2014 16:49:49 +0100 Subject: [PATCH 633/811] added perl and python support and required dependencies --- easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb index 4e71923e57..9a94ed943c 100644 --- a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb @@ -15,7 +15,14 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://ftp.vim.org/pub/vim/unix/'] sources = ['SOURCELOWER_TAR_BZ2'] -configopts = '--with-features=huge --enable-pythoninterp=yes' +# this dependencies are required for --enable-pythoninterp=yes and --enable-perlinterp=yes to work +# check enabled features running "vim --version" after compilation +dependencies = [ + ('Python', '2.7.5'), + ('Perl', '5.16.3') + ] + +configopts = '--with-features=huge --enable-pythoninterp=yes --enable-perlinterp=yes' sanity_check_paths = { 'files': ['bin/vim','bin/vimdiff'], -- GitLab From 004ee0a29f740d91ec7773a8d70dd1050e082dda Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 24 Jan 2014 16:54:30 +0100 Subject: [PATCH 634/811] fixed typo --- easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb index 9a94ed943c..6d3e505fff 100644 --- a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb @@ -13,7 +13,7 @@ description = """ Vim is an advanced text editor that seeks to provide the power toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://ftp.vim.org/pub/vim/unix/'] -sources = ['SOURCELOWER_TAR_BZ2'] +sources = [SOURCELOWER_TAR_BZ2] # this dependencies are required for --enable-pythoninterp=yes and --enable-perlinterp=yes to work # check enabled features running "vim --version" after compilation -- GitLab From 3cb5aee3a7db9dc247595da013c56c964f90e580 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 24 Jan 2014 17:20:06 +0100 Subject: [PATCH 635/811] changed: source_urls = [homepage] and sources = [SOURCELOWER_TAR_GZ] --- .../c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb index ccd77d5af9..ec43e8ac61 100644 --- a/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb @@ -16,8 +16,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} dependencies = [('argtable', '2.13')] -source_urls = ['http://www.clustal.org/omega/'] -sources = ['%(namelower)s-%(version)s.tar.gz'] +source_urls = [homepage] +sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { 'files': ['bin/clustalo'], -- GitLab From 52eeb2d958e4a4026e1b203ac4bef8c369064e4e Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 24 Jan 2014 17:30:50 +0100 Subject: [PATCH 636/811] switched to template SOURCELOWER_TAR_GZ --- easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb | 2 +- .../easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb index b481a07466..a63b23cc20 100644 --- a/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb @@ -19,7 +19,7 @@ description = """ PhyML is a software that estimates maximum likelihood toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://phyml.googlecode.com/files/'] -sources = ['%(namelower)s-%(version)s.tar.gz'] +sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { 'files': ['bin/phyml'], diff --git a/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb index dc9be10790..4e9e600420 100644 --- a/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb @@ -20,7 +20,7 @@ description = """ PhyML is a software that estimates maximum likelihood toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = ['http://phyml.googlecode.com/files/'] -sources = ['%(namelower)s-%(version)s.tar.gz'] +sources = [SOURCELOWER_TAR_GZ] sanity_check_paths = { 'files': ['bin/phyml'], -- GitLab From 712628992543a89d6f71142a261a50b98a39b3cf Mon Sep 17 00:00:00 2001 From: jhale Date: Fri, 24 Jan 2014 21:44:09 +0100 Subject: [PATCH 637/811] Add new URL for Qt source download --- easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb | 3 ++- easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb | 3 ++- easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb | 3 ++- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb | 3 ++- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb | 3 ++- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb index e9b04c5257..4aa2994cd6 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb @@ -6,7 +6,8 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb index 76d6056244..99561006f5 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb @@ -6,7 +6,8 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} -source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb index 645d28151d..295259e31e 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb @@ -6,7 +6,8 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb index 7c847a9b40..0af92be3f4 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb @@ -7,7 +7,8 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'lowopt': True} # use -O1 -source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] # enforce use of -O1, required because of compiler bug that triggers 'internal error: 0_381' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb index 3f8dd7b9f5..e294af2d8b 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb @@ -6,7 +6,8 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb index 56cdaa29b3..ff0c690069 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb @@ -6,7 +6,8 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://origin.releases.qt-project.org/qt4/source/'] +backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] -- GitLab From c1a19c3e47b0f58413210c5f5bf4b7666d3931cc Mon Sep 17 00:00:00 2001 From: Adam DeConinck Date: Fri, 24 Jan 2014 18:15:29 -0800 Subject: [PATCH 638/811] Add easyconfig for nodejs 0.10.24 --- .../n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb new file mode 100644 index 0000000000..7bcd02f7e6 --- /dev/null +++ b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb @@ -0,0 +1,29 @@ +# Note: +# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild +# It was auto-generated based on a template easyconfig, so it should be used with care. + +name = 'nodejs' +version = '0.10.24' + +homepage = 'http://nodejs.org' +description = """Node.js is a platform built on Chrome's JavaScript runtime + for easily building fast, scalable network applications. Node.js uses an + event-driven, non-blocking I/O model that makes it lightweight and efficient, + perfect for data-intensive real-time applications that run across distributed devices.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = ['node-v%(version)s.tar.gz'] +source_urls = ['http://nodejs.org/dist/v%(version)s/'] + +dependencies = [('Python','2.7.5')] +builddependencies = [('Python','2.7.5')] + +# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories +sanity_check_paths = { + 'files': ["bin/node", "bin/npm", ], + 'dirs': ["lib/node_modules", "lib/dtrace", "include/node"] +} + +# You SHOULD change the following line; Kindly consult other easyconfigs for possible options +moduleclass = 'lang' -- GitLab From c6281207bfe3bff305a71cae5e353a7ebb3d2c91 Mon Sep 17 00:00:00 2001 From: pescobar Date: Sat, 25 Jan 2014 17:45:22 +0100 Subject: [PATCH 639/811] source_urls = [homepage] --- .../m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb index 129a0d9043..b608cfdee4 100644 --- a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -15,7 +15,7 @@ description = """MAFFT is a multiple sequence alignment program toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://mafft.cbrc.jp/alignment/software/'] +source_urls = [homepage] sources = ['%(namelower)s-%(version)s-%(versionsuffix)s-src.tgz'] skipsteps = ['configure'] -- GitLab From 290b8804de2542a0a9c05e18120dcd2d80c23d49 Mon Sep 17 00:00:00 2001 From: pescobar Date: Sun, 26 Jan 2014 00:30:21 +0100 Subject: [PATCH 640/811] sources = [SOURCELOWER_TAR_GZ] && parallel=1 --- .../t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb index b8f881674e..c0af373e76 100644 --- a/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb @@ -15,11 +15,14 @@ description = """ TREE-PUZZLE is a computer program to reconstruct toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://www.tree-puzzle.de'] -sources = ['%(namelower)s-%(version)s.tar.gz'] +source_urls = [homepage] +sources = [SOURCELOWER_TAR_GZ] + +# build with just 1 cpu to avoid errors +parallel = 1 sanity_check_paths = { - 'files': ['bin/puzzle','bin/ppuzzle'], + 'files': ['bin/puzzle', 'bin/ppuzzle'], 'dirs': [], } -- GitLab From 53c3cc9f91a0d5b32ce19f2ebe308df13d86b7d6 Mon Sep 17 00:00:00 2001 From: Adam DeConinck Date: Sun, 26 Jan 2014 17:52:31 -0800 Subject: [PATCH 641/811] Cleanup nodejs easyconfig --- .../n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb | 15 +++++---------- .../v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb index 7bcd02f7e6..9c91472a53 100644 --- a/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb @@ -1,29 +1,24 @@ -# Note: -# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild -# It was auto-generated based on a template easyconfig, so it should be used with care. - name = 'nodejs' version = '0.10.24' homepage = 'http://nodejs.org' + description = """Node.js is a platform built on Chrome's JavaScript runtime - for easily building fast, scalable network applications. Node.js uses an - event-driven, non-blocking I/O model that makes it lightweight and efficient, - perfect for data-intensive real-time applications that run across distributed devices.""" + for easily building fast, scalable network applications. Node.js uses an + event-driven, non-blocking I/O model that makes it lightweight and efficient, + perfect for data-intensive real-time applications that run across distributed devices.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = ['node-v%(version)s.tar.gz'] + source_urls = ['http://nodejs.org/dist/v%(version)s/'] dependencies = [('Python','2.7.5')] -builddependencies = [('Python','2.7.5')] -# The sanity test MUST be tuned before going production and submitting your contribution to upstream git repositories sanity_check_paths = { 'files': ["bin/node", "bin/npm", ], 'dirs': ["lib/node_modules", "lib/dtrace", "include/node"] } -# You SHOULD change the following line; Kindly consult other easyconfigs for possible options moduleclass = 'lang' diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index 12fd4698df..5aad39eba9 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -2,7 +2,7 @@ easyblock = 'VersionIndependendPythonPackage' name = 'vsc-mympirun' version = '3.2.1' -homepage = 'http://hpcugent.github.com/vsc-mympirun/' +homepage = 'http://github.com/hpcugent/vsc-mympirun/' description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" # we build this to work with every python version -- GitLab From 60a3a3e80253de129333ae0e57868ab88113c92b Mon Sep 17 00:00:00 2001 From: Ewan Higgs Date: Mon, 27 Jan 2014 14:55:11 +0100 Subject: [PATCH 642/811] =?UTF-8?q?Support=20protobuf=20("Google=20Protoco?= =?UTF-8?q?l=20Buffers")=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.5.0 is the latest version. 2.4.0a is required by Hadoop-2.0.0-cdh4.5.0. --- .../p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb | 17 +++++++++++++++++ .../p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb b/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb new file mode 100644 index 0000000000..506350152b --- /dev/null +++ b/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'protobuf' +version = '2.4.0a' + +homepage = 'https://code.google.com/p/protobuf/' +description = """Google Protocol Buffers""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['https://protobuf.googlecode.com/files/'] + +sanity_check_paths = { + 'files': ['bin/protoc'], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..149c94d9e7 --- /dev/null +++ b/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb @@ -0,0 +1,17 @@ +name = 'protobuf' +version = '2.5.0' + +homepage = 'https://code.google.com/p/protobuf/' +description = """Google Protocol Buffers""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['https://protobuf.googlecode.com/files/'] + +sanity_check_paths = { + 'files': ['bin/protoc'], + 'dirs': [] +} + +moduleclass = 'devel' -- GitLab From 52dbabad2755ca2bbbe1130fc238a98d50a40fdf Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 17 Jan 2014 11:42:58 +0100 Subject: [PATCH 643/811] Update vsc-mympirun-3.2.1.eb --- easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index 12fd4698df..5aad39eba9 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -2,7 +2,7 @@ easyblock = 'VersionIndependendPythonPackage' name = 'vsc-mympirun' version = '3.2.1' -homepage = 'http://hpcugent.github.com/vsc-mympirun/' +homepage = 'http://github.com/hpcugent/vsc-mympirun/' description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent.""" # we build this to work with every python version -- GitLab From 95ff1981dc503f602400c8b70015f66ad49ea9ac Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 30 Jan 2014 03:12:00 +0100 Subject: [PATCH 644/811] fix modextrapaths for Chapel as needed Signed-off-by: Fotis Georgatos --- .../easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb | 5 +++++ easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb | 5 +++++ easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb | 5 +++++ easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb | 5 +++++ easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb index 74971c2b92..0ecf5d3f45 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb @@ -28,4 +28,9 @@ unpack_options = '--strip-components=1' parallel = 1 # parallel build may fail +modextrapaths = { + 'PATH': 'util', + 'CHPL_HOME': '', +} + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb index 8699640db2..93406cb2aa 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb @@ -29,4 +29,9 @@ unpack_options = '--strip-components=1' # parallel build fails parallel = 1 +modextrapaths = { + 'PATH': 'util', + 'CHPL_HOME': '', +} + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb index a7621be492..cfdb1760fd 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb @@ -29,4 +29,9 @@ unpack_options = '--strip-components=1' # parallel build fails parallel = 1 +modextrapaths = { + 'PATH': 'util', + 'CHPL_HOME': '', +} + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb index e1b2b7b42c..cb35b40757 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb @@ -37,4 +37,9 @@ sanity_check_paths = { 'dirs': [], } +modextrapaths = { + 'PATH': 'util', + 'CHPL_HOME': '', +} + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb index 388ed0d1a5..287a7c1d2b 100644 --- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb +++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb @@ -37,4 +37,9 @@ sanity_check_paths = { 'dirs': [], } +modextrapaths = { + 'PATH': 'util', + 'CHPL_HOME': '', +} + moduleclass = 'lang' -- GitLab From d6fa0ff85c2bf50b217cca90dad6b8a26128c0c6 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 13:58:01 +0100 Subject: [PATCH 645/811] HDF5: updated to 1.8.12 with ictce-5.5.0 --- .../h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb | 21 +++++++++++++++++++ .../s/Szip/Szip-2.1-ictce-5.5.0.eb | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb new file mode 100644 index 0000000000..0edef61eb4 --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb @@ -0,0 +1,21 @@ +name = 'HDF5' +version = '1.8.12' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [ + ('zlib', '1.2.8'), + ('Szip', '2.1'), +] + +patches = ['configure_libtool.patch'] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..d2fa1bb4ae --- /dev/null +++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb @@ -0,0 +1,21 @@ +name = 'Szip' +version = '2.1' + +homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/' +description = "Szip compression software, providing lossless compression of scientific data" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +configopts = "--with-pic" + +sanity_check_paths = { + 'files': ["lib/libsz.a", "lib/libsz.so"] + + ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]], + 'dirs': [], +} + +moduleclass = 'tools' -- GitLab From 0741474cdc0c3405bb415a798d7baa13292523b6 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 13:58:55 +0100 Subject: [PATCH 646/811] h5py: updated to 2.2.1 with ictce 5.5.0 --- .../h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..9f0f4603f5 --- /dev/null +++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,32 @@ +easyblock = "PythonPackage" + +name = 'h5py' +version = '2.2.1' + +homepage = 'http://code.google.com/p/h5py/' +description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library, + version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous + amounts of data.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'usempi': True} + +source_urls = ['http://h5py.googlecode.com/files/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.5' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), + ('HDF5', '1.8.12'), +] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], +} + +moduleclass = 'data' -- GitLab From 3008b5694d08c230d38ebefef07fd45fbd4ea746 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 14:33:52 +0100 Subject: [PATCH 647/811] mpi4py: new version and new download url --- .../mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..10bcd119a6 --- /dev/null +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,21 @@ +easyblock = 'PythonPackage' + +name = 'mpi4py' +version = '1.3.1' + +homepage = 'https://code.google.com/p/mpi4py/' +description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for + the Python programming language, allowing any Python program to exploit multiple processors.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [BITBUCKET_DOWNLOADS] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pyver = '2.7.5' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [(python, pyver)] + +moduleclass = 'mpi' -- GitLab From 2e95bf8198455dd6cf323cb34cc7adc9b6937c7a Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 14:36:24 +0100 Subject: [PATCH 648/811] mpi4py: correct homepage url --- .../easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb index 10bcd119a6..07e1ecd0dc 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb @@ -3,7 +3,7 @@ easyblock = 'PythonPackage' name = 'mpi4py' version = '1.3.1' -homepage = 'https://code.google.com/p/mpi4py/' +homepage = 'https://bitbucket.org/mpi4py/mpi4py' description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for the Python programming language, allowing any Python program to exploit multiple processors.""" -- GitLab From e02e1137996fc9d58be47c7c4e415e5500a337ce Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 14:52:42 +0100 Subject: [PATCH 649/811] HDF5: use MPI --- easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb index 0edef61eb4..1e14350d7c 100644 --- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb @@ -6,7 +6,7 @@ description = """HDF5 is a unique technology suite that makes possible the manag extremely large and complex data collections.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'optarch': True, 'pic': True} +toolchainopts = {'optarch': True, 'pic': True, 'usempi': True} source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] sources = [SOURCELOWER_TAR_GZ] -- GitLab From 35c6875943c24cfe689600acbd38624f3ca42b2b Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 18:23:26 +0100 Subject: [PATCH 650/811] Greenlet updated to 0.4.2 with ictce-5.5.0 --- ...Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb | 39 +++++++++++++++++++ ...md64_predefined_in_prepocessor-0.4.2.patch | 11 ++++++ 2 files changed, 50 insertions(+) create mode 100644 easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb create mode 100644 easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..2de415b2d7 --- /dev/null +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,39 @@ +easyblock = "PythonPackage" + +name = 'Greenlet' +version = '0.4.2' + +homepage = 'https://github.com/python-greenlet/greenlet' +description = """The greenlet package is a spin-off of Stackless, a version of CPython that + supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single + or a few OS-level threads) and are synchronized with data exchanges on "channels". + A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit + scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [PYPI_LOWER_SOURCE] +sources = [SOURCELOWER_ZIP] + +python = "Python" +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) + +versionsuffix = "-%s-%s" % (python, pythonversion) + +dependencies = [ + (python, pythonversion), + ] + +patches = [ + 'icc_no_amd64_predefined_in_prepocessor-%(version)s.patch', + ] + +sanity_check_paths = { + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion, + ], + 'dirs': [] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch b/easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch new file mode 100644 index 0000000000..0afb624caf --- /dev/null +++ b/easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch @@ -0,0 +1,11 @@ +--- slp_platformselect.h.orig 2014-01-06 23:48:38.000000000 +0100 ++++ slp_platformselect.h 2014-01-31 18:05:36.125349420 +0100 +@@ -8,7 +8,7 @@ + #include "platform/switch_x64_msvc.h" /* MS Visual Studio on X64 */ + #elif defined(__GNUC__) && defined(__amd64__) && defined(__ILP32__) + #include "platform/switch_x32_unix.h" /* gcc on amd64 with x32 ABI */ +-#elif defined(__GNUC__) && defined(__amd64__) ++#elif defined(__GNUC__) && defined(__x86_64__) + #include "platform/switch_amd64_unix.h" /* gcc on amd64 */ + #elif defined(__GNUC__) && defined(__i386__) + #include "platform/switch_x86_unix.h" /* gcc on X86 */ -- GitLab From 8bd00dac229a588a187e8518dfa7b9594de20d3c Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 18:24:27 +0100 Subject: [PATCH 651/811] Update PyZMQ to python 2.7.5 with ictce-5.5.0 --- .../o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb | 26 +++++++++++++++ ...Q-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb | 31 +++++++++++++++++ .../util-linux-2.24.1-ictce-5.5.0.eb | 30 +++++++++++++++++ .../z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb | 33 +++++++++++++++++++ 4 files changed, 120 insertions(+) create mode 100644 easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb create mode 100644 easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb new file mode 100644 index 0000000000..d23dd609d1 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb @@ -0,0 +1,26 @@ +name = 'OpenPGM' +version = '5.2.122' + +homepage = 'http://code.google.com/p/openpgm/' +description = """OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM) + specification in RFC 3208 available at www.ietf.org. PGM is a reliable and scalable multicast protocol + that enables receivers to detect loss, request retransmission of lost data, or notify an application + of unrecoverable loss. PGM is a receiver-reliable protocol, which means the receiver is responsible + for ensuring all data is received, absolving the sender of reception responsibility.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://%s.googlecode.com/files/' % (name.lower())] +sources = ['%s-%s.tar.gz' % ('libpgm', version)] + +configopts = '--with-pic' + +start_dir = 'pgm' + +sanity_check_paths = { + 'files': ['lib/libpgm.so', 'lib/libpgm.a'], + 'dirs': ['include'] + } + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb new file mode 100644 index 0000000000..398114576d --- /dev/null +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb @@ -0,0 +1,31 @@ +name = 'PyZMQ' +version = '2.2.0.1' + +homepage = 'http://www.zeromq.org/bindings:python' +description = """Python bindings for ZeroMQ""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [PYPI_LOWER_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +python = 'Python' +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[0:2]) +zmqversion = '2.2.0' + +versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) + +dependencies = [ + (python, pythonversion), + ('ZeroMQ', zmqversion), + ] + +options = {'modulename': 'zmq'} + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] + } + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..533a0dcc2f --- /dev/null +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb @@ -0,0 +1,30 @@ +name = 'util-linux' +version = '2.24.1' + +homepage = 'http://www.kernel.org/pub/linux/utils/util-linux' +description = """Set of Linux utilities""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )] +sources = [SOURCELOWER_TAR_GZ] + +# disable account related utilities (they need OS dependant pam-devel files) +# disable wall and friends (requires group changing permissions for install user) +# install systemd service files in install dir +# install bash completion files in install dir +configopts = '--disable-chfn-chsh --disable-login --disable-su ' +configopts += '--disable-wall --disable-use-tty-group ' +configopts += '--disable-makeinstall-chown --disable-makeinstall-setuid ' +configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " +configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' " + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'] + } + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb new file mode 100644 index 0000000000..cb028a5c0d --- /dev/null +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb @@ -0,0 +1,33 @@ +name = 'ZeroMQ' +version = '2.2.0' + +homepage = 'http://www.zeromq.org/' +description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework. + It gives you sockets that carry atomic messages across various transports like in-process, + inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout, + pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered + products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous + message-processing tasks. It has a score of language APIs and runs on most operating systems.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://download.zeromq.org/'] +sources = [SOURCELOWER_TAR_GZ] + +# --with-pgm will use shipped OpenPGM (in foreign subdir) +configopts = '--with-pic --with-system-pgm ' +configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" ' +configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' + +dependencies = [ + ('OpenPGM', '5.2.122'), + ('util-linux', '2.24.1') + ] + +sanity_check_paths = { + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'] + } + +moduleclass = 'devel' -- GitLab From eda90d1ba8279b8ed58a3bed1443e74b9d6f1613 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 31 Jan 2014 18:24:54 +0100 Subject: [PATCH 652/811] SCOOP: updated to 0.6.2 with ictce-5.5.0 --- .../SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb new file mode 100644 index 0000000000..cedd07f1dd --- /dev/null +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb @@ -0,0 +1,37 @@ +easyblock = "PythonPackage" + +name = 'SCOOP' +version = '0.6.2' + +homepage = 'http://code.google.com/p/scoop/' +description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module + allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" + + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ["http://scoop.googlecode.com/files/"] +sources = ["%(namelower)s-%(version)s.release.tar.gz"] + +python = 'Python' +pythonversion = '2.7.5' +pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +versionsuffix = '-%s-%s' % (python, pythonversion) +zmqapi = 2 + +dependencies = [ + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.2', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), + ] + +sanity_check_paths = { + 'dirs': [], + 'files': [('lib/python%(pyv)s/site-packages/' + 'scoop-%(version)s.release-py%(pyv)s.egg') % + {'pyv': pythonshortversion, + 'version': version } + ] + } + +moduleclass = 'tools' -- GitLab From abc3c1be285ef5689f74d9bfba71b008d6009b32 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Mon, 3 Feb 2014 10:43:32 +0100 Subject: [PATCH 653/811] Added GMP with GCC-4.8.2 for Clang --- .../easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb new file mode 100644 index 0000000000..191277eee5 --- /dev/null +++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb @@ -0,0 +1,23 @@ +name = 'GMP' +version = '5.1.3' + +homepage = 'http://gmplib.org/' +description = """GMP is a free library for arbitrary precision arithmetic, +operating on signed integers, rational numbers, and floating point numbers. """ + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_BZ2] +source_urls = [GNU_SOURCE] + +# enable C++ interface +configopts = '--enable-cxx' + +runtest = 'check' + +sanity_check_paths = { + 'files': ['lib/libgmp.so', 'include/gmp.h'], + 'dirs': [], +} + +moduleclass = 'math' -- GitLab From 59746bf234a1c8d8264806c259de66b9085fd406 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 4 Feb 2014 11:52:33 +0100 Subject: [PATCH 654/811] h5py: now actually with mpi support --- .../h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb index 9f0f4603f5..5419efd76b 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb @@ -3,7 +3,7 @@ easyblock = "PythonPackage" name = 'h5py' version = '2.2.1' -homepage = 'http://code.google.com/p/h5py/' +homepage = 'http://www.h5py.org/' description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library, version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous amounts of data.""" @@ -11,7 +11,7 @@ description = """HDF5 for Python (h5py) is a general-purpose Python interface to toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'usempi': True} -source_urls = ['http://h5py.googlecode.com/files/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' @@ -19,9 +19,12 @@ pythonver = '2.7.5' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +installopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.12'), + ('mpi4py', '1.3.1', versionsuffix), ] sanity_check_paths = { -- GitLab From 41b560a8d99214f2c4a2492c7e32e73c666404e3 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 5 Feb 2014 16:16:33 +0100 Subject: [PATCH 655/811] fix quote business Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb | 2 +- easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb index eed358ec55..f08911ac1e 100644 --- a/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb +++ b/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb @@ -7,7 +7,7 @@ version = '1.3.0' homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/' description = """Intel SPMD Program Compilers; An open-source compiler for high-performance SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language, - with extensions for "single program, multiple data" (SPMD) programming. + with extensions for 'single program, multiple data' (SPMD) programming. Under the SPMD model, the programmer writes a program that generally appears to be a regular serial program, though the execution model is actually that a number of program instances execute in parallel on the hardware.""" diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb index 1cb61c35ec..384c54d6b1 100644 --- a/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb +++ b/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb @@ -7,7 +7,7 @@ version = '1.5.0' homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/' description = """Intel SPMD Program Compilers; An open-source compiler for high-performance SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language, - with extensions for "single program, multiple data" (SPMD) programming. + with extensions for 'single program, multiple data' (SPMD) programming. Under the SPMD model, the programmer writes a program that generally appears to be a regular serial program, though the execution model is actually that a number of program instances execute in parallel on the hardware.""" -- GitLab From add37d47dd6ae004fcb237ca970fecf61f0b7d3f Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 5 Feb 2014 16:21:45 +0100 Subject: [PATCH 656/811] fix quotes in descriptions, for Lmod cache compatibility Signed-off-by: Fotis Georgatos --- .../Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 6 +++--- .../g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb | 6 +++--- .../g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb | 6 +++--- .../g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb | 6 +++--- .../g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb | 2 +- .../easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb | 2 +- .../i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb | 2 +- .../easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb | 2 +- .../easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb | 2 +- .../p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb | 2 +- .../easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb | 2 +- .../easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb | 2 +- .../easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb | 2 +- .../x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb | 2 +- .../easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb | 2 +- .../easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb | 2 +- .../easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb | 2 +- 23 files changed, 31 insertions(+), 31 deletions(-) diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index d24861f722..e0ef726298 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -5,9 +5,9 @@ version = '0.4.0' homepage = 'https://github.com/python-greenlet/greenlet' description = """The greenlet package is a spin-off of Stackless, a version of CPython that - supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single - or a few OS-level threads) and are synchronized with data exchanges on "channels". - A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit + supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single + or a few OS-level threads) and are synchronized with data exchanges on 'channels'. + A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb index 59de038289..54a12ec5a6 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb @@ -5,9 +5,9 @@ version = '0.4.0' homepage = 'https://github.com/python-greenlet/greenlet' description = """The greenlet package is a spin-off of Stackless, a version of CPython that -supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single -or a few OS-level threads) and are synchronized with data exchanges on "channels". -A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit +supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single +or a few OS-level threads) and are synchronized with data exchanges on 'channels'. +A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs. """ toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb index 079811b174..d97e5f360a 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb @@ -5,9 +5,9 @@ version = '0.4.0' homepage = 'https://github.com/python-greenlet/greenlet' description = """The greenlet package is a spin-off of Stackless, a version of CPython that - supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single - or a few OS-level threads) and are synchronized with data exchanges on "channels". - A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit + supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single + or a few OS-level threads) and are synchronized with data exchanges on 'channels'. + A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb index 49b94ba41f..8daf2640d5 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb @@ -5,9 +5,9 @@ version = '0.4.0' homepage = 'https://github.com/python-greenlet/greenlet' description = """The greenlet package is a spin-off of Stackless, a version of CPython that - supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single - or a few OS-level threads) and are synchronized with data exchanges on "channels". - A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit + supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single + or a few OS-level threads) and are synchronized with data exchanges on 'channels'. + A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb index 1f22264a23..dc7e4b916a 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.2.3' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb index f03d5ac65f..5636300f58 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.2.3' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb index e5c7bb899d..d473bf8554 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.2.3' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb index 64379dcbec..c370646492 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.2.3' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb index cd304a31b0..fca617a485 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.4.0' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb index 4780aece0d..ac31ff9416 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.4.0' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb index 568873fa47..f664330089 100644 --- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb @@ -2,7 +2,7 @@ name = 'g2clib' version = '1.4.0' homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/' -description = """Library contains GRIB2 encoder/decoder ("C" version).""" +description = """Library contains GRIB2 encoder/decoder ('C' version).""" toolchain = {'name': 'iqacml', 'version': '3.7.3'} toolchainopts = {'opt': True} diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb index f2c8d1274e..d3db545e1a 100644 --- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb @@ -14,7 +14,7 @@ name = 'Infernal' version = '1.1rc1' homepage = 'http://infernal.janelia.org/' -description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases +description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases for RNA structure and sequence similarities.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb index 25d1562163..51e22a99b8 100644 --- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb @@ -14,7 +14,7 @@ name = 'Infernal' version = '1.1rc1' homepage = 'http://infernal.janelia.org/' -description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases +description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases for RNA structure and sequence similarities.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb index 81e6ea4a46..49c4ff18a2 100644 --- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb @@ -14,7 +14,7 @@ name = 'Infernal' version = '1.1rc1' homepage = 'http://infernal.janelia.org/' -description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases +description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases for RNA structure and sequence similarities.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb index 14693175a9..e9de6ee650 100644 --- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb @@ -14,7 +14,7 @@ name = 'Infernal' version = '1.1rc1' homepage = 'http://infernal.janelia.org/' -description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases +description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases for RNA structure and sequence similarities.""" diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb index 642cc1ae68..e193532b76 100644 --- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb @@ -2,7 +2,7 @@ name = 'Primer3' version = '2.3.0' homepage = 'http://primer3.sourceforge.net' -description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction"). +description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction'). PCR is an essential and ubiquitous tool in genetics and molecular biology. Primer3 can also design hybridization probes and sequencing primers.""" diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb index f23e805270..744c1f126c 100644 --- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb @@ -2,7 +2,7 @@ name = 'Primer3' version = '2.3.0' homepage = 'http://primer3.sourceforge.net' -description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction"). +description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction'). PCR is an essential and ubiquitous tool in genetics and molecular biology. Primer3 can also design hybridization probes and sequencing primers.""" diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb index c6d73b18f6..cfa0ccd59d 100644 --- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb @@ -2,7 +2,7 @@ name = 'Primer3' version = '2.3.0' homepage = 'http://primer3.sourceforge.net' -description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction"). +description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction'). PCR is an essential and ubiquitous tool in genetics and molecular biology. Primer3 can also design hybridization probes and sequencing primers.""" diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb index 1596c5404e..a79e65bdea 100644 --- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb @@ -2,7 +2,7 @@ name = 'Primer3' version = '2.3.0' homepage = 'http://primer3.sourceforge.net' -description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction"). +description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction'). PCR is an essential and ubiquitous tool in genetics and molecular biology. Primer3 can also design hybridization probes and sequencing primers.""" diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb index 842e1cde97..dfbf3d0849 100644 --- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb +++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb @@ -3,7 +3,7 @@ version = '3.95-0.1' homepage = 'http://cran.r-project.org/web/packages/XML' description = """This package provides many approaches for both reading and creating XML (and HTML) documents - (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter".""" + (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb index dbd5ba5e89..366fa8a2aa 100644 --- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb +++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb @@ -3,7 +3,7 @@ version = '3.95-0.1' homepage = 'http://cran.r-project.org/web/packages/XML' description = """This package provides many approaches for both reading and creating XML (and HTML) documents -(including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter".""" +(including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb index 67a54f40cd..695f7960bc 100644 --- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb +++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb @@ -3,7 +3,7 @@ version = '3.95-0.1' homepage = 'http://cran.r-project.org/web/packages/XML' description = """This package provides many approaches for both reading and creating XML (and HTML) documents - (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter".""" + (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb index 16a2b8f853..e5358dc0d2 100644 --- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb +++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb @@ -3,7 +3,7 @@ version = '3.95-0.1' homepage = 'http://cran.r-project.org/web/packages/XML' description = """This package provides many approaches for both reading and creating XML (and HTML) documents - (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter".""" + (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -- GitLab From c01edc3eaf7c33c7cc8e85d533ffe4391f7825a6 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 5 Feb 2014 17:26:24 +0100 Subject: [PATCH 657/811] FASTX-Toolkit-0.0.14-goolf-1.4.10.eb --- .../FASTX-Toolkit-0.0.14-goolf-1.4.10.eb | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb new file mode 100644 index 0000000000..4bc8783a8a --- /dev/null +++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb @@ -0,0 +1,43 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'FASTX-Toolkit' +version = '0.0.14' + +homepage = 'http://hannonlab.cshl.edu/fastx_toolkit/' +description = """The FASTX-Toolkit is a collection of command line tools +for Short-Reads FASTA/FASTQ files preprocessing.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'optarch': True, 'pic': True} + +altname = name.lower().replace('-','_') +source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s'] +sources = ['%s-%s.tar.bz2' % (altname, version)] + +dependencies = [('libgtextutils', '0.6.1')]; + +sanity_check_paths = { + 'files': ['bin/fastx_%s' % x for x in ['clipper', 'trimmer', 'quality_stats', + 'artifacts_filter', 'reverse_complement', + 'collapser', 'uncollapser', 'renamer', + 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh', + 'nucleotide_distribution_line_graph.sh']] + + ['bin/fasta_%s' % x for x in ['clipping_histogram.pl', 'formatter', + 'nucleotide_changer']] + + ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter', + 'to_fasta', 'quality_filter', 'quality_trimmer', + 'masker']], + 'dirs': ['.'] + } + +moduleclass = 'bio' -- GitLab From e3024f17b845795b7f75a1d5fdeb09759a05ed8d Mon Sep 17 00:00:00 2001 From: jhale Date: Thu, 6 Feb 2014 16:23:38 +0100 Subject: [PATCH 658/811] Adjusted style as suggested by boegel --- easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb | 7 +++++-- .../easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb | 6 ++++-- easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb | 6 ++++-- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb | 6 ++++-- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb | 6 ++++-- easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb | 6 ++++-- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb index 4aa2994cd6..de79c4daae 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb @@ -6,8 +6,11 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' -source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/' + \ + '%(major_minor_version)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb index 99561006f5..2d4e7c17a1 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb @@ -6,8 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} -backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' -source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb index 295259e31e..f83f3ffb6a 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb @@ -6,8 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'goolf', 'version': '1.4.10'} -backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' -source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb index 0af92be3f4..ffa5551d14 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb @@ -7,8 +7,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '4.0.6'} toolchainopts = {'lowopt': True} # use -O1 -backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' -source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] # enforce use of -O1, required because of compiler bug that triggers 'internal error: 0_381' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb index e294af2d8b..e05c77a46b 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb @@ -6,8 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '4.1.13'} -backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' -source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb index ff0c690069..654eb56d93 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb @@ -6,8 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'ictce', 'version': '5.3.0'} -backup_url = 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' -source_urls = ['http://origin.releases.qt-project.org/qt4/source/', backup_url] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] -- GitLab From 2a549170881f2060a1bd9d7175e2a0b4aa8105af Mon Sep 17 00:00:00 2001 From: jhale Date: Thu, 6 Feb 2014 16:26:03 +0100 Subject: [PATCH 659/811] Join split url --- easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb index de79c4daae..15b02947ee 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb @@ -8,8 +8,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/' + \ - '%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] -- GitLab From e8a2c63d81949f9fa751a88a9aa9acd9f19997e9 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 6 Feb 2014 16:48:28 +0100 Subject: [PATCH 660/811] add latest and greatest Lmod/Lua pair Signed-off-by: Fotis Georgatos --- .../l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb | 22 +++++++++++++++++ .../l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb | 24 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb new file mode 100644 index 0000000000..14c2d00848 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb @@ -0,0 +1,22 @@ +name = "Lmod" +version = "5.2.5" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] + +dependencies = [("Lua", "5.1.4-8")] + +sanity_check_paths = { + 'files': ["lmod/%(version)s/init/profile"], + 'dirs': [] +} + +moduleclass = "tools" diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb new file mode 100644 index 0000000000..2d4f7773d7 --- /dev/null +++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb @@ -0,0 +1,24 @@ +name = "Lua" +version = "5.1.4-8" + +homepage = "http://www.lua.org/" +description = """Lua is a powerful, fast, lightweight, embeddable scripting language. + Lua combines simple procedural syntax with powerful data description constructs based + on associative arrays and extensible semantics. Lua is dynamically typed, + runs by interpreting bytecode for a register-based virtual machine, + and has automatic memory management with incremental garbage collection, + making it ideal for configuration, scripting, and rapid prototyping.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = ['lua-%s.tar.gz' % version.replace('-', '.')] +source_urls = ['http://sourceforge.net/projects/lmod/files/'] + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ["bin/lua"], + 'dirs': [] +} + +moduleclass = "lang" -- GitLab From bf78655313b0bc553fc2ca3501d5a720b17d7497 Mon Sep 17 00:00:00 2001 From: pescobar Date: Thu, 6 Feb 2014 22:13:28 +0100 Subject: [PATCH 661/811] style fixes --- .../FASTX-Toolkit-0.0.14-goolf-1.4.10.eb | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb index 4bc8783a8a..d529b00f96 100644 --- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb @@ -14,30 +14,30 @@ name = 'FASTX-Toolkit' version = '0.0.14' homepage = 'http://hannonlab.cshl.edu/fastx_toolkit/' -description = """The FASTX-Toolkit is a collection of command line tools -for Short-Reads FASTA/FASTQ files preprocessing.""" +description = """The FASTX-Toolkit is a collection of command line tools for + Short-Reads FASTA/FASTQ files preprocessing.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'pic': True} altname = name.lower().replace('-','_') source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s'] -sources = ['%s-%s.tar.bz2' % (altname, version)] +sources = ['%s-%%(version)s.tar.bz2' % altname] dependencies = [('libgtextutils', '0.6.1')]; sanity_check_paths = { - 'files': ['bin/fastx_%s' % x for x in ['clipper', 'trimmer', 'quality_stats', - 'artifacts_filter', 'reverse_complement', - 'collapser', 'uncollapser', 'renamer', - 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh', - 'nucleotide_distribution_line_graph.sh']] + - ['bin/fasta_%s' % x for x in ['clipping_histogram.pl', 'formatter', - 'nucleotide_changer']] + - ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter', - 'to_fasta', 'quality_filter', 'quality_trimmer', - 'masker']], - 'dirs': ['.'] - } + 'files': + ['bin/fastx_%s' % x for x in + ['clipper', 'trimmer', 'quality_stats', 'artifacts_filter', 'reverse_complement', + 'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh', + 'nucleotide_distribution_line_graph.sh']] + + ['bin/fasta_%s' % x for x in + ['clipping_histogram.pl', 'formatter', 'nucleotide_changer']] + + ['bin/fastq_%s' % x for x in + ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter', + 'quality_trimmer', 'masker']], + 'dirs': ['.'] + } moduleclass = 'bio' -- GitLab From e7cdefae3c80b5d8eed384fcc204edd3d51b8363 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 11 Feb 2014 21:25:31 +0100 Subject: [PATCH 662/811] add patch for v1.4.5, to show openmpi fancyness Signed-off-by: Fotis Georgatos --- .../OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch diff --git a/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch b/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch new file mode 100644 index 0000000000..fec0e69c83 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch @@ -0,0 +1,11 @@ +--- opal/etc/openmpi-mca-params.conf.orig 2009-12-08 21:36:08.000000000 +0100 ++++ opal/etc/openmpi-mca-params.conf 2013-03-17 08:13:21.216969244 +0100 +@@ -56,3 +56,8 @@ + + # See "ompi_info --param all all" for a full listing of Open MPI MCA + # parameters available and their default values. ++ ++# FG, 20130317; customization for University of Luxembourg systems ++btl_openib_if_exclude=mlx4_1 ++btl_openib_warn_nonexistent_if=0 ++plm_rsh_agent=oarsh -- GitLab From d4560c5c2cefb3dcb122a661074b2791b977e7f9 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 11 Feb 2014 22:37:43 +0100 Subject: [PATCH 663/811] Revert "add patch for v1.4.5, to show openmpi fancyness" This reverts commit e7cdefae3c80b5d8eed384fcc204edd3d51b8363. --- .../OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch diff --git a/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch b/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch deleted file mode 100644 index fec0e69c83..0000000000 --- a/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-1.4.5-local.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opal/etc/openmpi-mca-params.conf.orig 2009-12-08 21:36:08.000000000 +0100 -+++ opal/etc/openmpi-mca-params.conf 2013-03-17 08:13:21.216969244 +0100 -@@ -56,3 +56,8 @@ - - # See "ompi_info --param all all" for a full listing of Open MPI MCA - # parameters available and their default values. -+ -+# FG, 20130317; customization for University of Luxembourg systems -+btl_openib_if_exclude=mlx4_1 -+btl_openib_warn_nonexistent_if=0 -+plm_rsh_agent=oarsh -- GitLab From 705c82dc671510eedaac1a49203ef29dd73b0147 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 12 Feb 2014 21:46:56 +0100 Subject: [PATCH 664/811] include leading space in multiline description --- .../Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb | 2 +- .../d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb | 2 +- .../Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb | 2 +- .../d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb | 2 +- .../d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb | 2 +- .../d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb | 2 +- .../d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb | 2 +- .../d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb | 2 +- .../d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb | 2 +- .../d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb | 2 +- .../d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb | 2 +- .../d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb | 18 ++++++++++++++++++ .../d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb | 2 +- .../d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb | 2 +- 14 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb index 94124552fa..bb8cdbd66d 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb @@ -3,7 +3,7 @@ version = '1.8.1.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb index 50e6f2e0f5..d411b81fc2 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb @@ -3,7 +3,7 @@ version = '1.8.1.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb index 2b4093a0c4..84f174b33d 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb @@ -3,7 +3,7 @@ version = '1.8.1.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '3.2.2.u3'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb index 6fe341a2e4..5c9972551e 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb @@ -3,7 +3,7 @@ version = '1.8.1.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb index 0a291437d5..a4f03bdb80 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb @@ -3,7 +3,7 @@ version = '1.8.1.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb index 46e392d855..b2ae051cf0 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb @@ -3,7 +3,7 @@ version = '1.8.1.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, - IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb index 4e0322abc4..feaca896ce 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb @@ -3,7 +3,7 @@ version = '1.8.2' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb index 2793cce845..3d9629901c 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb @@ -3,7 +3,7 @@ version = '1.8.2' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, - IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb index 9b648008e6..07faae3865 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb @@ -3,7 +3,7 @@ version = '1.8.3.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb index b9145b9d9d..f588777511 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb @@ -3,7 +3,7 @@ version = '1.8.3.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb index f5c2ee7700..8194f931b7 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb @@ -3,7 +3,7 @@ version = '1.8.3.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb new file mode 100644 index 0000000000..5c549c9f51 --- /dev/null +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb @@ -0,0 +1,18 @@ +name = 'Doxygen' +version = '1.8.3.1' + +homepage = 'http://www.doxygen.org' +description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +sources = ['%(namelower)s-%(version)s.src.tar.gz'] +source_urls = ['http://ftp.stack.nl/pub/users/dimitri/'] + +builddependencies = [ + ('flex', '2.5.37'), + ('Bison', '2.7'), +] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb index 17c6df3ade..b4ebaf0c87 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb @@ -3,7 +3,7 @@ version = '1.8.3.1' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'iqacml', 'version': '3.7.3'} diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb index ac0d35a6d5..ded4982b00 100644 --- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb @@ -3,7 +3,7 @@ version = '1.8.6' homepage = 'http://www.doxygen.org' description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, -IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -- GitLab From 6baef33f91c15d847b10965e276f5adf30a083d3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 12 Feb 2014 21:56:41 +0100 Subject: [PATCH 665/811] use VSCPythonPackage easyblock for all VSC Python packages (makes sense, right?) --- easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 1 + easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb | 2 +- easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index bb10e35430..2b5b458800 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -56,6 +56,7 @@ exts_list = [ ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), + ('six', ...), ('dateutil', '2.1', { 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb index e5bcfce5d5..4129a58d5a 100644 --- a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb @@ -1,4 +1,4 @@ -easyblock = 'VersionIndependentPythonPackage' +easyblock = 'VSCPythonPackage' name = 'vsc-base' version = '1.6.9' diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index fb13fb6328..f6b363d857 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -1,4 +1,4 @@ -easyblock = 'VersionIndependentPythonPackage' +easyblock = 'VSCPythonPackage' name = 'vsc-mympirun' version = '3.2.1' -- GitLab From 5fdc068dc370ee52fde3b47285570453b3a264b9 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 12 Feb 2014 22:09:11 +0100 Subject: [PATCH 666/811] get rid of placeholder six extension --- easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index 2b5b458800..bb10e35430 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -56,7 +56,6 @@ exts_list = [ ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), - ('six', ...), ('dateutil', '2.1', { 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], -- GitLab From b562fbbc2aa71d1a6e7b2c501272a9363bdac95d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 08:46:50 +0100 Subject: [PATCH 667/811] style fixes and source URL template for PyZMQ --- .../PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb | 4 ++-- ....2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb | 14 +++++++------- ....2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb | 14 +++++++------- ...PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb | 14 +++++++------- ...PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb | 14 +++++++------- ...PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb | 14 +++++++------- ...PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb | 14 +++++++------- .../PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb | 14 +++++++------- .../PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb | 14 +++++++------- 9 files changed, 58 insertions(+), 58 deletions(-) diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb index 6939bcf426..a08cfce3cb 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -24,7 +24,7 @@ options = {'modulename': 'zmq'} sanity_check_paths = { 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb index f39ba62b1d..6f127b706d 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -17,15 +17,15 @@ zmqversion = '2.2.0' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb index e0f4d8199e..e1c29fe7ab 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -17,15 +17,15 @@ zmqversion = '3.2.2' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb index d7b0dabc3f..9943daf903 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -17,15 +17,15 @@ zmqversion = '2.2.0' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb index 64d61708c2..11781825a5 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -17,15 +17,15 @@ zmqversion = '3.2.2' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb index b2c698d89a..ef798bdb27 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -17,15 +17,15 @@ zmqversion = '2.2.0' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb index 63b8df0e9e..5e5a1f0511 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb @@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -17,15 +17,15 @@ zmqversion = '3.2.2' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb index 4f2003dfe2..829290eef2 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb @@ -7,7 +7,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -18,15 +18,15 @@ zmqversion = '2.2.0' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb index 92979bea53..402506e6f6 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb @@ -7,7 +7,7 @@ description = """Python bindings for ZeroMQ""" toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCELOWER_TAR_GZ] python = 'Python' @@ -18,15 +18,15 @@ zmqversion = '3.2.2' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' -- GitLab From 60def82a79a580bbfeabcad75b18cfe5e60d3a15 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 08:48:57 +0100 Subject: [PATCH 668/811] use SOURCE_TGZ in all Python easyconfigs --- easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb index 28d55c2c9b..78902f06e7 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb @@ -11,7 +11,7 @@ numpyversion = '1.8.0' scipyversion = '0.13.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index a66adf51e6..156f284b28 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -11,7 +11,7 @@ numpyversion = '1.8.0' scipyversion = '0.13.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # libffi build in python is still broken, see http://bugs.python.org/issue4130 patches = ['python-2.7_libffi-include-xmmintrin.patch'] diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb index fa31f87152..2570b71290 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb @@ -11,7 +11,7 @@ numpyversion = '1.8.0' scipyversion = '0.13.1' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] patches = ['python-2.7_libffi-include-xmmintrin.patch'] -- GitLab From 9c9ad0bf5d6d53a5242c28c9747f553f46d5a7eb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 08:51:30 +0100 Subject: [PATCH 669/811] style fixes in SCOOP easyconfigs --- .../s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb index 750cd29e08..4789736f17 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb @@ -5,7 +5,7 @@ version = '0.5.3' homepage = 'http://code.google.com/p/scoop/' description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module -allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" + allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb index 691005bdb4..8ffb56ec18 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb @@ -5,7 +5,7 @@ version = '0.6.2' homepage = 'http://code.google.com/p/scoop/' description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module -allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" + allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -- GitLab From 2651d2f6f76deb4220a173a5871edf108c7cd3a6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 08:54:38 +0100 Subject: [PATCH 670/811] cosmetic fixes to vsc-base easyconfigs --- easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb | 5 +---- easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb index 4129a58d5a..23ef4a12e7 100644 --- a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb @@ -9,11 +9,8 @@ description = """VSC-tools is a set of Python libraries and scripts that are com # we build this to work with every python version toolchain = {'name': 'dummy', 'version': 'dummy'} - sources = [SOURCE_TAR_GZ] -source_urls = [ - 'https://github.com/hpcugent/vsc-base/archive/', -] +source_urls = ['https://github.com/hpcugent/vsc-base/archive/'] options = {'modulename': 'vsc.utils'} diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb index 7f81750f1e..a9424b7998 100644 --- a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb +++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb @@ -9,11 +9,8 @@ description = """VSC-tools is a set of Python libraries and scripts that are com # we build this to work with every python version toolchain = {'name': 'dummy', 'version': 'dummy'} - sources = [SOURCE_TAR_GZ] -source_urls = [ - 'https://github.com/hpcugent/vsc-base/archive/', -] +source_urls = ['https://github.com/hpcugent/vsc-base/archive/'] options = {'modulename': 'vsc.utils'} -- GitLab From f327748d65e31e4795eda796aecb8308c241efeb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 08:56:06 +0100 Subject: [PATCH 671/811] moar style/typo fixes --- easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 4 +--- easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb | 4 +--- .../v/vsc-processcontrol/vsc-processcontrol-1.0.eb | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index f6b363d857..2f81b82d91 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -10,9 +10,7 @@ description = """VSC-tools is a set of Python libraries and scripts that are com toolchain = {'name': 'dummy', 'version': ''} sources = [SOURCE_TAR_GZ] -source_urls = [ - 'https://github.com/hpcugent/vsc-mympirun/archive/', -] +source_urls = ['https://github.com/hpcugent/vsc-mympirun/archive/'] dependencies = [('vsc-base', '1.6.9')] diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb index 8a7e36cbc8..5617b0766f 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb @@ -10,9 +10,7 @@ description = """VSC-tools is a set of Python libraries and scripts that are com toolchain = {'name': 'dummy', 'version': ''} sources = [SOURCE_TAR_GZ] -source_urls = [ - 'https://github.com/hpcugent/vsc-mympirun/archive/', -] +source_urls = ['https://github.com/hpcugent/vsc-mympirun/archive/'] dependencies = [ ('vsc-base', '1.7.3'), diff --git a/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb index a8c92aec1c..2b715acacf 100644 --- a/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb +++ b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb @@ -5,15 +5,13 @@ version = '1.0' homepage = 'http://hpcugent.github.com/vsc-processcontrol/' description = """vsc-processcontrol is a module to abstract process control like scheduler settings and affinity - from actual implementations like vsc.affintiy and psutil.""" + from actual implementations like vsc.affinity and psutil.""" # we build this to work with every python version toolchain = {'name': 'dummy', 'version': ''} sources = [SOURCE_TAR_GZ] -source_urls = [ - 'https://github.com/hpcugent/vsc-processcontrol/archive/', -] +source_urls = ['https://github.com/hpcugent/vsc-processcontrol/archive/'] dependencies = [('vsc-base', '1.7.3')] -- GitLab From 58955d867fde40b7f2fd9d0f66746bae81d60813 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 11:49:12 +0100 Subject: [PATCH 672/811] use PYPI_SOURCE in Cython easyconfigs --- .../c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb | 2 +- easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 1 + 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb index de9d824b0b..111c644bc1 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb index 666edc42c2..5bcaed9bfc 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb index 16232ee493..9f373a0235 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb index c638c7d869..0e90880443 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb index 7bab5be1c2..5b3b81efb9 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb index b3b3468120..cf243045a0 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb index ec5d60fe4e..5538d35119 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb index 3e23a5c022..91a404a0f3 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb index 3234e4ff25..00f9f4b739 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb @@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ['http://pypi.python.org/packages/source/C/Cython/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index bb10e35430..2b5b458800 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -56,6 +56,7 @@ exts_list = [ ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), + ('six', ...), ('dateutil', '2.1', { 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], -- GitLab From 885d5638f2cc102453a8f9050838a99e806ade9a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 11:52:26 +0100 Subject: [PATCH 673/811] use pylibdir in sanity_check_paths in Cython easyconfigs --- .../c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 5 +++-- .../c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb | 5 +++-- .../c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb | 5 +++-- .../c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb | 4 ++-- .../c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb | 4 ++-- .../c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb | 4 ++-- .../c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb | 4 ++-- .../c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb | 4 ++-- .../c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb | 4 ++-- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 111c644bc1..83aec1d936 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -15,13 +15,14 @@ sources = [SOURCE_TAR_GZ] python = 'Python' pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) +pylibdir = 'lib/python%s/site-packages' % pythonshortver versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb index 5bcaed9bfc..892d56aaa1 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb @@ -15,13 +15,14 @@ sources = [SOURCE_TAR_GZ] python = 'Python' pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) +pylibdir = 'lib/python%s/site-packages' % pythonshortver versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb index 9f373a0235..b81a538f5c 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb @@ -15,13 +15,14 @@ sources = [SOURCE_TAR_GZ] python = 'Python' pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) +pylibdir = 'lib/python%s/site-packages' % pythonshortver versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb index 0e90880443..6e94f41099 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb @@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb index 5b3b81efb9..5d1302c3c1 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb @@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb index cf243045a0..ebccd555bb 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb @@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb index 5538d35119..3c845e9845 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb @@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb index 91a404a0f3..544e217059 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb @@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb index 00f9f4b739..6d9476ba0f 100644 --- a/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb @@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver) dependencies = [(python, pythonver)] sanity_check_paths = { - 'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver], - 'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver], + 'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir], + 'dirs': ['%s/%%(name)s' % pylibdir], } moduleclass = 'lang' -- GitLab From 6a424be309a0f802bacab9f8f6e10c42c5f6b297 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 12:24:45 +0100 Subject: [PATCH 674/811] reorder toolchainopts (for compatibility with another PR) --- easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb index a30ee3a186..0a10444693 100644 --- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb @@ -6,7 +6,7 @@ description = """HDF5 is a unique technology suite that makes possible the manag extremely large and complex data collections.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} +toolchainopts = {'optarch': True, 'pic': True, 'usempi': True} source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] sources = [SOURCELOWER_TAR_GZ] -- GitLab From 0e627e24dadf6facd23e27f869e177dce75b2b3d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 12:25:59 +0100 Subject: [PATCH 675/811] use GOOGLECODE_SOURCE constant for numexpr source URLs --- .../n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb | 3 +-- .../n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb index d5a11e2a58..4606d670d0 100644 --- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb @@ -12,7 +12,7 @@ description = """The numexpr package evaluates multiple-operator array expressio toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'usempi': True} -source_urls = ['http://numexpr.googlecode.com/files/'] +source_urls = [GOOGLECODE_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb index 5d945019b9..23dc125463 100644 --- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb @@ -9,11 +9,10 @@ description = """The numexpr package evaluates multiple-operator array expressio code for its internal virtual machine (VM). Due to its integrated just-in-time (JIT) compiler, it does not require a compiler at runtime.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'usempi': True} -source_urls = ['http://numexpr.googlecode.com/files/'] +source_urls = [GOOGLECODE_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb index 4f89921346..585a1680b7 100644 --- a/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb @@ -12,7 +12,7 @@ description = """The numexpr package evaluates multiple-operator array expressio toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'usempi': True} -source_urls = ['http://numexpr.googlecode.com/files/'] +source_urls = [GOOGLECODE_SOURCE] sources = [SOURCE_TAR_GZ] python = 'Python' -- GitLab From 985b7b1ad4e8f13bd5906d4afdcfee83de708415 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 12:42:14 +0100 Subject: [PATCH 676/811] add missing patch file --- .../h/HDF5/HDF5-1.8.12_configure_ictce.patch | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch new file mode 100644 index 0000000000..1877a925ef --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch @@ -0,0 +1,131 @@ +--- hdf5-1.8.12/configure.orig 2013-11-21 16:14:04.000000000 +0100 ++++ hdf5-1.8.12/configure 2014-01-13 13:16:28.486670037 +0100 +@@ -5260,7 +5260,7 @@ + ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_fc_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 ++ for ac_prog in gfortran g95 xlf95 f95 fort ifort mpif77 mpif90 ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -5304,7 +5304,7 @@ + fi + if test -z "$FC"; then + ac_ct_FC=$FC +- for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 ++ for ac_prog in gfortran g95 xlf95 f95 fort ifort mpif77 mpif90 ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -5533,7 +5533,7 @@ + ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_fc_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn ++ for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort mpif77 mpif90 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -5577,7 +5577,7 @@ + fi + if test -z "$FC"; then + ac_ct_FC=$FC +- for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn ++ for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort mpif77 mpif90 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -7769,7 +7769,7 @@ + mpicc) + ## The mpich compiler. Use mpiexec from the same directory if it + ## exists. +- PARALLEL=mpicc ++ PARALLEL="$CC_BASENAME" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpiexec" >&5 + $as_echo_n "checking for mpiexec... " >&6; } + +@@ -7831,7 +7831,7 @@ + *mpif90*) + ## The Fortran mpich compiler. Use mpiexec from the same directory + ## if it exists. +- PARALLEL=mpif90 ++ PARALLEL="$FC" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpiexec" >&5 + $as_echo_n "checking for mpiexec... " >&6; } + +@@ -12565,7 +12565,7 @@ + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) ++ icc*| mpicc* | ifort*| mpif77* | mpif90* ) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' +@@ -13201,11 +13201,11 @@ + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ ecc*,ia64* | icc*,ia64*| mpicc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ efc*,ia64* | ifort*,ia64*| mpif77*,ia64* | mpif90*,ia64* ) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler ++ ifc* | ifort*| mpif77* | mpif90* ) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= +@@ -13687,7 +13687,7 @@ + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; ++ ifort*| mpif77* | mpif90* ) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then +@@ -16685,7 +16685,7 @@ + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; ++ ifort*| mpif77* | mpif90* ) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then +@@ -19596,7 +19596,7 @@ + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) ++ icc*| mpicc* | ifort*| mpif77* | mpif90* ) + lt_prog_compiler_wl_FC='-Wl,' + lt_prog_compiler_pic_FC='-fPIC' + lt_prog_compiler_static_FC='-static' +@@ -20217,11 +20217,11 @@ + # Portland Group f77 and f90 compilers + whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ ecc*,ia64* | icc*,ia64*| mpicc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ efc*,ia64* | ifort*,ia64*| mpif77*,ia64* | mpif90*,ia64* ) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler ++ ifc* | ifort*| mpif77* | mpif90* ) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec_FC= +@@ -20675,7 +20675,7 @@ + link_all_deplibs_FC=yes + allow_undefined_flag_FC="$_lt_dar_allow_undefined" + case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; ++ ifort*| mpif77* | mpif90* ) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then -- GitLab From 9bb05b2775e396091061f4331c1d47e256b86fbd Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 14:59:59 +0100 Subject: [PATCH 677/811] take out placeholder extension 'six' (again) --- easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index 2b5b458800..bb10e35430 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -56,7 +56,6 @@ exts_list = [ ('Cython', '0.17.2', { 'source_urls': ['http://www.cython.org/release/'], }), - ('six', ...), ('dateutil', '2.1', { 'source_tmpl': 'python-%(name)s-%(version)s.tar.gz', 'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'], -- GitLab From 1feb01b21ef54fa2fb61d2549352d322da4daf14 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:01:38 +0100 Subject: [PATCH 678/811] style fixes in pandas and pyTables easyconfigs --- .../p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb | 2 +- .../p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb | 4 ++-- .../p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb index 03c972512f..b38ad74c90 100644 --- a/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb @@ -9,7 +9,7 @@ description = """pandas is an open source, BSD-licensed library providing high-p toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb index 4dcd85eb02..c5aa1dcd66 100644 --- a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb @@ -15,8 +15,8 @@ description = """PyTables is a package for managing hierarchical datasets and de toolchain = {'name': 'ictce', 'version': '4.1.13'} toolchainopts = {'usempi': True} -source_urls = [('http://sourceforge.net/projects/pytables/files/pytables/%s' % version, 'download')] -sources = ['tables-%s.tar.gz' % version] +source_urls = [SOURCEFORGE_SOURCE] +sources = ['tables-%(version)s.tar.gz'] python = 'Python' pythonver = '2.7.3' diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb index 8219cdaef1..9295347947 100644 --- a/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb @@ -15,8 +15,8 @@ description = """PyTables is a package for managing hierarchical datasets and de toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'usempi': True} -source_urls = [('http://sourceforge.net/projects/pytables/files/pytables/%s' % version, 'download')] -sources = ['tables-%s.tar.gz' % version] +source_urls = [SOURCEFORGE_SOURCE] +sources = ['tables-%(version)s.tar.gz'] python = 'Python' pythonver = '2.7.6' -- GitLab From afb111a835519386099b064ca81be667cc889340 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:05:43 +0100 Subject: [PATCH 679/811] style fix for scikit-learn --- .../scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb index b15833e4de..22f760cf88 100644 --- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb @@ -10,7 +10,8 @@ it provides versatile tools for data mining and analysis in any field of science It strives to be simple and efficient, accessible to everybody, and reusable in various contexts.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/'] + +source_urls = [PYPI_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" -- GitLab From 3bddb17f58b16aec870947384a4e60892cfe7373 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:17:16 +0100 Subject: [PATCH 680/811] make sure that --mpi build option is used h5py --- .../h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb | 3 +++ .../easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb | 3 ++- 9 files changed, 26 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 65a7014b20..f321a069fb 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -19,6 +19,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.7') diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb index 07429451c5..7c5593e46d 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb @@ -19,6 +19,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.7') diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb index a8e6f4abc3..99d122d4eb 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb @@ -18,6 +18,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.7'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb index 5c81d66386..d0c8ee67b4 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb @@ -18,6 +18,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.10', '-gpfs'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb index e9b09d3b51..b09d9d4e47 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb @@ -18,6 +18,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.10', '-gpfs'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb index 33f5356c81..fc5502626f 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb @@ -19,6 +19,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb index a3bd601e67..06e44068ff 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb @@ -19,6 +19,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb index cd410ed70d..995c341024 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb @@ -19,6 +19,9 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) +# make sure that MPI features are enabled +makeopts = '--mpi' + dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb index 5419efd76b..3fd421a5a8 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb @@ -19,7 +19,8 @@ pythonver = '2.7.5' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -installopts = '--mpi' +# make sure that MPI features are enabled +makeopts = '--mpi' dependencies = [ (python, pythonver), -- GitLab From bd47f3a0cda32d4b780e8716e74cca4d49c3d686 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:21:47 +0100 Subject: [PATCH 681/811] add mpi4py dependency for h5py, required for MPI support --- .../h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb | 1 + .../easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb | 2 +- 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb index f321a069fb..4e3371afcc 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -25,6 +25,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.7') + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb index 7c5593e46d..4df83bbd1c 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb @@ -25,6 +25,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.7') + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb index 99d122d4eb..0d6f395cc9 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb @@ -24,6 +24,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.7'), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb index d0c8ee67b4..5df5af9d06 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb @@ -24,6 +24,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.10', '-gpfs'), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb index b09d9d4e47..7a551a0b1d 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb @@ -24,6 +24,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.10', '-gpfs'), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb index fc5502626f..02bd36b338 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb @@ -25,6 +25,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb index 06e44068ff..881a2f04c6 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb @@ -25,6 +25,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb index 995c341024..79e383bb0e 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb @@ -25,6 +25,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb index 3fd421a5a8..5d08f30ca5 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb @@ -25,7 +25,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), ('HDF5', '1.8.12'), - ('mpi4py', '1.3.1', versionsuffix), + ('mpi4py', '1.3', versionsuffix), # required for MPI support ] sanity_check_paths = { -- GitLab From 81c74f779dfac6644770eeaec5010306f4a1214e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:37:09 +0100 Subject: [PATCH 682/811] fix style issues in Greenlet easyconfigs --- ...et-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 14 +++++--------- .../Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb | 14 +++++--------- .../Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb | 17 ++++++----------- .../Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb | 17 ++++++----------- .../Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb | 17 ++++++----------- ..._amd64_predefined_in_prepocessor-0.4.2.patch | 11 ----------- 6 files changed, 28 insertions(+), 62 deletions(-) delete mode 100644 easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb index d24861f722..9532285a30 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -21,16 +21,12 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -dependencies = [ - (python, pythonversion), - ] - +dependencies = [(python, pythonversion)] sanity_check_paths = { - 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, - 'lib/python%s/site-packages/greenlet.so' % pythonshortversion, - ], - 'dirs': [] - } + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb index 59de038289..e691784be6 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb @@ -21,16 +21,12 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -dependencies = [ - (python, pythonversion), - ] - +dependencies = [(python, pythonversion)] sanity_check_paths = { - 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, - 'lib/python%s/site-packages/greenlet.so' % pythonshortversion, - ], - 'dirs': [] - } + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb index 079811b174..4061f88ae5 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb @@ -21,19 +21,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -dependencies = [ - (python, pythonversion), - ] +dependencies = [(python, pythonversion)] -patches = [ - 'icc_no_amd64_predefined_in_prepocessor.patch', - ] +patches = ['icc_no_amd64_predefined_in_prepocessor.patch'] sanity_check_paths = { - 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, - 'lib/python%s/site-packages/greenlet.so' % pythonshortversion, - ], - 'dirs': [] - } + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb index 49b94ba41f..7fc1dea03a 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb @@ -21,19 +21,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -dependencies = [ - (python, pythonversion), - ] +dependencies = [(python, pythonversion)] -patches = [ - 'icc_no_amd64_predefined_in_prepocessor.patch', - ] +patches = ['icc_no_amd64_predefined_in_prepocessor.patch'] sanity_check_paths = { - 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, - 'lib/python%s/site-packages/greenlet.so' % pythonshortversion, - ], - 'dirs': [] - } + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb index 2de415b2d7..7d6a807731 100644 --- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb @@ -21,19 +21,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1]) versionsuffix = "-%s-%s" % (python, pythonversion) -dependencies = [ - (python, pythonversion), - ] +dependencies = [(python, pythonversion)] -patches = [ - 'icc_no_amd64_predefined_in_prepocessor-%(version)s.patch', - ] +patches = ['Greenlet-%(version)s_icc_no_amd64_predefined_in_prepocessor.patch'] sanity_check_paths = { - 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, - 'lib/python%s/site-packages/greenlet.so' % pythonshortversion, - ], - 'dirs': [] - } + 'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion, + 'lib/python%s/site-packages/greenlet.so' % pythonshortversion], + 'dirs': [], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch b/easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch deleted file mode 100644 index 0afb624caf..0000000000 --- a/easybuild/easyconfigs/g/Greenlet/icc_no_amd64_predefined_in_prepocessor-0.4.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slp_platformselect.h.orig 2014-01-06 23:48:38.000000000 +0100 -+++ slp_platformselect.h 2014-01-31 18:05:36.125349420 +0100 -@@ -8,7 +8,7 @@ - #include "platform/switch_x64_msvc.h" /* MS Visual Studio on X64 */ - #elif defined(__GNUC__) && defined(__amd64__) && defined(__ILP32__) - #include "platform/switch_x32_unix.h" /* gcc on amd64 with x32 ABI */ --#elif defined(__GNUC__) && defined(__amd64__) -+#elif defined(__GNUC__) && defined(__x86_64__) - #include "platform/switch_amd64_unix.h" /* gcc on amd64 */ - #elif defined(__GNUC__) && defined(__i386__) - #include "platform/switch_x86_unix.h" /* gcc on X86 */ -- GitLab From d301cbd5a5101aa2a4440411f1480759c3bea3f7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:38:27 +0100 Subject: [PATCH 683/811] style fixes for PyZMQ --- .../PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb index 398114576d..603c912f0d 100644 --- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb +++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb @@ -17,15 +17,15 @@ zmqversion = '2.2.0' versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0]) dependencies = [ - (python, pythonversion), - ('ZeroMQ', zmqversion), - ] + (python, pythonversion), + ('ZeroMQ', zmqversion), +] options = {'modulename': 'zmq'} sanity_check_paths = { - 'files': [], - 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion] - } + 'files': [], + 'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion], +} moduleclass = 'devel' -- GitLab From 073659ff6ca759f3c51abe40ef7283a03fd4c9a0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:43:34 +0100 Subject: [PATCH 684/811] fix style issues for SCOOP --- ...-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 20 +++++++----------- .../SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb | 18 +++++++--------- .../SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb | 18 +++++++--------- .../SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb | 19 +++++++---------- .../SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb | 21 +++++++------------ .../SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb | 6 ++++-- 6 files changed, 41 insertions(+), 61 deletions(-) diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb index cbfc0fc2a7..a523938124 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -14,23 +14,19 @@ sources = [SOURCELOWER_TAR_GZ] python = 'Python' pythonversion = '2.7.3' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 dependencies = [ - (python, pythonversion), # python with builtin argparse - ('Greenlet', '0.4.0', versionsuffix), - ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), - ] + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.0', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), +] sanity_check_paths = { - 'files': [], - 'dirs': [('lib/python%(pyv)s/site-packages/' - 'scoop-%(version)s-py%(pyv)s.egg/scoop/') % - {'pyv': pythonshortversion, - 'version': version } - ] - } + 'files': [], + 'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb index 4789736f17..778cef0fac 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb @@ -19,18 +19,14 @@ versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 dependencies = [ - (python, pythonversion), # python with builtin argparse - ('Greenlet', '0.4.0', versionsuffix), - ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), - ] + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.0', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), +] sanity_check_paths = { - 'files': [], - 'dirs': [('lib/python%(pyv)s/site-packages/' - 'scoop-%(version)s-py%(pyv)s.egg/scoop/') % - {'pyv': pythonshortversion, - 'version': version } - ] - } + 'files': [], + 'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb index 6359677a92..c636af662e 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb @@ -19,18 +19,14 @@ versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 dependencies = [ - (python, pythonversion), # python with builtin argparse - ('Greenlet', '0.4.0', versionsuffix), - ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), - ] + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.0', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), +] sanity_check_paths = { - 'files': [], - 'dirs': [('lib/python%(pyv)s/site-packages/' - 'scoop-%(version)s-py%(pyv)s.egg/scoop/') % - {'pyv': pythonshortversion, - 'version': version } - ] - } + 'files': [], + 'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb index 8a88b6106a..4f555a09c2 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb @@ -7,7 +7,6 @@ homepage = 'http://code.google.com/p/scoop/' description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ["http://scoop.googlecode.com/files/"] @@ -20,18 +19,14 @@ versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 dependencies = [ - (python, pythonversion), # python with builtin argparse - ('Greenlet', '0.4.0', versionsuffix), - ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), - ] + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.0', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), +] sanity_check_paths = { - 'files': [], - 'dirs': [('lib/python%(pyv)s/site-packages/' - 'scoop-%(version)s-py%(pyv)s.egg/scoop/') % - {'pyv': pythonshortversion, - 'version': version } - ] - } + 'files': [], + 'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb index cedd07f1dd..0794de7781 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb @@ -7,7 +7,6 @@ homepage = 'http://code.google.com/p/scoop/' description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers.""" - toolchain = {'name': 'ictce', 'version': '5.5.0'} source_urls = ["http://scoop.googlecode.com/files/"] @@ -15,23 +14,19 @@ sources = ["%(namelower)s-%(version)s.release.tar.gz"] python = 'Python' pythonversion = '2.7.5' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 dependencies = [ - (python, pythonversion), # python with builtin argparse - ('Greenlet', '0.4.2', versionsuffix), - ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), - ] + (python, pythonversion), # python with builtin argparse + ('Greenlet', '0.4.2', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), +] sanity_check_paths = { - 'dirs': [], - 'files': [('lib/python%(pyv)s/site-packages/' - 'scoop-%(version)s.release-py%(pyv)s.egg') % - {'pyv': pythonshortversion, - 'version': version } - ] - } + 'dirs': [], + 'files': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s.release-py%(pyv)s.egg' % {'pyv': pyshortver}], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb index 8ffb56ec18..964359f51b 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb @@ -20,10 +20,12 @@ versionsuffix = '-%s-%s' % (python, pythonversion) dependencies = [ (python, pythonversion), # python with builtin argparse ('Greenlet', '0.4.2', versionsuffix), - ('PyZMQ', '14.0.1', versionsuffix), + ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), ] sanity_check_paths = { - 'files': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s.release-py%(pyv)s.egg' % {'pyv': pythonshortversion}], 'dirs': [], + 'files': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s.release-py%(pyv)s.egg' % {'pyv': pyshortver}], } + +moduleclass = 'tools' -- GitLab From 8248ff458daa6ecf8f022b50f515d94ce9fec22b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:46:30 +0100 Subject: [PATCH 685/811] fix style issues for util-linux --- .../util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb | 8 ++++---- .../u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb | 8 ++++---- .../u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb | 8 ++++---- .../u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb | 9 ++++----- .../u/util-linux/util-linux-2.24-ictce-5.5.0.eb | 2 +- .../u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb | 9 ++++----- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb index d63c05d4aa..282691e211 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb @@ -6,7 +6,7 @@ description = """Set of Linux utilities""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )] +source_urls = ['%s/v%%(version_major_minor)s' % homepage] sources = [SOURCELOWER_TAR_GZ] # disable account related utilities (they need OS dependant pam-devel files) @@ -20,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " dependencies = [('ncurses', '5.9')] sanity_check_paths = { - 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], - 'dirs': ['include', 'bin', 'share', 'sbin'] - } + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb index c6cf3bbdc6..2181cfe1cc 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb @@ -6,7 +6,7 @@ description = """Set of Linux utilities""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )] +source_urls = ['%s/v%%(version_major_minor)s' % homepage] sources = [SOURCELOWER_TAR_GZ] # disable account related utilities (they need OS dependant pam-devel files) @@ -20,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " dependencies = [('ncurses', '5.9')] sanity_check_paths = { - 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], - 'dirs': ['include', 'bin', 'share', 'sbin'] - } + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb index 709d0a0204..5bcfe76a71 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb @@ -6,7 +6,7 @@ description = """Set of Linux utilities""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )] +source_urls = ['%s/v%%(version_major_minor)s' % homepage] sources = [SOURCELOWER_TAR_GZ] # disable account related utilities (they need OS dependant pam-devel files) @@ -20,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " dependencies = [('ncurses', '5.9')] sanity_check_paths = { - 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], - 'dirs': ['include', 'bin', 'share', 'sbin'] - } + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb index 5efe20cea9..6fa9dfbdc6 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb @@ -4,10 +4,9 @@ version = '2.22.2' homepage = 'http://www.kernel.org/pub/linux/utils/util-linux' description = """Set of Linux utilities""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )] +source_urls = ['%s/v%%(version_major_minor)s' % homepage] sources = [SOURCELOWER_TAR_GZ] # disable account related utilities (they need OS dependant pam-devel files) @@ -21,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " dependencies = [('ncurses', '5.9')] sanity_check_paths = { - 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], - 'dirs': ['include', 'bin', 'share', 'sbin'] - } + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} moduleclass = 'tools' diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb index 08d7675cec..696815202f 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb @@ -6,7 +6,7 @@ description = """Set of Linux utilities""" toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ['%s/v%%(version)s' % homepage] +source_urls = ['%s/v%%(version_major_minor)s' % homepage] sources = [SOURCELOWER_TAR_GZ] # disable account related utilities (they need OS dependant pam-devel files) diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb index 533a0dcc2f..77d061f0e0 100644 --- a/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb @@ -4,10 +4,9 @@ version = '2.24.1' homepage = 'http://www.kernel.org/pub/linux/utils/util-linux' description = """Set of Linux utilities""" - toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )] +source_urls = ['%s/v%%(version_major_minor)s' % homepage] sources = [SOURCELOWER_TAR_GZ] # disable account related utilities (they need OS dependant pam-devel files) @@ -23,8 +22,8 @@ configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/complet dependencies = [('ncurses', '5.9')] sanity_check_paths = { - 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], - 'dirs': ['include', 'bin', 'share', 'sbin'] - } + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} moduleclass = 'tools' -- GitLab From 707497ad2050a75d57ed763750b52a39f7eb1a8c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:49:14 +0100 Subject: [PATCH 686/811] fix style issues for ZeroMQ --- .../z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb | 12 ++++++------ .../z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb | 12 ++++++------ .../z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb | 13 ++++++------- .../z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb | 13 ++++++------- .../z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb | 12 ++++++------ .../z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb | 14 ++++++-------- .../z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb | 15 ++++++--------- 7 files changed, 42 insertions(+), 49 deletions(-) diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb index 9daba3c85e..27a2cb351d 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb @@ -20,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.22.2') - ] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb index a58d4fd084..a24777e7cd 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb @@ -20,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.22.2') - ] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb index cede9c77fd..c50ac8ac7d 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb @@ -9,7 +9,6 @@ description = """ZeroMQ looks like an embeddable networking library but acts lik products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous message-processing tasks. It has a score of language APIs and runs on most operating systems.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://download.zeromq.org/'] @@ -21,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.22.2') - ] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb index cb028a5c0d..b356788e95 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb @@ -9,7 +9,6 @@ description = """ZeroMQ looks like an embeddable networking library but acts lik products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous message-processing tasks. It has a score of language APIs and runs on most operating systems.""" - toolchain = {'name': 'ictce', 'version': '5.5.0'} source_urls = ['http://download.zeromq.org/'] @@ -21,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.24.1') - ] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb index a774e68300..117938148c 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb @@ -20,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.22.2') - ] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb index 5cace57994..c184da63a2 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb @@ -20,15 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.22.2') - ] - -patches = ['stream_engine_ictce_storage_class_first.patch'] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb index e4cacef1c5..fe4983bf46 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb @@ -9,7 +9,6 @@ description = """ZeroMQ looks like an embeddable networking library but acts lik products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous message-processing tasks. It has a score of language APIs and runs on most operating systems.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://download.zeromq.org/'] @@ -21,15 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%. configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" ' dependencies = [ - ('OpenPGM', '5.2.122'), - ('util-linux', '2.22.2') - ] - -patches = ['stream_engine_ictce_storage_class_first.patch'] + ('OpenPGM', '5.2.122'), + ('util-linux', '2.22.2'), +] sanity_check_paths = { - 'files': ['lib/libzmq.so', 'lib/libzmq.a'], - 'dirs': ['include', 'lib'] - } + 'files': ['lib/libzmq.so', 'lib/libzmq.a'], + 'dirs': ['include', 'lib'], +} moduleclass = 'devel' -- GitLab From 65f82266a878fb2a21faa6fada30fcfed8e30cbb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 15:59:50 +0100 Subject: [PATCH 687/811] add HDF5 dep compatible with zlib 1.2.8, required for h5py --- .../HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb | 26 +++++++++++++++++++ .../h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb new file mode 100644 index 0000000000..bf02342e7c --- /dev/null +++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb @@ -0,0 +1,26 @@ +name = 'HDF5' +version = '1.8.12' +versionsuffix = '-zlib-1.2.8' + +homepage = 'http://www.hdfgroup.org/HDF5/' +description = """HDF5 is a unique technology suite that makes possible the management of + extremely large and complex data collections.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'pic': True, 'usempi': True} + +source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src'] +sources = [SOURCELOWER_TAR_GZ] + +patches = [ + 'HDF5-1.8.12_configure_ictce.patch', + 'configure_libtool.patch', + 'HDF5-%(version)s_mpi-includes_order_fix.patch', +] + +dependencies = [ + ('zlib', '1.2.8'), + ('Szip', '2.1'), +] + +moduleclass = 'data' diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb index 5d08f30ca5..c14fb5eb8f 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb @@ -24,7 +24,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), - ('HDF5', '1.8.12'), + ('HDF5', '1.8.12', '-zlib-1.2.8'), ('mpi4py', '1.3', versionsuffix), # required for MPI support ] -- GitLab From 65274a8ae5c09fc973e036a9064253788ebf50ac Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 16:00:07 +0100 Subject: [PATCH 688/811] fix mpi4py 1.3 version --- .../easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb index 07e1ecd0dc..e595d5b5ed 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb @@ -1,7 +1,7 @@ easyblock = 'PythonPackage' name = 'mpi4py' -version = '1.3.1' +version = '1.3' homepage = 'https://bitbucket.org/mpi4py/mpi4py' description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for -- GitLab From edfc483740ee66c21a900987b1f3c38c43e4b2d2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 16:08:41 +0100 Subject: [PATCH 689/811] fix PyZMQ bump --- .../easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb index 964359f51b..3d3cbf7c0a 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb @@ -20,7 +20,7 @@ versionsuffix = '-%s-%s' % (python, pythonversion) dependencies = [ (python, pythonversion), # python with builtin argparse ('Greenlet', '0.4.2', versionsuffix), - ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), + ('PyZMQ', '14.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), ] sanity_check_paths = { -- GitLab From cea94b0fcd5637862f3487f9f3f516e64c528810 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 16:13:14 +0100 Subject: [PATCH 690/811] fix SCOOP easyconfig w.r.t. pyshortver and PyZMQ versionsuffix --- .../s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb index 3d3cbf7c0a..d684a52592 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb @@ -14,13 +14,13 @@ sources = ['%s-%s.release.tar.gz' % (name.lower(), version)] python = 'Python' pythonversion = '2.7.6' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = '-%s-%s' % (python, pythonversion) dependencies = [ (python, pythonversion), # python with builtin argparse ('Greenlet', '0.4.2', versionsuffix), - ('PyZMQ', '14.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)), + ('PyZMQ', '14.0.1', versionsuffix), ] sanity_check_paths = { -- GitLab From b6691cc962453f2e407e656820914199a37ccb49 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 16:53:40 +0100 Subject: [PATCH 691/811] fix parsing of SCOOP easyconfigs --- .../m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb | 5 ++++- .../m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb | 5 ++++- .../m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb | 5 ++++- .../m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb | 5 ++++- .../m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb | 5 ++++- .../s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb | 2 +- 8 files changed, 23 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb index 10229d821c..92e62f75ef 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,10 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['https://mpi4py.googlecode.com/files/'] +source_urls = [ + BITBUCKET_DOWNLOADS + GOOGLECODE_SOURCE, +] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb index 168f873fe3..5ecf122608 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb @@ -9,7 +9,10 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = ['https://mpi4py.googlecode.com/files/'] +source_urls = [ + BITBUCKET_DOWNLOADS + GOOGLECODE_SOURCE, +] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb index a4f99586ea..67abf3ddf8 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb @@ -9,7 +9,10 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['https://mpi4py.googlecode.com/files/'] +source_urls = [ + BITBUCKET_DOWNLOADS + GOOGLECODE_SOURCE, +] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb index 8ff1173727..4988e7670a 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb @@ -9,7 +9,10 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = ['https://mpi4py.googlecode.com/files/'] +source_urls = [ + BITBUCKET_DOWNLOADS + GOOGLECODE_SOURCE, +] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb index 07e1ecd0dc..2e17022290 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb @@ -9,7 +9,10 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin toolchain = {'name': 'ictce', 'version': '5.5.0'} -source_urls = [BITBUCKET_DOWNLOADS] +source_urls = [ + BITBUCKET_DOWNLOADS + GOOGLECODE_SOURCE, +] sources = [SOURCE_TAR_GZ] python = 'Python' diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb index 778cef0fac..b60889a72b 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb @@ -14,7 +14,7 @@ sources = [SOURCELOWER_TAR_GZ] python = 'Python' pythonversion = '2.7.3' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb index c636af662e..3f302d78e2 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb @@ -14,7 +14,7 @@ sources = [SOURCELOWER_TAR_GZ] python = 'Python' pythonversion = '2.7.3' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb index 4f555a09c2..154be5b9d1 100644 --- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb @@ -14,7 +14,7 @@ sources = [SOURCELOWER_TAR_GZ] python = 'Python' pythonversion = '2.7.3' -pythonshortversion = ".".join(pythonversion.split(".")[:-1]) +pyshortver = ".".join(pythonversion.split(".")[:-1]) versionsuffix = '-%s-%s' % (python, pythonversion) zmqapi = 2 -- GitLab From 12fc212d92a36b0ccb82814ea73e1cf5b98f4994 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 17:04:47 +0100 Subject: [PATCH 692/811] fix typos --- .../h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 4e3371afcc..653f7ba173 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -24,7 +24,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), - ('HDF5', '1.8.7') + ('HDF5', '1.8.7'), ('mpi4py', '1.3', versionsuffix), # required for MPI support ] diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb index 4df83bbd1c..88f1a0722b 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb @@ -24,7 +24,7 @@ makeopts = '--mpi' dependencies = [ (python, pythonver), - ('HDF5', '1.8.7') + ('HDF5', '1.8.7'), ('mpi4py', '1.3', versionsuffix), # required for MPI support ] -- GitLab From 453d725964fa8656f66adb4e99041aaa12c32c5b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 17:15:32 +0100 Subject: [PATCH 693/811] use SOURCEFORGE_SOURCE constant in numpy source URLs --- .../n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- .../n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb | 3 +-- .../n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb | 2 +- .../n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb index b3aafe69b0..3cff78d9de 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} -source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_GZ] patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb index 8106dc54bf..f1dcf152ee 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb @@ -9,7 +9,7 @@ NumPy can also be used as an efficient multi-dimensional container of generic da defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_GZ] patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb index 5ce2cfa794..32146789ef 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb @@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with toolchain = {'name': 'ictce', 'version': '4.0.6'} -source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_GZ] patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb index e9f933cddf..0ea594ac42 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb @@ -8,10 +8,9 @@ description = """NumPy is the fundamental package for scientific computing with NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.""" - toolchain = {'name': 'ictce', 'version': '5.3.0'} -source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_GZ] patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch'] diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb index 86800602aa..53dc5e3860 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb @@ -10,7 +10,7 @@ defined. This allows NumPy to seamlessly and speedily integrate with a wide vari toolchain = {'name': 'iqacml', 'version': '3.7.3'} -source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_GZ] patches = [ diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb index df7582a273..722f3cab2c 100644 --- a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb +++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb @@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')] +source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_GZ] patches = ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'] -- GitLab From 929a12a50177027207cdb4e4622543abc80b2404 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 17:18:03 +0100 Subject: [PATCH 694/811] moar constants --- easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb | 2 +- easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb | 2 +- .../python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb index 0a4ab2b959..e5c911cbe3 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.1' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb index 38956ed8cb..18501aa0f5 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.1' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb index c1fb8acaac..2bc16986cf 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb @@ -11,7 +11,7 @@ numpyversion = '1.7.1' scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] -sources = ['%(name)s-%(version)s.tgz'] +sources = [SOURCE_TGZ] # python needs bzip2 to build the bz2 package dependencies = [ diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb index 6f00563718..90bb4098db 100644 --- a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb @@ -8,7 +8,7 @@ description = """The dateutil module provides powerful extensions to the datetim toolchain = {'name': 'goolf', 'version': '1.4.10'} -source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb index fae72a3762..37d02ed949 100644 --- a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb @@ -8,7 +8,7 @@ description = """The dateutil module provides powerful extensions to the datetim toolchain = {'name': 'ictce', 'version': '4.1.13'} -source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/'] +source_urls = [PYPI_LOWER_SOURCE] sources = [SOURCE_TAR_GZ] python = "Python" -- GitLab From accd1dcf91b7401b79a7062b61f27bf01fbd4a03 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 17:44:58 +0100 Subject: [PATCH 695/811] add missing mpi4py easyconfig required for deps --- ...py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb new file mode 100644 index 0000000000..0a66342f9b --- /dev/null +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -0,0 +1,26 @@ +easyblock = 'PythonPackage' + +name = 'mpi4py' +version = '1.3' + +homepage = 'https://code.google.com/p/mpi4py/' +description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for +the Python programming language, allowing any Python program to exploit multiple processors.""" + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} + +source_urls = [ + BITBUCKET_DOWNLOADS + GOOGLECODE_SOURCE, +] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pyver = '2.7.3' +versionsuffix = '-%s-%s' % (python, pyver) + +dependencies = [ + (python, pyver), +] + +moduleclass = 'mpi' -- GitLab From 252f2394e5d18132f355266f55dd02b909599951 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 17:53:51 +0100 Subject: [PATCH 696/811] fix typos --- .../m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb | 2 +- .../m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb | 2 +- .../easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb | 2 +- .../easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb index 92e62f75ef..d7ce479c30 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb @@ -10,7 +10,7 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = [ - BITBUCKET_DOWNLOADS + BITBUCKET_DOWNLOADS, GOOGLECODE_SOURCE, ] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb index 5ecf122608..52e2739364 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb @@ -10,7 +10,7 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'ictce', 'version': '4.0.6'} source_urls = [ - BITBUCKET_DOWNLOADS + BITBUCKET_DOWNLOADS, GOOGLECODE_SOURCE, ] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb index 67abf3ddf8..5878a3a0a6 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb @@ -10,7 +10,7 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = [ - BITBUCKET_DOWNLOADS + BITBUCKET_DOWNLOADS, GOOGLECODE_SOURCE, ] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb index 4988e7670a..989b264cf7 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb @@ -10,7 +10,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = [ - BITBUCKET_DOWNLOADS + BITBUCKET_DOWNLOADS, GOOGLECODE_SOURCE, ] sources = [SOURCE_TAR_GZ] diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb index 2e17022290..e60fe4ce5b 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb @@ -10,7 +10,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin toolchain = {'name': 'ictce', 'version': '5.5.0'} source_urls = [ - BITBUCKET_DOWNLOADS + BITBUCKET_DOWNLOADS, GOOGLECODE_SOURCE, ] sources = [SOURCE_TAR_GZ] -- GitLab From 5fce60a0e76be79228f6e7a486e68aea37fbe5df Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 20:07:20 +0100 Subject: [PATCH 697/811] fix typo --- .../m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 0a66342f9b..832a044412 100644 --- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -10,7 +10,7 @@ the Python programming language, allowing any Python program to exploit multiple toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = [ - BITBUCKET_DOWNLOADS + BITBUCKET_DOWNLOADS, GOOGLECODE_SOURCE, ] sources = [SOURCE_TAR_GZ] -- GitLab From 1ee055fd2833ff2cce19927cfab625be93237950 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 20:31:40 +0100 Subject: [PATCH 698/811] add missing util-linux easyconfig --- .../util-linux-2.22.2-ictce-5.5.0.eb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb new file mode 100644 index 0000000000..4e19abd21c --- /dev/null +++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb @@ -0,0 +1,27 @@ +name = 'util-linux' +version = '2.22.2' + +homepage = 'http://www.kernel.org/pub/linux/utils/util-linux' +description = """Set of Linux utilities""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['%s/v%%(version_major_minor)s' % homepage] +sources = [SOURCELOWER_TAR_GZ] + +# disable account related utilities (they need OS dependant pam-devel files) +# disable wall and friends (requires group changing permissions for install user) +# install systemd service files in install dir +configopts = '--disable-chfn-chsh --disable-login --disable-su ' +configopts += '--disable-wall --disable-use-tty-group ' +configopts += '--disable-makeinstall-chown --disable-makeinstall-setuid ' +configopts += "--with-systemdsystemunitdir='${prefix}/systemd' " + +dependencies = [('ncurses', '5.9')] + +sanity_check_paths = { + 'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']], + 'dirs': ['include', 'bin', 'share', 'sbin'], +} + +moduleclass = 'tools' -- GitLab From fb472f1f11dc4d44002edbeae7f891a4ed816e10 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 13 Feb 2014 21:59:14 +0100 Subject: [PATCH 699/811] fix zlib dep for matplotlib to avoid conflicts --- .../m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb index 8edf2b22c2..e0996041b8 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb @@ -21,7 +21,7 @@ versionsuffix = "-%s-%s" % (python, pythonversion) dependencies = [ (python, pythonversion), - ('zlib', '1.2.8'), + ('zlib', '1.2.7'), ('freetype', '2.5.0.1'), ('libpng', '1.6.6'), ] -- GitLab From 79fa5fca5c35b60b46e584e5b99c01de002dbf6c Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Thu, 13 Feb 2014 23:10:44 +0100 Subject: [PATCH 700/811] Clang-3.4: use polly --- easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb index 5a750d9a0c..f753226de8 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb @@ -54,4 +54,6 @@ moduleclass = 'compiler' assertions = False +usepolly = True + build_targets = ['X86'] -- GitLab From 983319e417d7fa7fd2ec1a8edd1e643c36401413 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 00:33:20 +0100 Subject: [PATCH 701/811] creatively fix dep conflicts for matplotlib --- .../f/freetype/freetype-2.5.2-ictce-5.5.0.eb | 21 +++++++++++++++++++ .../l/libpng/libpng-1.6.9-ictce-5.5.0.eb | 17 +++++++++++++++ ...tplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb | 2 +- ...tplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb | 4 ++-- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb new file mode 100644 index 0000000000..578bf6e2b3 --- /dev/null +++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb @@ -0,0 +1,21 @@ +name = 'freetype' +version = '2.5.2' + +homepage = 'http://freetype.org' +description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and + portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display + servers, font conversion tools, text image generation tools, and many other products as well.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [GNU_SAVANNAH_SOURCE] +sources = [SOURCE_TAR_GZ] + +dependencies = [('libpng', '1.6.9')] + +sanity_check_paths = { + 'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'], + 'dirs': ['include/freetype2'], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb new file mode 100644 index 0000000000..37cc1311ee --- /dev/null +++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb @@ -0,0 +1,17 @@ +name = 'libpng' +version = '1.6.9' + +homepage = 'http://www.libpng.org/pub/png/libpng.html' +description = "libpng is the official PNG reference library" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('zlib', '1.2.7')] + +configopts = "--with-pic" + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb index e0996041b8..8edf2b22c2 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.5.eb @@ -21,7 +21,7 @@ versionsuffix = "-%s-%s" % (python, pythonversion) dependencies = [ (python, pythonversion), - ('zlib', '1.2.7'), + ('zlib', '1.2.8'), ('freetype', '2.5.0.1'), ('libpng', '1.6.6'), ] diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb index 5ee25a7abe..0e33120d40 100644 --- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb +++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb @@ -22,8 +22,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion) dependencies = [ (python, pythonversion), ('zlib', '1.2.7'), - ('freetype', '2.5.0.1'), - ('libpng', '1.6.6'), + ('freetype', '2.5.2'), + ('libpng', '1.6.9'), ] # is this actually needed? the PythonPackage will check if import matplotlib succeeds, which is as good as this? -- GitLab From 68df8cbd1646070c85c3a9b6687f3f5b51edf952 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 00:35:37 +0100 Subject: [PATCH 702/811] add latest OpenSSL version as a dependency for recent Python versions --- .../OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb | 21 +++++++++++++++++++ .../o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb | 21 +++++++++++++++++++ .../o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb | 21 +++++++++++++++++++ .../easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb | 21 +++++++++++++++++++ .../Python-2.7.5-goalf-1.5.12-no-OFED.eb | 1 + .../p/Python/Python-2.7.5-goolf-1.4.10.eb | 1 + .../p/Python/Python-2.7.5-ictce-4.1.13.eb | 1 + .../p/Python/Python-2.7.5-ictce-5.3.0.eb | 1 + .../p/Python/Python-2.7.5-ictce-5.5.0.eb | 1 + .../p/Python/Python-2.7.5-iqacml-3.7.3.eb | 1 + .../p/Python/Python-2.7.6-goolf-1.4.10.eb | 1 + .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 1 + .../p/Python/Python-2.7.6-ictce-5.5.0.eb | 1 + .../Python-3.2.3-goalf-1.1.0-no-OFED.eb | 1 + .../p/Python/Python-3.2.3-goolf-1.4.10.eb | 1 + .../p/Python/Python-3.2.3-ictce-4.0.6.eb | 1 + .../p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 +- 17 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb new file mode 100644 index 0000000000..456f22d4c8 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb @@ -0,0 +1,21 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, + and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) + protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb new file mode 100644 index 0000000000..a894ebdd82 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb @@ -0,0 +1,21 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb new file mode 100644 index 0000000000..9f0fa27941 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb @@ -0,0 +1,21 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb new file mode 100644 index 0000000000..af043c1fe5 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb @@ -0,0 +1,21 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'dummy', 'version': 'dummy'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb index 5488b61962..3006668423 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f'), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index b70534400f..1b98bf29c0 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f'), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index e50d8ca057..8b8d853690 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -22,6 +22,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index dbf075363b..c078168f17 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -22,6 +22,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 1cd0602935..2a3eda5912 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -22,6 +22,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index a4eb4e3cc9..e2c8a50128 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -23,6 +23,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ('CBLAS', '20110120'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb index 78902f06e7..c452b12042 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f'), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 156f284b28..8c45c89aaa 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -22,6 +22,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb index 2570b71290..36d26d760e 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb @@ -21,6 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index b57481552a..7c1af324fa 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f'), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index 6e6ef740c7..c92d41d278 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f'), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 7c8244621d..612b677b0c 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -21,6 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index 039d169ed3..d0002124cc 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -4,7 +4,6 @@ version = '3.2.3' homepage = 'http://python.org/' description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." - toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'pic': True, 'opt': True, 'optarch': True} @@ -20,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), + ('OpenSSL', '1.0.1f', '', True), ] # order is important! -- GitLab From fbbe5146aa0782713d29a294c72647b60d0858a2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 09:30:11 +0100 Subject: [PATCH 703/811] get rid of dummy toolchain OpenSSL build --- .../easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb | 21 ------------------- .../p/Python/Python-2.7.5-ictce-4.1.13.eb | 2 +- .../p/Python/Python-2.7.5-ictce-5.3.0.eb | 2 +- .../p/Python/Python-2.7.5-ictce-5.5.0.eb | 2 +- .../p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 +- .../p/Python/Python-2.7.6-ictce-5.5.0.eb | 2 +- .../p/Python/Python-3.2.3-ictce-4.0.6.eb | 2 +- .../p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 +- 8 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb deleted file mode 100644 index af043c1fe5..0000000000 --- a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f.eb +++ /dev/null @@ -1,21 +0,0 @@ -name = 'OpenSSL' -version = '1.0.1f' - -homepage = 'http://www.openssl.org/' -description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, -and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) -protocols as well as a full-strength general purpose cryptography library. """ - -toolchain = {'name': 'dummy', 'version': 'dummy'} -toolchainopts = {'pic': True, 'opt': True, 'optarch': True} - -sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://www.openssl.org/source/'] - -dependencies = [('zlib', '1.2.7')] - -# makefile is not suitable for parallel build -parallel = 1 -runtest = 'test' - -moduleclass = 'system' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index 8b8d853690..d3bc991a29 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -22,7 +22,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index c078168f17..d23bfc901d 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -22,7 +22,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index 2a3eda5912..cf04d1d5c0 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -22,7 +22,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index 8c45c89aaa..da0f05502b 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -22,7 +22,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb index 36d26d760e..ac145f5b93 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb @@ -21,7 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index 612b677b0c..ff8ab76523 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -21,7 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index d0002124cc..eb4de74217 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -19,7 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! -- GitLab From b34c3af35e3e4a68b896cc61f430521a21c27347 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 09:31:51 +0100 Subject: [PATCH 704/811] add OpenSSL easyconfigs for ictce --- .../o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb | 23 ++++ .../o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb | 2 + .../o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb | 23 ++++ .../o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb | 23 ++++ .../o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch | 115 ++++++++++++++++++ 5 files changed, 186 insertions(+) create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb new file mode 100644 index 0000000000..1f75edf44c --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb @@ -0,0 +1,23 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'ictce', 'version': '4.0.6'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +patches = ['OpenSSL-1.0.1f_icc-fixes.patch'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb index 9f0fa27941..00fb598e1d 100644 --- a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb @@ -12,6 +12,8 @@ toolchainopts = {'pic': True, 'opt': True, 'optarch': True} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.openssl.org/source/'] +patches = ['OpenSSL-1.0.1f_icc-fixes.patch'] + dependencies = [('zlib', '1.2.7')] # makefile is not suitable for parallel build diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb new file mode 100644 index 0000000000..317cd9b4de --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb @@ -0,0 +1,23 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +patches = ['OpenSSL-1.0.1f_icc-fixes.patch'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb new file mode 100644 index 0000000000..c755fa9a4a --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb @@ -0,0 +1,23 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, +and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) +protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +patches = ['OpenSSL-1.0.1f_icc-fixes.patch'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch new file mode 100644 index 0000000000..a0492d9306 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch @@ -0,0 +1,115 @@ +diff -ru openssl-1.0.1f.orig/Configure openssl-1.0.1f/Configure +--- openssl-1.0.1f.orig/Configure 2014-01-06 14:47:42.000000000 +0100 ++++ openssl-1.0.1f/Configure 2014-02-14 08:41:42.000000000 +0100 +@@ -351,16 +351,16 @@ + # If you compiler does not, do complement config command line with one! + "linux-armv4", "gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + #### IA-32 targets... +-"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", + #### + "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ppc64", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", + "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++"linux-x86_64-icc", "icc:-DL_ENDIAN -DTERMIO -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", + "linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", + #### So called "highgprs" target for z/Architecture CPUs + # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see +@@ -1410,6 +1410,7 @@ + } + if ($iccver>=8) + { ++ $cflags=~s/\-KPIC/-fPIC/; + # Eliminate unnecessary dependency from libirc.a. This is + # essential for shared library support, as otherwise + # apps/openssl can end up in endless loop upon startup... +@@ -1417,13 +1418,18 @@ + } + if ($iccver>=9) + { +- $cflags.=" -i-static"; +- $cflags=~s/\-no_cpprt/-no-cpprt/; ++ $lflags.=" -i-static"; ++ $lflags=~s/\-no_cpprt/-no-cpprt/; + } + if ($iccver>=10) + { +- $cflags=~s/\-i\-static/-static-intel/; ++ $lflags=~s/\-i\-static/-static-intel/; + } ++ if ($iccver>=11) ++ { ++ $cflags.=" -no-intel-extensions"; # disable Cilk ++ $lflags=~s/\-no\-cpprt/-no-cxxlib/; ++ } + } + + # Unlike other OSes (like Solaris, Linux, Tru64, IRIX) BSD run-time +diff -ru openssl-1.0.1f.orig/crypto/aes/aes_x86core.c openssl-1.0.1f/crypto/aes/aes_x86core.c +--- openssl-1.0.1f.orig/crypto/aes/aes_x86core.c 2014-01-06 14:47:42.000000000 +0100 ++++ openssl-1.0.1f/crypto/aes/aes_x86core.c 2014-02-14 08:45:04.000000000 +0100 +@@ -89,8 +89,10 @@ + #endif + + #undef ROTATE +-#if defined(_MSC_VER) || defined(__ICC) ++#if defined(_MSC_VER) + # define ROTATE(a,n) _lrotl(a,n) ++#elif defined(__ICC) ++# define ROTATE(a,n) _rotl(a,n) + #elif defined(__GNUC__) && __GNUC__>=2 + # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) + # define ROTATE(a,n) ({ register unsigned int ret; \ +diff -ru openssl-1.0.1f.orig/crypto/des/des_locl.h openssl-1.0.1f/crypto/des/des_locl.h +--- openssl-1.0.1f.orig/crypto/des/des_locl.h 2014-01-06 14:47:42.000000000 +0100 ++++ openssl-1.0.1f/crypto/des/des_locl.h 2014-02-14 08:46:24.000000000 +0100 +@@ -160,8 +160,10 @@ + } \ + } + +-#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) ++#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) + #define ROTATE(a,n) (_lrotr(a,n)) ++#elif defined(__ICC) ++#define ROTATE(a,n) (_rotr(a,n)) + #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) + # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) + # define ROTATE(a,n) ({ register unsigned int ret; \ +diff -ru openssl-1.0.1f.orig/crypto/md32_common.h openssl-1.0.1f/crypto/md32_common.h +--- openssl-1.0.1f.orig/crypto/md32_common.h 2014-01-06 14:47:42.000000000 +0100 ++++ openssl-1.0.1f/crypto/md32_common.h 2014-02-14 08:47:12.000000000 +0100 +@@ -142,8 +142,10 @@ + */ + #undef ROTATE + #ifndef PEDANTIC +-# if defined(_MSC_VER) || defined(__ICC) ++# if defined(_MSC_VER) + # define ROTATE(a,n) _lrotl(a,n) ++# elif defined(__ICC) ++# define ROTATE(a,n) _rotl(a,n) + # elif defined(__MWERKS__) + # if defined(__POWERPC__) + # define ROTATE(a,n) __rlwinm(a,n,0,31) +diff -ru openssl-1.0.1f.orig/crypto/rc5/rc5_locl.h openssl-1.0.1f/crypto/rc5/rc5_locl.h +--- openssl-1.0.1f.orig/crypto/rc5/rc5_locl.h 2014-01-06 14:47:42.000000000 +0100 ++++ openssl-1.0.1f/crypto/rc5/rc5_locl.h 2014-02-14 08:43:37.000000000 +0100 +@@ -146,9 +146,12 @@ + *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ + *((c)++)=(unsigned char)(((l) )&0xff)) + +-#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) ++#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) + #define ROTATE_l32(a,n) _lrotl(a,n) + #define ROTATE_r32(a,n) _lrotr(a,n) ++#elif defined(__ICC) ++#define ROTATE_l32(a,n) _rotl(a,n) ++#define ROTATE_r32(a,n) _rotr(a,n) + #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) + # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) + # define ROTATE_l32(a,n) ({ register unsigned int ret; \ -- GitLab From dee2cf9063615fc7954eb8acdfffcc33c0412142 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 09:40:02 +0100 Subject: [PATCH 705/811] add openssl/libssl OS dep, favored over explicit OpenSSL dependency --- .../p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb | 3 +++ .../p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb | 3 +++ .../easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb | 3 +++ .../easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb | 3 +++ .../easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb | 3 +++ .../easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb | 3 +++ .../easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb | 3 +++ .../easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb | 3 +++ .../easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb | 3 +++ .../easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb | 3 +++ .../easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb | 4 +++- easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb | 4 +++- easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb | 2 ++ easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb | 2 ++ easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb | 2 ++ easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb | 4 +++- easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb | 4 +++- easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb | 2 ++ easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb | 2 ++ .../easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb | 4 +++- easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb | 4 +++- easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb | 2 ++ easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb | 2 ++ 35 files changed, 98 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb index f2464bd93a..279bdd8c99 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb @@ -16,6 +16,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb index 82ec6c7d72..f9f346f7bc 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb @@ -16,6 +16,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb index 0fbce53d37..66cb466a25 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb @@ -16,6 +16,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb index e25ef5a1c1..781b45ed3f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb @@ -18,6 +18,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb index 97c0820aec..c8bc196270 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb @@ -18,6 +18,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb index ed152a73d9..79512f826c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb @@ -16,6 +16,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb index 5176f9c1ae..f949db90c2 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb @@ -16,6 +16,9 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb index 35492d5a7d..7a975980fe 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb index dda0a20f74..c0a121ef71 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -77,4 +78,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb index a86bdc6265..2e5b1c3cc2 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb index 851b072492..3cc5940708 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -77,4 +78,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb index 900b2bb97c..f8a7666f78 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb index 099c18d05f..262c91f061 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb index 374755e896..c22d902c71 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9-20130406'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb index 44476dd915..4e3149189f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb index bb10e35430..0f28917f5c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb index 79a133dbd2..11ffa16a41 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb @@ -21,6 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb index 118e666646..97c9a23292 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb @@ -21,6 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb index a517c35ce4..79e4bbcd67 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -77,4 +78,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb index 044223ddd0..1ccc5c12ca 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -77,4 +78,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb index 44a477057c..3a167c9f92 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb @@ -21,6 +21,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -79,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb index bce6fdd959..1ad8450e3d 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb @@ -22,6 +22,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ('CBLAS', '20110120'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -83,4 +84,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb index 3006668423..df55e62340 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb @@ -19,7 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -78,4 +78,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb index 1b98bf29c0..968045a415 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb @@ -19,7 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -80,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb index d3bc991a29..464a9c0441 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb @@ -83,4 +83,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb index d23bfc901d..54b6d1a65f 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb @@ -81,4 +81,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb index cf04d1d5c0..d513f80632 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb @@ -81,4 +81,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb index e2c8a50128..4a7605ab2c 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb @@ -23,7 +23,7 @@ dependencies = [ ('libreadline', '6.2'), ('ncurses', '5.9'), ('CBLAS', '20110120'), - ('OpenSSL', '1.0.1f', '', True), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -85,4 +85,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb index c452b12042..44158cd159 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb @@ -19,7 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -80,4 +80,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb index da0f05502b..6a17a47968 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb @@ -83,4 +83,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb index ac145f5b93..9006100969 100644 --- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb @@ -82,4 +82,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb index 7c1af324fa..236304395e 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb @@ -19,7 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -64,4 +64,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb index c92d41d278..fbb78f9e84 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb @@ -19,7 +19,7 @@ dependencies = [ ('zlib', '1.2.7'), ('libreadline', '6.2'), ('ncurses', '5.9'), - ('OpenSSL', '1.0.1f'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -64,4 +64,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb index ff8ab76523..c6cedb61ef 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb @@ -66,4 +66,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb index eb4de74217..38875e2a4f 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb @@ -64,4 +64,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' -- GitLab From ddd5f21a023bd568efbabd613b32079bdb0fb5ac Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 11:30:11 +0100 Subject: [PATCH 706/811] add reference for OpenSSL patch --- easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch index a0492d9306..bc1d39fe2d 100644 --- a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch @@ -1,3 +1,4 @@ +based on http://openssl.6102.n7.nabble.com/Compiling-OpenSSL-with-icc-td42304.html (http://cvs.openssl.org/chngview?cn=23036) diff -ru openssl-1.0.1f.orig/Configure openssl-1.0.1f/Configure --- openssl-1.0.1f.orig/Configure 2014-01-06 14:47:42.000000000 +0100 +++ openssl-1.0.1f/Configure 2014-02-14 08:41:42.000000000 +0100 -- GitLab From 302acbbd9b2d14982fe2ae9bebd1d067abec8f64 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 11:32:20 +0100 Subject: [PATCH 707/811] add missing easyconfig --- .../OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..ac69ef38a5 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,21 @@ +name = 'OpenSSL' +version = '1.0.1f' + +homepage = 'http://www.openssl.org/' +description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, + and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) + protocols as well as a full-strength general purpose cryptography library. """ + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'pic': True, 'opt': True, 'optarch': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.openssl.org/source/'] + +dependencies = [('zlib', '1.2.7')] + +# makefile is not suitable for parallel build +parallel = 1 +runtest = 'test' + +moduleclass = 'system' -- GitLab From ff0ba2bd5f12d65df72188e9efa21f340cd6801a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 11:57:31 +0100 Subject: [PATCH 708/811] style fixes in ParMETIS description --- .../easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb | 8 ++++---- .../easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb | 8 ++++---- .../easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb | 8 ++++---- .../easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb index ff151de1b0..1f858cb94c 100644 --- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb @@ -3,10 +3,10 @@ version = '3.1.1' homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, -meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes -routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in -ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning -schemes.""" + meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes + routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in + ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning + schemes.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb index 7ba66e723b..ad06991953 100644 --- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb @@ -3,10 +3,10 @@ version = '4.0.2' homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, -meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes -routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in -ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning -schemes.""" + meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes + routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in + ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning + schemes.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb index c745675e3d..ebbc3db5a2 100644 --- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb @@ -3,10 +3,10 @@ version = '4.0.3' homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, -meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes -routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in -ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning -schemes.""" + meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes + routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in + ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning + schemes.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb index 6c8b6f15d8..db08a4e643 100644 --- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb @@ -3,10 +3,10 @@ version = '4.0.3' homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, -meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes -routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in -ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning -schemes.""" + meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes + routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in + ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning + schemes.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True, 'usempi': True, 'pic': True} -- GitLab From e4b232f9ee2b0355f65b65d36cc407b083429d05 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 12:08:06 +0100 Subject: [PATCH 709/811] add OpenSSL OS dep in Python 3.3.2 easyconfigs --- easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb | 3 +++ easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb | 3 +++ 3 files changed, 9 insertions(+) diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb index e5c911cbe3..73c3832a10 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -41,4 +42,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb index 18501aa0f5..cef0a03fea 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -41,4 +42,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb index 2bc16986cf..6312c62e4e 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb @@ -19,6 +19,7 @@ dependencies = [ ('zlib', '1.2.8'), ('libreadline', '6.2'), ('ncurses', '5.9'), +# ('OpenSSL', '1.0.1f'), # OS dependency should be preferred for security reasons ] # order is important! @@ -41,4 +42,6 @@ exts_list = [ }), ] +osdependencies = [('openssl-devel', 'libssl-dev')] + moduleclass = 'lang' -- GitLab From f4b066e336ff093fa13608a508c60f9be77ba61f Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 14 Feb 2014 12:37:00 +0100 Subject: [PATCH 710/811] added required MAFFT_BINARIES env var --- .../m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb index b608cfdee4..700a8e8695 100644 --- a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -22,6 +22,8 @@ skipsteps = ['configure'] start_dir = 'core' installopts = 'PREFIX=%(installdir)s' +modextrapaths = {'MAFFT_BINARIES': 'libexec/mafft'} + sanity_check_paths = { 'files': ['bin/mafft'], 'dirs': [], -- GitLab From 95254ad7d2967c029b9c8e7150684311bb718f0d Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 14:24:07 +0100 Subject: [PATCH 711/811] minor style fixes in protobuf easyconfigs --- .../easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb | 4 ++-- .../easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb b/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb index 506350152b..7d1df26fcd 100644 --- a/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb @@ -7,11 +7,11 @@ description = """Google Protocol Buffers""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['https://protobuf.googlecode.com/files/'] +source_urls = [GOOGLECODE_SOURCE] sanity_check_paths = { 'files': ['bin/protoc'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb index 149c94d9e7..f6ab1b5fd2 100644 --- a/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb @@ -7,11 +7,11 @@ description = """Google Protocol Buffers""" toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCE_TAR_GZ] -source_urls = ['https://protobuf.googlecode.com/files/'] +source_urls = [GOOGLECODE_SOURCE] sanity_check_paths = { 'files': ['bin/protoc'], - 'dirs': [] + 'dirs': [], } moduleclass = 'devel' -- GitLab From c7ad2e46287942bd6d9acb56919a0b54ee65e7a7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 16:06:35 +0100 Subject: [PATCH 712/811] fix name of XZ dir --- easybuild/easyconfigs/x/{xz => XZ}/XZ-5.0.5-goolf-1.4.10.eb | 0 easybuild/easyconfigs/x/{xz => XZ}/XZ-5.0.5-ictce-5.3.0.eb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/x/{xz => XZ}/XZ-5.0.5-goolf-1.4.10.eb (100%) rename easybuild/easyconfigs/x/{xz => XZ}/XZ-5.0.5-ictce-5.3.0.eb (100%) diff --git a/easybuild/easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/x/XZ/XZ-5.0.5-goolf-1.4.10.eb similarity index 100% rename from easybuild/easyconfigs/x/xz/XZ-5.0.5-goolf-1.4.10.eb rename to easybuild/easyconfigs/x/XZ/XZ-5.0.5-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/x/XZ/XZ-5.0.5-ictce-5.3.0.eb similarity index 100% rename from easybuild/easyconfigs/x/xz/XZ-5.0.5-ictce-5.3.0.eb rename to easybuild/easyconfigs/x/XZ/XZ-5.0.5-ictce-5.3.0.eb -- GitLab From 0d1dc6939a3dd052b56d0978d85691b951872e74 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 16:22:57 +0100 Subject: [PATCH 713/811] use constants for source_urls --- .../easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb | 2 +- .../easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb | 2 +- easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb index a532d7cc6b..5a3e833ff0 100644 --- a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb @@ -9,7 +9,7 @@ description = """gperftools are for use by developers so that they can create mo toolchain = {'version': '1.4.10', 'name': 'goolf'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://gperftools.googlecode.com/files'] +source_urls = [GOOGLECODE_SOURCE] dependencies = [ ('Automake', '1.13.4'), diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb index e7a1a41118..bdbfa99fd8 100644 --- a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb @@ -9,7 +9,7 @@ description = """gperftools are for use by developers so that they can create mo toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://gperftools.googlecode.com/files'] +source_urls = [GOOGLECODE_SOURCE] dependencies = [ ('Automake', '1.13.4'), diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb index 83cc56ad97..df2b6201e1 100644 --- a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb @@ -11,7 +11,7 @@ description = """The primary goal of libunwind is to define a portable and effic toolchain = {'version': '1.4.10', 'name': 'goolf'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://download.savannah.gnu.org/releases/libunwind/'] +source_urls = [GNU_SAVANNAH_SOURCE] sanity_check_paths = { 'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT], diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb index d8952f399c..d3931fac83 100644 --- a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb @@ -11,7 +11,7 @@ description = """The primary goal of libunwind is to define a portable and effic toolchain = {'name': 'ictce', 'version': '5.3.0'} sources = [SOURCE_TAR_GZ] -source_urls = ['http://download.savannah.gnu.org/releases/libunwind/'] +source_urls = [GNU_SAVANNAH_SOURCE] sanity_check_paths = { 'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT], -- GitLab From c2c518c562190daea04c8862391ac56e98fd2dad Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 16:24:50 +0100 Subject: [PATCH 714/811] add missing zlib easyconfig --- .../z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb new file mode 100644 index 0000000000..e008a0db4b --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb @@ -0,0 +1,20 @@ +name = 'zlib' +version = '1.2.7' + +homepage = 'http://www.zlib.net/' +description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, + not covered by any patents -- lossless data-compression library for use on virtually any + computer hardware and operating system.""" + +toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 7dd76cf442c8a0df24140a52db2de138680c9ad5 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 14 Feb 2014 16:46:58 +0100 Subject: [PATCH 715/811] rename to ErlangOTP and make no-java explicit Signed-off-by: Fotis Georgatos --- .../ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename easybuild/easyconfigs/e/{Erlang/Erlang-R16B02-goolf-1.4.10.eb => ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb} (92%) diff --git a/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb similarity index 92% rename from easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb rename to easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb index f16d2df15b..6f89ce5300 100644 --- a/easybuild/easyconfigs/e/Erlang/Erlang-R16B02-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb @@ -7,8 +7,9 @@ # $Id$ ## -name = "Erlang" +name = "ErlangOTP" version = "R16B02" +versionsuffix = "-no-Java" homepage = 'http://www.erlang.org/' description = """Erlang is a programming language used to build massively scalable @@ -21,6 +22,8 @@ toolchain = {'version': '1.4.10', 'name': 'goolf'} sources = ['otp_src_%(version)s.tar.gz'] source_urls = ['http://www.erlang.org/download/'] +configopts = ' --without-javac ' + builddependencies = [('Autoconf', '2.69')] dependencies = [('ncurses', '5.9')] -- GitLab From 2bb6186e6f457ac27c4edd2c4bb7a84f6d72b066 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 14 Feb 2014 16:51:38 +0100 Subject: [PATCH 716/811] bugfix ocaml source_url Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb index cb3cc4532d..1e75cdcd62 100644 --- a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb @@ -19,7 +19,8 @@ description = """OCaml is a general purpose industrial-strength programming lang toolchain = {'version': '1.4.10', 'name': 'goolf'} sources = ['ocaml-%(version)s.tar.gz'] -source_urls = ['http://caml.inria.fr/pub/distrib/ocaml-%(version_major_minor)s'] +sourcedir = name.lower() + '-' + '.'.join(version.split('.')[0:-1]) +source_urls = ['http://caml.inria.fr/pub/distrib/%s' % sourcedir] builddependencies = [('Autoconf', '2.69')] dependencies = [('ncurses', '5.9')] -- GitLab From e24edaeccfc45cf1457ce5b3601e31331e7f3ae0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 16:55:20 +0100 Subject: [PATCH 717/811] minor style fixes --- .../h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb | 2 +- .../m/Molekel/Molekel-5.4.0_Linux_x86_64.eb | 2 +- easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb b/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb index ba4c7ce505..9701129849 100644 --- a/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb +++ b/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb @@ -12,7 +12,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'} # fi. http://www.hdfgroup.org/ftp/HDF5/tools/h4toh5/bin/h4h5tools-2.2.1-linux-x86_64-static.tar.gz source_urls = ['http://www.hdfgroup.org/ftp/HDF5/tools/%s/bin' % name] -sources = ['%s-%s%s.tar.gz' % ('h4h5tools', version, versionsuffix)] +sources = ['h4h5tools-%(version)s%(versionsuffix)s.tar.gz'] sanity_check_paths = { 'files': ['bin/%s' % x for x in ['h5toh4', 'h5toh4']], diff --git a/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb b/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb index 4d43f45e84..d68a450d82 100644 --- a/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb +++ b/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb @@ -14,7 +14,7 @@ source_urls = ['ftp://ftp.cscs.ch/out/molekel/molekel_%(version_major_minor)s'] sanity_check_paths = { 'files': ["bin/Molekel"], - 'dirs': [] + 'dirs': [], } moduleclass = 'vis' diff --git a/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb index a94cde2423..6fc9490675 100644 --- a/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb +++ b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb @@ -13,16 +13,16 @@ toolchain = {'version': 'dummy', 'name': 'dummy'} subdir = '_'.join(version.split('-')[0].split('.')) source_urls = ['http://ftp.vim.org/editors/NEdit/v%s/executables' % subdir ] -sources = ["nedit-%s%s.tar.gz" % (version, versionsuffix)] - -sanity_check_paths = { - 'files': ["nc", "nedit"], - 'dirs': [] -} +sources = ['%(namelower)s-%(version)s%(versionsuffix)s.tar.gz'] modextrapaths = { 'PATH': '', 'MANPATH': '', } +sanity_check_paths = { + 'files': ["nc", "nedit"], + 'dirs': [], +} + moduleclass = 'tools' -- GitLab From 4e8ce79a22acbb660ddec514a29c9c81078c0821 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 14 Feb 2014 17:15:32 +0100 Subject: [PATCH 718/811] fixed versionsuffix --- .../m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb index 700a8e8695..0fd4f0bb04 100644 --- a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb @@ -5,7 +5,7 @@ name = 'MAFFT' version = '7.130' -versionsuffix = 'with-extensions' +versionsuffix = '-with-extensions' homepage = 'http://mafft.cbrc.jp/alignment/software/' description = """MAFFT is a multiple sequence alignment program @@ -16,7 +16,7 @@ description = """MAFFT is a multiple sequence alignment program toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = [homepage] -sources = ['%(namelower)s-%(version)s-%(versionsuffix)s-src.tgz'] +sources = ['%(namelower)s-%(version)s%(versionsuffix)s-src.tgz'] skipsteps = ['configure'] start_dir = 'core' -- GitLab From a7cd75983b80ff7e46dff261bcd3cbda026e9805 Mon Sep 17 00:00:00 2001 From: pescobar Date: Fri, 14 Feb 2014 17:20:32 +0100 Subject: [PATCH 719/811] fixed versionsuffix as @boegel suggested --- easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb index a224586986..a2500b9e04 100644 --- a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb @@ -3,20 +3,20 @@ # Swiss Institute of Bioinformatics # Biozentrum - University of Basel -easyblock='MakeCp' +easyblock = 'MakeCp' name = "sickle" # version checked running "sickle --version" version = "1.210" # git_commit_id bab15f7d14b06400be37d50df7c092b1ec6fe0c5 -versionsuffix = "bab15f7" +versionsuffix = "-bab15f7" homepage = 'https://github.com/najoshi/sickle' description = """ Windowed Adaptive Trimming for fastq files using quality """ toolchain = {'name': 'goolf', 'version': '1.4.10'} -git_commit_id = versionsuffix +git_commit_id = versionsuffix[1:] sources = ['%s.tar.gz' % git_commit_id] source_urls = ['https://github.com/najoshi/sickle/archive/'] -- GitLab From 31bc689b853a102ca8fb9e2f384947fa1a27a30b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Feb 2014 18:33:27 +0100 Subject: [PATCH 720/811] disable parallel build for OCaml --- easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb index 1e75cdcd62..d660b5e167 100644 --- a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb @@ -28,6 +28,9 @@ dependencies = [('ncurses', '5.9')] prefix_opt = "-prefix " makeopts = "world.opt" +# parallel build tends to break +parallel = 1 + sanity_check_paths = { 'files': ["bin/ocaml", "bin/ocamlc"], 'dirs': [] -- GitLab From c6a5659fd22717a305ffca3169bbd47da5297f39 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 15 Feb 2014 02:37:43 +0100 Subject: [PATCH 721/811] handle ispc comments Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb | 29 ------------------- .../i/ispc/{ispc-1.5.0.eb => ispc-1.6.0.eb} | 5 +--- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb rename easybuild/easyconfigs/i/ispc/{ispc-1.5.0.eb => ispc-1.6.0.eb} (85%) diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb deleted file mode 100644 index f08911ac1e..0000000000 --- a/easybuild/easyconfigs/i/ispc/ispc-1.3.0.eb +++ /dev/null @@ -1,29 +0,0 @@ - -easyblock = 'Tarball' - -name = 'ispc' -version = '1.3.0' - -homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/' -description = """Intel SPMD Program Compilers; An open-source compiler for high-performance - SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language, - with extensions for 'single program, multiple data' (SPMD) programming. - Under the SPMD model, the programmer writes a program that generally appears - to be a regular serial program, though the execution model is actually that - a number of program instances execute in parallel on the hardware.""" - -toolchain = {'name': 'dummy', 'version': 'dummy'} - -# eg. https://github.com/downloads/ispc/ispc/ispc-v1.3.0-linux.tar.gz -# or better for later: https://github.com/ispc/ispc/tarball/v1.3.0 -sources = ['ispc-v%(version)s-linux.tar.gz'] -source_urls = ['https://github.com/downloads/ispc/ispc/'] - -sanity_check_paths = { - 'files': ["ispc"], - 'dirs': [] -} - -modextrapaths = {'PATH': ''} - -moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb similarity index 85% rename from easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb rename to easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb index 384c54d6b1..5f9a44b8c2 100644 --- a/easybuild/easyconfigs/i/ispc/ispc-1.5.0.eb +++ b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb @@ -1,8 +1,7 @@ - easyblock = 'Tarball' name = 'ispc' -version = '1.5.0' +version = '1.6.0' homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/' description = """Intel SPMD Program Compilers; An open-source compiler for high-performance @@ -14,8 +13,6 @@ description = """Intel SPMD Program Compilers; An open-source compiler for high- toolchain = {'name': 'dummy', 'version': 'dummy'} -# eg. https://github.com/downloads/ispc/ispc/ispc-v1.5.0-linux.tar.gz -# or better for later: https://github.com/ispc/ispc/tarball/v1.5.0 sources = ['ispc-v%(version)s-linux.tar.gz'] source_urls = [('http://sourceforge.net/projects/ispcmirror/files/v%(version)s', 'download')] -- GitLab From 1da403e0940b6e59554bfa8ac4d23bc15395f7bf Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sat, 15 Feb 2014 02:40:41 +0100 Subject: [PATCH 722/811] fix mcpp to include specific compiler Signed-off-by: Fotis Georgatos --- .../m/mcpp/{mcpp-2.7.2.eb => mcpp-2.7.2-GCC-4.7.2.eb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename easybuild/easyconfigs/m/mcpp/{mcpp-2.7.2.eb => mcpp-2.7.2-GCC-4.7.2.eb} (84%) diff --git a/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb b/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2-GCC-4.7.2.eb similarity index 84% rename from easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb rename to easybuild/easyconfigs/m/mcpp/mcpp-2.7.2-GCC-4.7.2.eb index 60b167dc2a..5a89179795 100644 --- a/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2.eb +++ b/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2-GCC-4.7.2.eb @@ -1,4 +1,3 @@ - name = 'mcpp' version = '2.7.2' @@ -7,7 +6,7 @@ description = """MCPP is a portable C/C++ preprocessor, supporting GCC, Visual C Its source is highly configurable and can generate executables of various specs. It accompanies a validation suite to check preprocessor's conformance and quality exhaustively.""" -toolchain = {'name': 'dummy', 'version': 'dummy'} # rewire towards your favourite compiler +toolchain = {'name': 'GCC', 'version': '4.7.2'} sources = [SOURCE_TAR_GZ] source_urls = [SOURCEFORGE_SOURCE] -- GitLab From a97ee0525d9266c7eea2d703cf39dac2e0c077a4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 15 Feb 2014 13:11:59 +0100 Subject: [PATCH 723/811] only use --mpi for recent h5py versions (v2.2 and up) --- .../h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb | 3 --- .../easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb | 2 +- 9 files changed, 1 insertion(+), 25 deletions(-) diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb index 653f7ba173..b8f9029260 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb @@ -19,9 +19,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.7'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb index 88f1a0722b..ede8e25c17 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb @@ -19,9 +19,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.7'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb index 0d6f395cc9..b7aec3d30e 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb @@ -18,9 +18,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.7'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb index 5df5af9d06..7a0e274285 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb @@ -18,9 +18,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.10', '-gpfs'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb index 7a551a0b1d..17626346c5 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb @@ -18,9 +18,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.10', '-gpfs'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb index 02bd36b338..b83b6afd0a 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb @@ -19,9 +19,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb index 881a2f04c6..00b462fa19 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb @@ -19,9 +19,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb index 79e383bb0e..e2324d7186 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb @@ -19,9 +19,6 @@ pythonver = '2.7.3' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled -makeopts = '--mpi' - dependencies = [ (python, pythonver), ('HDF5', '1.8.10'), diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb index c14fb5eb8f..fd76fc37b5 100644 --- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb +++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb @@ -19,7 +19,7 @@ pythonver = '2.7.5' pythonshortver = '.'.join(pythonver.split('.')[0:2]) versionsuffix = '-%s-%s' % (python, pythonver) -# make sure that MPI features are enabled +# make sure that MPI features are enabled (new in h5py v2.2) makeopts = '--mpi' dependencies = [ -- GitLab From f1a033ba374a65035d0eafb3ec56747f0041c250 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 15 Feb 2014 13:45:10 +0100 Subject: [PATCH 724/811] add required patch file for Python 3.3.2 with ictce --- .../easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb | 2 ++ .../easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb | 2 ++ .../p/Python/python-3.3_libffi-include-xmmintrin.patch | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb index cef0a03fea..8cd8056d73 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb @@ -13,6 +13,8 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = [SOURCE_TGZ] +patches = ['python-3.3_libffi-include-xmmintrin.patch'] + # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb index 6312c62e4e..27461c4521 100644 --- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb @@ -13,6 +13,8 @@ scipyversion = '0.12.0' source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources = [SOURCE_TGZ] +patches = ['python-3.3_libffi-include-xmmintrin.patch'] + # python needs bzip2 to build the bz2 package dependencies = [ ('bzip2', '1.0.6'), diff --git a/easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch b/easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch new file mode 100644 index 0000000000..79aaa325fc --- /dev/null +++ b/easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch @@ -0,0 +1,10 @@ +--- Python-3.3.2/Modules/_ctypes/libffi/src/x86/ffi64.c.orig 2014-02-15 13:40:51.000000000 +0100 ++++ Python-3.3.2/Modules/_ctypes/libffi/src/x86/ffi64.c 2014-02-15 13:40:58.000000000 +0100 +@@ -39,6 +39,7 @@ + #define MAX_SSE_REGS 8 + + #if defined(__INTEL_COMPILER) ++#include "xmmintrin.h" + #define UINT128 __m128 + #else + #if defined(__SUNPRO_C) -- GitLab From 745be3c1f7c1b0780ca89bfec6d79c4ff3b7e3bf Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 15 Feb 2014 13:47:27 +0100 Subject: [PATCH 725/811] revert back to using VersionIndependentPythonPackage, to avoid failing sanity check --- easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb index 12550055eb..368c166390 100644 --- a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb +++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb @@ -1,4 +1,4 @@ -easyblock = 'VSCPythonPackage' +easyblock = 'VersionIndependentPythonPackage' name = 'vsc-mympirun' version = '3.2.1' -- GitLab From fc8a888f6d9cc31cfbf2e94cbed4158bd10ddfad Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 15 Feb 2014 13:50:34 +0100 Subject: [PATCH 726/811] fix sanity check for python-dateutil --- .../python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb | 2 +- .../python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb index 90bb4098db..b51abe00cd 100644 --- a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb @@ -19,7 +19,7 @@ versionsuffix = "-%s-%s" % (python, pythonversion) dependencies = [(python, pythonversion)] py_short_ver = ".".join(pythonversion.split(".")[0:2]) -pylibdir = "lib/python%s/site-packages/%%(name)s" % py_short_ver +pylibdir = "lib/python%s/site-packages/python_dateutil" % py_short_ver sanity_check_paths = { 'files': ["%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver)], diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb index 37d02ed949..66b4d0b80c 100644 --- a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb +++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb @@ -19,7 +19,7 @@ versionsuffix = "-%s-%s" % (python, pythonversion) dependencies = [(python, pythonversion)] py_short_ver = ".".join(pythonversion.split(".")[0:2]) -pylibdir = "lib/python%s/site-packages/%%(name)s" % py_short_ver +pylibdir = "lib/python%s/site-packages/python_dateutil" % py_short_ver sanity_check_paths = { 'files': ["%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver)], -- GitLab From e5acdb2448e5b1003ccef583c9e66abab91380de Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 15 Feb 2014 13:59:29 +0100 Subject: [PATCH 727/811] add missing patch file for ZeroMQ 3.2.2 with ictce --- .../z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb | 2 ++ .../easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb | 2 ++ .../easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb index c184da63a2..7f28e21cd4 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb @@ -14,6 +14,8 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = ['http://download.zeromq.org/'] sources = [SOURCELOWER_TAR_GZ] +patches = ['ZeroMQ-%(version)s_icc.patch'] + # --with-pgm will use shipped OpenPGM (in foreign subdir) configopts = '--with-pic --with-system-pgm ' configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" ' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb index fe4983bf46..4ab3604a00 100644 --- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb @@ -14,6 +14,8 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = ['http://download.zeromq.org/'] sources = [SOURCELOWER_TAR_GZ] +patches = ['ZeroMQ-%(version)s_icc.patch'] + # --with-pgm will use shipped OpenPGM (in foreign subdir) configopts = '--with-pic --with-system-pgm ' configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" ' diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch new file mode 100644 index 0000000000..eeb3dca310 --- /dev/null +++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch @@ -0,0 +1,12 @@ +diff -ru zeromq-3.2.2.orig/src/stream_engine.hpp zeromq-3.2.2/src/stream_engine.hpp +--- zeromq-3.2.2.orig/src/stream_engine.hpp 2012-11-14 02:09:14.000000000 +0100 ++++ zeromq-3.2.2/src/stream_engine.hpp 2014-02-15 13:57:14.074526627 +0100 +@@ -94,7 +94,7 @@ + + // Size of the greeting message: + // Preamble (10 bytes) + version (1 byte) + socket type (1 byte). +- const static size_t greeting_size = 12; ++ static const size_t greeting_size = 12; + + // True iff we are registered with an I/O poller. + bool io_enabled; -- GitLab From ff35284bf9087683a8afc52f5bd57f7f4d0ce32a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 15 Feb 2014 21:28:52 +0100 Subject: [PATCH 728/811] bump version to v1.11 and update release notes --- RELEASE_NOTES | 25 ++++++++++++++++++++++++- setup.py | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index d843a5fb38..be302f6580 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,9 +1,32 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 2,203 easyconfig files, for 414 different software packages +The latest version of easybuild-easyconfig provides 2,319 easyconfig files, for 444 different software packages and 29 different (compiler) toolchains. +v1.11.0 (February 16th 2013) +---------------------------- + +feature + bugfix release +- added example easyconfig files for 30 new software packages: + argtable (#669), Clustal-Omega (#669), Coreutils (#582), GMT (#560), gperftools (#596), grep (#582), h4toh5 (#597), + libunwind (#596), Lmod (#600, #692), Lua (#600, #692), MAFFT (#654), Molekel (#597), NEdit (#597), + netcdf4-python (#660), nodejs (#678), OCaml (#704), patch (#582), PhyML (#664), + PRACE Common Production Environment (#599), protobuf (#680), python-dateutil (#438), sed (#582), sickle (#651), + Tesla-Deployment-Kit (#489), TREE-PUZZLE (#662), VCFtools (#626), Vim (#665), vsc-mympirun-scoop (#661), + vsc-processcontrol (#661), XZ (#582) +- added additional easyconfigs for various supported software packages: version updates, different toolchains, ... + - OpenSSL with ictce toolchain (#703) +- various enhancements, including: + - using more constants and templates (#613, #615) + - specify OS dependency for SSL support, with OpenSSL dependency as fallback (#703) +- various bug fixes, including: + - fix unit tests after (internal) framework API changes (#667, #672) + - fix homepage in vsc-mympirun easyconfig file (#681) + - align OpenMPI easyconfigs (#650) + - add additional source URL in Qt easyconfigs (#676) + - specify correct $PATH specification and define $CHPL_HOME for Chapel (#683) + v1.10.0 (December 24th 2013) ---------------------------- diff --git a/setup.py b/setup.py index 98addcaa37..88e12b07b3 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.11.0.0dev" +VERSION = "1.11.0.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 878cd81d9ffc6a6d6d8c2563bba89f186559ea35 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 16 Feb 2014 16:45:54 +0100 Subject: [PATCH 729/811] netloc is not really beta, misnomer from past work fixed Signed-off-by: Fotis Georgatos --- ...-0.5beta-gcccuda-2.6.10.eb => netloc-0.5-gcccuda-2.6.10.eb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename easybuild/easyconfigs/n/netloc/{netloc-0.5beta-gcccuda-2.6.10.eb => netloc-0.5-gcccuda-2.6.10.eb} (89%) diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb b/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb similarity index 89% rename from easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb rename to easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb index b8c85aae37..f570d5694f 100644 --- a/easybuild/easyconfigs/n/netloc/netloc-0.5beta-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb @@ -1,6 +1,5 @@ name = 'netloc' version = "0.5" -versionsuffix = "beta" homepage = 'http://www.open-mpi.org/software/netloc' description = """The Portable Network Locality (netloc) software package provides @@ -19,7 +18,7 @@ configopts = '--with-hwloc=$EBROOTHWLOC ' # hwloc support configopts += '--with-jansson=$EBROOTJANSSON ' # jansson support # fi. http://www.open-mpi.org/software/netloc/v0.5/downloads/netloc-0.5.tar.gz -source_urls = [ homepage + '/v%(version_major_minor)s/downloads'] +source_urls = [homepage + '/v%(version_major_minor)s/downloads'] sources = [SOURCE_TAR_GZ] moduleclass = 'system' -- GitLab From baea30861fa9292e3ef1758384fe660ac0ae0bf7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Sun, 16 Feb 2014 19:22:55 +0100 Subject: [PATCH 730/811] template properly mvapich2 easyconfigs Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb | 2 +- easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb | 2 +- .../easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb index fd7d023894..6d98d3a032 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb @@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation. It is based on MPICH2 and MVI toolchain = {'name': 'ClangGCC', 'version': '1.1.3'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['mvapich2-%s.tgz' % version] +sources = [SOURCELOWER_TGZ] dependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb index 229478ec5e..e1fdfb364f 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb @@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation. It is based on MPICH2 and MVI toolchain = {'name': 'ClangGCC', 'version': '1.2.3'} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['mvapich2-%s.tgz' % version] +sources = [SOURCELOWER_TGZ] dependencies = [('Bison', '2.7')] diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb index b140cf37c7..51fd98fd16 100644 --- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'iccifort', 'version': '2011.13.367'} toolchainopts = {'optarch': True, 'pic': True} source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/'] -sources = ['mvapich2-%(version)s.tgz'] +sources = [SOURCELOWER_TGZ] builddependencies = [('Bison', '2.7', '', ('ictce', '4.1.13'))] -- GitLab From 12f3733a8d148fe0bfb1107f66e47f4b3d808d69 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 17 Feb 2014 10:25:42 +0100 Subject: [PATCH 731/811] bump version to v1.12.0.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 88e12b07b3..d090434633 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.11.0.0" +VERSION = "1.12.0.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 1b389ac10dccbdaba40ad6bbdec8e46b0ae7a037 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Tue, 25 Feb 2014 14:39:09 +0100 Subject: [PATCH 732/811] Clang: add patch for very long uid numbers --- .../c/Clang/Clang-3.4-GCC-4.8.2.eb | 1 + .../c/Clang/Clang-3.4-llvm-ar-uid.patch | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb index f753226de8..da75a7816f 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb @@ -36,6 +36,7 @@ patches = [ # http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130401/077539.html 'Clang-%(version)s-failing-tests-due-to-gcc-installation-prefix.patch', 'Clang-%(version)s-failing-sanitizer-tests.patch', + 'Clang-%(version)s-llvm-ar-uid.patch', ] builddependencies = [('CMake', '2.8.12')] diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch new file mode 100644 index 0000000000..77af143b39 --- /dev/null +++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch @@ -0,0 +1,42 @@ +# part of svn rev 199222. Fixes issue with very long uid numbers +diff -urN llvm-3.4.orig/tools/llvm-ar/llvm-ar.cpp llvm-3.4/tools/llvm-ar/llvm-ar.cpp +--- llvm-3.4.orig/tools/llvm-ar/llvm-ar.cpp 2013-11-08 13:35:56.000000000 +0100 ++++ llvm-3.4/tools/llvm-ar/llvm-ar.cpp 2014-02-24 13:22:18.335265229 +0100 +@@ -578,14 +578,21 @@ + } + + template +-static void printWithSpacePadding(raw_ostream &OS, T Data, unsigned Size) { ++static void printWithSpacePadding(raw_fd_ostream &OS, T Data, unsigned Size, ++ bool MayTruncate = false) { + uint64_t OldPos = OS.tell(); + OS << Data; + unsigned SizeSoFar = OS.tell() - OldPos; +- assert(Size >= SizeSoFar && "Data doesn't fit in Size"); +- unsigned Remaining = Size - SizeSoFar; +- for (unsigned I = 0; I < Remaining; ++I) +- OS << ' '; ++ if (Size > SizeSoFar) { ++ unsigned Remaining = Size - SizeSoFar; ++ for (unsigned I = 0; I < Remaining; ++I) ++ OS << ' '; ++ } else if (Size < SizeSoFar) { ++ assert(MayTruncate && "Data doesn't fit in Size"); ++ // Some of the data this is used for (like UID) can be larger than the ++ // space available in the archive format. Truncate in that case. ++ OS.seek(OldPos + Size); ++ } + } + + static void print32BE(raw_fd_ostream &Out, unsigned Val) { +@@ -600,8 +607,8 @@ + unsigned GID, unsigned Perms, + unsigned Size) { + printWithSpacePadding(Out, ModTime.toEpochTime(), 12); +- printWithSpacePadding(Out, UID, 6); +- printWithSpacePadding(Out, GID, 6); ++ printWithSpacePadding(Out, UID, 6, true); ++ printWithSpacePadding(Out, GID, 6, true); + printWithSpacePadding(Out, format("%o", Perms), 8); + printWithSpacePadding(Out, Size, 10); + Out << "`\n"; -- GitLab From 7b318c621cd12c0b36620344af46f700f87f4928 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 26 Feb 2014 21:00:03 +0100 Subject: [PATCH 733/811] bump version to v1.11.1.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 88e12b07b3..c31a5dfad5 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.11.0.0" +VERSION = "1.11.1.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From d0c81f2b6e7d54958740bdb201890c8249db75ce Mon Sep 17 00:00:00 2001 From: build Date: Fri, 28 Feb 2014 14:17:33 +0200 Subject: [PATCH 734/811] Contributing new intel release --- .../easyconfigs/i/icc/icc-2013_sp1.2.144.eb | 18 +++++++++++ easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb | 21 +++++++++++++ .../i/ifort/ifort-2013_sp1.2.144.eb | 18 +++++++++++ .../easyconfigs/i/imkl/imkl-11.1.2.144.eb | 30 +++++++++++++++++++ .../easyconfigs/i/impi/impi-4.1.3.048.eb | 19 ++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb create mode 100644 easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb create mode 100644 easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb create mode 100644 easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb create mode 100644 easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb new file mode 100644 index 0000000000..b742c2c7e4 --- /dev/null +++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb @@ -0,0 +1,18 @@ +name = 'icc' +version = '2013_sp1.2.144' + +homepage = 'http://software.intel.com/en-us/intel-compilers/' +description = "C and C++ compiler from Intel" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_ccompxe_%(version)s.tgz'] + +# compiler class +moduleclass = 'compiler' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb b/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb new file mode 100644 index 0000000000..452f2e72f1 --- /dev/null +++ b/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb @@ -0,0 +1,21 @@ +easyblock = "Toolchain" + +name = 'ictce' +version = '6.2.5' + +homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' +description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +suff = '2.144' +compver = '2013_sp1.%s' % suff + +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.3.048'), + ('imkl', '11.1.%s' % suff), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb new file mode 100644 index 0000000000..058b29e416 --- /dev/null +++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb @@ -0,0 +1,18 @@ +name = 'ifort' +version = '2013_sp1.2.144' + +homepage = 'http://software.intel.com/en-us/intel-compilers/' +description = "Fortran compiler from Intel" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_fcompxe_%(version)s.tgz'] + +# compiler class +moduleclass = 'compiler' + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb new file mode 100644 index 0000000000..991935e8b0 --- /dev/null +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb @@ -0,0 +1,30 @@ +name = 'imkl' +version = '11.1.2.144' + +homepage = 'http://software.intel.com/en-us/intel-mkl/' +description = """Intel Math Kernel Library is a library of highly optimized, + extensively threaded math routines for science, engineering, and financial + applications that require maximum performance. Core math functions include + BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mkl_%(version)s.tgz'] + +# deps for interface build +compver = '2013_sp1.2.144' +dependencies = [ + ('icc', compver), + ('ifort', compver), + ('impi', '4.1.3.048') +] + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +interfaces = True + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb b/easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb new file mode 100644 index 0000000000..bf918f875b --- /dev/null +++ b/easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb @@ -0,0 +1,19 @@ +name = 'impi' +version = '4.1.3.048' + +homepage = 'http://software.intel.com/en-us/intel-mpi-library/' +description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message + passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for + Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mpi_p_%(version)s.tgz'] + +dontcreateinstalldir = 'True' + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'mpi' -- GitLab From 5473ee6d129dff29e063736a7ee8f39855bb4afc Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Feb 2014 15:10:56 +0100 Subject: [PATCH 735/811] bump version to v1.11.1, update release notes --- RELEASE_NOTES | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index be302f6580..48872f366f 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,6 +4,11 @@ For more detailed information, please see the git log. The latest version of easybuild-easyconfig provides 2,319 easyconfig files, for 444 different software packages and 29 different (compiler) toolchains. +v1.11.1 (February 28th 2013) +---------------------------- + +(no changes compared to v1.11.0, simple version bump to stay in sync with easybuild-framework + v1.11.0 (February 16th 2013) ---------------------------- diff --git a/setup.py b/setup.py index c31a5dfad5..eac0265495 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.11.1.0dev" +VERSION = "1.11.1.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 4bd8c9315d02ce7bd1a9e0d508d3f4ff1bff089b Mon Sep 17 00:00:00 2001 From: Ewan Higgs Date: Tue, 4 Mar 2014 10:49:26 +0100 Subject: [PATCH 736/811] Add netifaces and netaddr. These are dependencies for the forthcoming hanythingondemand version. --- ...netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb | 24 ++++++++++++++++++ .../netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb | 25 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb create mode 100644 easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb diff --git a/easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..dd70ce8320 --- /dev/null +++ b/easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,24 @@ +easyblock = 'PythonPackage' + +name = 'netaddr' +version = '0.7.10' + +homepage = 'https://pypi.python.org/pypi/netaddr' +description = """Pythonic manipulation of IPv4, IPv6, CIDR, EUI and MAC network +addresses""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['https://pypi.python.org/packages/source/n/netaddr/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.6' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), +] + +options = {'modulename': 'netaddr'} diff --git a/easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb new file mode 100644 index 0000000000..3bbd0c1fca --- /dev/null +++ b/easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb @@ -0,0 +1,25 @@ +easyblock = 'PythonPackage' + +name = 'netifaces' +version = '0.8' + +homepage = 'https://pypi.python.org/pypi/netifaces' +description = """netifaces provides a (hopefully portable-ish) way for Python +programmers to get access to a list of the network interfaces on the local +machine, and to obtain the addresses of those network interfaces.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = ['http://alastairs-place.net/projects/netifaces/'] +sources = [SOURCE_TAR_GZ] + +python = 'Python' +pythonver = '2.7.6' +pythonshortver = '.'.join(pythonver.split('.')[0:2]) +versionsuffix = '-%s-%s' % (python, pythonver) + +dependencies = [ + (python, pythonver), +] + +options = {'modulename': 'netifaces'} -- GitLab From 7010cff282b963205a671783f9dd66b97ef1594a Mon Sep 17 00:00:00 2001 From: "i.gutheil" Date: Fri, 7 Mar 2014 10:01:11 +0100 Subject: [PATCH 737/811] Support for ELPA --- .../e/ELPA/ELPA-2013.11-ictce-5.5.0.eb | 31 +++++++++++++ .../easyconfigs/e/ELPA/ELPA_fix-tests.patch | 44 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb new file mode 100644 index 0000000000..df7b134658 --- /dev/null +++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb @@ -0,0 +1,31 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Authors:: Inge Gutheil , Alan O'Cais +# License:: MIT/GPL +# $Id$ +# +## + +name = 'ELPA' +version = '2013.11' + +homepage = 'http://elpa.rzg.mpg.de' +description = """Eigenvalue SoLvers for Petaflop-Applications .""" +toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'optarch': True, 'usempi': True} + + +sources = ['%sJUROPA3.tar.gz' % version] + +patches = ['ELPA_fix-tests.patch'] + +configopts = '--with-generic-simple --disable-shared FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBSCALAPACK"' +makeopts = ' V=1 LIBS="$LIBSCALAPACK"' #FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBBLAS"' +start_dir = '%s_%s' % (name, version) + +builddependencies = [('Automake', '1.13.4')] + +parallel = 1 + +moduleclass = 'math' diff --git a/easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch b/easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch new file mode 100644 index 0000000000..18fa2236a7 --- /dev/null +++ b/easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch @@ -0,0 +1,44 @@ +diff -ru ELPA_2013.11.orig/test/test_complex2.F90 ELPA_2013.11/test/test_complex2.F90 +--- ELPA_2013.11.orig/test/test_complex2.F90 2014-01-29 09:29:35.544248000 +0100 ++++ ELPA_2013.11/test/test_complex2.F90 2014-02-21 13:48:09.662072163 +0100 +@@ -79,6 +79,7 @@ + integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol + + integer, external :: numroc ++ integer :: iargc + + real*8 err, errmax + real*8, allocatable :: ev(:), xr(:,:) +diff -ru ELPA_2013.11.orig/test/test_complex.F90 ELPA_2013.11/test/test_complex.F90 +--- ELPA_2013.11.orig/test/test_complex.F90 2014-01-29 09:29:35.534699000 +0100 ++++ ELPA_2013.11/test/test_complex.F90 2014-02-21 13:48:33.118418351 +0100 +@@ -78,6 +78,7 @@ + integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol + + integer, external :: numroc ++ integer :: iargc + + real*8 err, errmax + real*8, allocatable :: ev(:), xr(:,:) +diff -ru ELPA_2013.11.orig/test/test_real2.F90 ELPA_2013.11/test/test_real2.F90 +--- ELPA_2013.11.orig/test/test_real2.F90 2014-01-29 09:29:35.573319000 +0100 ++++ ELPA_2013.11/test/test_real2.F90 2014-02-21 13:48:51.240387595 +0100 +@@ -80,6 +80,7 @@ + integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol + + integer, external :: numroc ++ integer :: iargc + + real*8 err, errmax + real*8, allocatable :: a(:,:), z(:,:), tmp1(:,:), tmp2(:,:), as(:,:), ev(:) +diff -ru ELPA_2013.11.orig/test/test_real.F90 ELPA_2013.11/test/test_real.F90 +--- ELPA_2013.11.orig/test/test_real.F90 2014-01-29 09:29:35.563829000 +0100 ++++ ELPA_2013.11/test/test_real.F90 2014-02-21 13:49:05.466094157 +0100 +@@ -79,6 +79,7 @@ + integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol + + integer, external :: numroc ++ integer :: iargc + + real*8 err, errmax + real*8, allocatable :: a(:,:), z(:,:), tmp1(:,:), tmp2(:,:), as(:,:), ev(:) -- GitLab From 4b4a145b87a3f641172b56b385bfcb0b5e9420cf Mon Sep 17 00:00:00 2001 From: "i.gutheil" Date: Tue, 11 Mar 2014 15:26:59 +0100 Subject: [PATCH 738/811] added autoconf and automake with ictce-5.5.0 toolchain --- .../a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb | 22 ++++++++++++++++ .../a/Automake/Automake-1.13.4-ictce-5.5.0.eb | 26 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb new file mode 100644 index 0000000000..80861e6d4f --- /dev/null +++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb @@ -0,0 +1,22 @@ +name = 'Autoconf' +version = '2.69' + +homepage = 'http://www.gnu.org/software/autoconf/' +description = """Autoconf is an extensible package of M4 macros that produce shell scripts to automatically + configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like + systems without manual user intervention. Autoconf creates a configuration script for a package from a + template file that lists the operating system features that the package can use, in the form of M4 macro calls.""" +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +source_urls = [GNU_SOURCE] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('M4', '1.4.16')] + +sanity_check_paths = { + 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", + "autoscan", "autoupdate", "ifnames"]], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb new file mode 100644 index 0000000000..b587eedafb --- /dev/null +++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb @@ -0,0 +1,26 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Authors:: Alan O'Cais +# $Id$ +# +## + +name = 'Automake' +version = '1.13.4' + +homepage = 'http://www.gnu.org/software/automake/automake.html' +description = "Automake: GNU Standards-compliant Makefile generator" + +source_urls = [GNU_SOURCE] +sources = [SOURCELOWER_TAR_GZ] +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +dependencies = [('Autoconf', '2.69')] + +sanity_check_paths = { + 'files': ['bin/automake', 'bin/aclocal'], + 'dirs': [], +} + +moduleclass = 'devel' -- GitLab From c6e7e3ce2bde44abd815ecad295e221641e50515 Mon Sep 17 00:00:00 2001 From: "i.gutheil" Date: Tue, 11 Mar 2014 16:24:18 +0100 Subject: [PATCH 739/811] added ELPA-2013.11-ictce-5.3.0.eb --- .../e/ELPA/ELPA-2013.11-ictce-5.3.0.eb | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb new file mode 100644 index 0000000000..f5078c7b57 --- /dev/null +++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb @@ -0,0 +1,31 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Authors:: Inge Gutheil , Alan O'Cais +# License:: MIT/GPL +# $Id$ +# +## + +name = 'ELPA' +version = '2013.11' + +homepage = 'http://elpa.rzg.mpg.de' +description = """Eigenvalue SoLvers for Petaflop-Applications .""" +toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'optarch': True, 'usempi': True} + + +sources = ['%sJUROPA3.tar.gz' % version] + +patches = ['ELPA_fix-tests.patch'] + +configopts = '--with-generic-simple --disable-shared FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBSCALAPACK"' +makeopts = ' V=1 LIBS="$LIBSCALAPACK"' #FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBBLAS"' +start_dir = '%s_%s' % (name, version) + +builddependencies = [('Automake', '1.13.4')] + +parallel = 1 + +moduleclass = 'math' -- GitLab From d24f6bf857980da298ed86bde1fedb89a61e0808 Mon Sep 17 00:00:00 2001 From: build Date: Wed, 12 Mar 2014 15:50:09 +0200 Subject: [PATCH 740/811] Adding changes --- easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb | 2 +- easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb | 2 +- .../easyconfigs/i/impi/{impi-4.1.3.048.eb => impi-4.1.3.049.eb} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename easybuild/easyconfigs/i/impi/{impi-4.1.3.048.eb => impi-4.1.3.049.eb} (96%) diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb b/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb index 452f2e72f1..005ab77007 100644 --- a/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb +++ b/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb @@ -14,7 +14,7 @@ compver = '2013_sp1.%s' % suff dependencies = [ ('icc', compver), ('ifort', compver), - ('impi', '4.1.3.048'), + ('impi', '4.1.3.049'), ('imkl', '11.1.%s' % suff), ] diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb index 991935e8b0..03e70ed442 100644 --- a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb @@ -16,7 +16,7 @@ compver = '2013_sp1.2.144' dependencies = [ ('icc', compver), ('ifort', compver), - ('impi', '4.1.3.048') + ('impi', '4.1.3.049') ] dontcreateinstalldir = 'True' diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb b/easybuild/easyconfigs/i/impi/impi-4.1.3.049.eb similarity index 96% rename from easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb rename to easybuild/easyconfigs/i/impi/impi-4.1.3.049.eb index bf918f875b..e55725a62a 100644 --- a/easybuild/easyconfigs/i/impi/impi-4.1.3.048.eb +++ b/easybuild/easyconfigs/i/impi/impi-4.1.3.049.eb @@ -1,5 +1,5 @@ name = 'impi' -version = '4.1.3.048' +version = '4.1.3.049' homepage = 'http://software.intel.com/en-us/intel-mpi-library/' description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message -- GitLab From dd7ae865de48f81d49df503600f246a3708b34ee Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 12 Mar 2014 15:25:50 +0100 Subject: [PATCH 741/811] fix source specifications for ELPA + minor style fixes --- easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb | 9 +++++---- easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb index f5078c7b57..c34c5462cb 100644 --- a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb @@ -12,17 +12,18 @@ version = '2013.11' homepage = 'http://elpa.rzg.mpg.de' description = """Eigenvalue SoLvers for Petaflop-Applications .""" + toolchain = {'name': 'ictce', 'version': '5.3.0'} toolchainopts = {'optarch': True, 'usempi': True} - -sources = ['%sJUROPA3.tar.gz' % version] +# download at http://elpa.rzg.mpg.de/elpa-tar-archive +sources = ['%(name)s_%(version)s.006_20140312.tar.gz'] patches = ['ELPA_fix-tests.patch'] configopts = '--with-generic-simple --disable-shared FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBSCALAPACK"' -makeopts = ' V=1 LIBS="$LIBSCALAPACK"' #FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBBLAS"' -start_dir = '%s_%s' % (name, version) +makeopts = ' V=1 LIBS="$LIBSCALAPACK"' +start_dir = '%(name)s_%(version)s' builddependencies = [('Automake', '1.13.4')] diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb index df7b134658..43da6936b9 100644 --- a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb @@ -12,17 +12,18 @@ version = '2013.11' homepage = 'http://elpa.rzg.mpg.de' description = """Eigenvalue SoLvers for Petaflop-Applications .""" + toolchain = {'name': 'ictce', 'version': '5.5.0'} toolchainopts = {'optarch': True, 'usempi': True} - -sources = ['%sJUROPA3.tar.gz' % version] +# download at http://elpa.rzg.mpg.de/elpa-tar-archive +sources = ['%(name)s_%(version)s.006_20140312.tar.gz'] patches = ['ELPA_fix-tests.patch'] configopts = '--with-generic-simple --disable-shared FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBSCALAPACK"' -makeopts = ' V=1 LIBS="$LIBSCALAPACK"' #FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBBLAS"' -start_dir = '%s_%s' % (name, version) +makeopts = ' V=1 LIBS="$LIBSCALAPACK"' +start_dir = '%(name)s_%(version)s' builddependencies = [('Automake', '1.13.4')] -- GitLab From ee5824d6a1dc9bd36b6d470fb9a77cbd6a1647e1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 12 Mar 2014 16:31:22 +0100 Subject: [PATCH 742/811] add gzip easyconfig to test use of ictce/6.2.5 toolchain --- .../g/gzip/gzip-1.6-ictce-6.2.5.eb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb new file mode 100644 index 0000000000..8c3304ae5f --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC +# Authors:: Thekla Loizou +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html +## + +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'ictce', 'version': '6.2.5'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = ['http://ftpmirror.gnu.org/gzip'] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' -- GitLab From fa2bd0dc9c0f99389717c068b7ea97bc2c397f14 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 13 Mar 2014 16:40:32 +0100 Subject: [PATCH 743/811] add sourceme & README.TXT for Lmod Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/README.TXT | 31 +++++++++++++++++++++++++ easybuild/easyconfigs/l/Lmod/sourceme | 26 +++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lmod/README.TXT create mode 100644 easybuild/easyconfigs/l/Lmod/sourceme diff --git a/easybuild/easyconfigs/l/Lmod/README.TXT b/easybuild/easyconfigs/l/Lmod/README.TXT new file mode 100644 index 0000000000..ad2d283ddc --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/README.TXT @@ -0,0 +1,31 @@ + +Summary: + +This directory contains (hopefully) sufficient gear in order to let you +bootstrap towards the Lmod implementation of environment modules. + +Howto: + +Assuming you have successfully used the bootstrap procedure of EasyBuild, +you should be able to initiate a recursive build of the following bits: + +l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb +l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb +n/ncurses/ncurses-5.9-GCC-4.8.2.eb +g/GCC/GCC-4.8.2.eb + +This set is expected to be the needed substrate to launch you towards Lmod, +which gets activated with the script sitting in the same directory: + +`source sourceme` # N.B. it does direct env. var. assignments; that's intentional + +Then try: + +`ml av` # ie. Lmod equivalent to `module avail` + +You should now be able to try alternative Lmod/Lua versions, such as 3.x variety and so on so forth. + +enjoy, +Fotis + +2014-03-13 diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme new file mode 100644 index 0000000000..c934dd7d78 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -0,0 +1,26 @@ +## Contributed by Fotis Georgatos , as means to help others wishing to ride on Lmod +# +# This script helps to implement policy: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html +# +# prereq: Lua/5.1.4-8-GCC-4.8.2 +# prereq: Lmod/5.2.5-GCC-4.8.2 + +## Remember to change the following, as per individual case +EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"/opt/apps/HPCBIOS.20131224"} +#EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} + +TOOLCHAIN="GCC-4.8.2" +VERSIONLUA="5.1.4-8" +VERSIONLMOD="5.2.5" + +PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN +PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD + +export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH +source $PREFIXLMOD/init/profile + +export PAGER=cat # Keep it simple, for a start +unset LMOD_IGNORE_CACHE # Lmod cache should be working now +export LMOD_COLORIZE=YES # YMMV + +echo 'Now, try fi. `module avail -d compiler` or `ml av` and observe output' -- GitLab From f374d3fb4da4872ae8cc375baf17e2cfc4d03372 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 13 Mar 2014 16:47:31 +0100 Subject: [PATCH 744/811] add hint on Lmod & buildsets relation Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/README.TXT | 10 ++++++---- easybuild/easyconfigs/l/Lmod/sourceme | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/README.TXT b/easybuild/easyconfigs/l/Lmod/README.TXT index ad2d283ddc..d371af9bfb 100644 --- a/easybuild/easyconfigs/l/Lmod/README.TXT +++ b/easybuild/easyconfigs/l/Lmod/README.TXT @@ -15,15 +15,17 @@ n/ncurses/ncurses-5.9-GCC-4.8.2.eb g/GCC/GCC-4.8.2.eb This set is expected to be the needed substrate to launch you towards Lmod, -which gets activated with the script sitting in the same directory: +which gets activated with the `sourceme` script sitting in the same directory: -`source sourceme` # N.B. it does direct env. var. assignments; that's intentional +`source sourceme` # N.B. it does direct assignments on environment variables; that's very intentional Then try: -`ml av` # ie. Lmod equivalent to `module avail` +`ml av` # ie. the Lmod equivalent to `module avail` ; it should work -You should now be able to try alternative Lmod/Lua versions, such as 3.x variety and so on so forth. +If so, you implemented the better instance of: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html +Lmod's caching can help to work with *buildsets*; ref. https://fosdem.org/2014/schedule/event/hpc_devroom_hpcbios/ +You should now be able to try alternative Lmod/Lua versions, such as 3.x variety, enable cache, and so on so forth. enjoy, Fotis diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index c934dd7d78..515aafba07 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -6,8 +6,8 @@ # prereq: Lmod/5.2.5-GCC-4.8.2 ## Remember to change the following, as per individual case -EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"/opt/apps/HPCBIOS.20131224"} -#EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} +EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} +#EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"/opt/apps/HPCBIOS.20131224"} TOOLCHAIN="GCC-4.8.2" VERSIONLUA="5.1.4-8" -- GitLab From e398892e207124e6a2956bff00b87cd3280538f1 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 13 Mar 2014 17:01:08 +0100 Subject: [PATCH 745/811] prereqs pedantic comment Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/README.TXT | 2 +- easybuild/easyconfigs/l/Lmod/sourceme | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/README.TXT b/easybuild/easyconfigs/l/Lmod/README.TXT index d371af9bfb..6e4cf47e00 100644 --- a/easybuild/easyconfigs/l/Lmod/README.TXT +++ b/easybuild/easyconfigs/l/Lmod/README.TXT @@ -25,7 +25,7 @@ Then try: If so, you implemented the better instance of: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html Lmod's caching can help to work with *buildsets*; ref. https://fosdem.org/2014/schedule/event/hpc_devroom_hpcbios/ -You should now be able to try alternative Lmod/Lua versions, such as 3.x variety, enable cache, and so on so forth. +You should now be able to try alternative Lmod/Lua versions, such as 3.x variety, toggle cache, and so forth. enjoy, Fotis diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 515aafba07..3f7c86e156 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -2,8 +2,10 @@ # # This script helps to implement policy: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html # -# prereq: Lua/5.1.4-8-GCC-4.8.2 # prereq: Lmod/5.2.5-GCC-4.8.2 +# prereq: Lua/5.1.4-8-GCC-4.8.2 +# +# build prereqs, take a note: GCC/4.8.2 & ncurses/5.9 ## Remember to change the following, as per individual case EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} -- GitLab From 427aa96c7c53cbea2abbae8a5143674d0e57c973 Mon Sep 17 00:00:00 2001 From: pub Date: Thu, 13 Mar 2014 20:11:52 +0100 Subject: [PATCH 746/811] iomkl-6.6.2.eb toolchain and dependencies --- .../g/gzip/gzip-1.6-iomkl-6.6.2.eb | 22 +++++++++++ .../hwloc-1.8.1-iccifort-2013_sp1.2.144.eb | 17 +++++++++ .../i/iccifort/iccifort-2013_sp1.2.144.eb | 16 ++++++++ .../i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb | 35 +++++++++++++++++ easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb | 23 +++++++++++ .../OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb | 38 +++++++++++++++++++ 6 files changed, 151 insertions(+) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb create mode 100644 easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb create mode 100644 easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb create mode 100644 easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb new file mode 100644 index 0000000000..fe81686c74 --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb @@ -0,0 +1,22 @@ +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'iomkl', 'version': '6.6.2'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = ['http://ftpmirror.gnu.org/gzip'] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb new file mode 100644 index 0000000000..4578e9944c --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = '1.8.1' + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'iccifort', 'version': '2013_sp1.2.144'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb new file mode 100644 index 0000000000..c51fb8ee78 --- /dev/null +++ b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb @@ -0,0 +1,16 @@ +easyblock = "Toolchain" + +name = 'iccifort' +version = '2013_sp1.2.144' + +homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' +description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +dependencies = [ + ('icc', version), + ('ifort', version), + ] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb new file mode 100644 index 0000000000..7c293cda0a --- /dev/null +++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb @@ -0,0 +1,35 @@ +name = 'imkl' +version = '11.1.2.144' + +homepage = 'http://software.intel.com/en-us/intel-mkl/' +description = """Intel Math Kernel Library is a library of highly optimized, extensively threaded math routines +for science, engineering, and financial applications that require maximum performance. Core math functions include +BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +sources = ['l_mkl_%(version)s.tgz'] + +compver = '2013_sp1.2.144' +comp = ('iccifort', compver) + +# deps for interface build +mpi = 'OpenMPI' +mpiver = '1.6.5' +versionsuffix = '-%s-%s' % (mpi, mpiver) + +dependencies = [ + ('icc', compver), + ('ifort', compver), + (mpi, mpiver, '', comp), +] + +dontcreateinstalldir = 'True' + +interfaces = True + +# license file +import os +license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic") + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb b/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb new file mode 100644 index 0000000000..7c34f7ee3c --- /dev/null +++ b/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb @@ -0,0 +1,23 @@ +easyblock = "Toolchain" + +name = 'iomkl' +version = '6.6.2' + +homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/' +description = """Intel Cluster Toolchain Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MKL & OpenMPI.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compver = '2013_sp1.2.144' +comp = ('iccifort', compver) +ompi = 'OpenMPI' +ompiver = '1.6.5' + +dependencies = [ + ('icc', compver), + ('ifort', compver), + (ompi, ompiver, '', comp), + ('imkl', '11.1.2.144', '-%s-%s' % (ompi, ompiver)), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb new file mode 100644 index 0000000000..6f2cfbd602 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb @@ -0,0 +1,38 @@ +name = 'OpenMPI' +version = '1.6.5' + +homepage = 'http://www.open-mpi.org/' +description = """The Open MPI Project is an open source MPI-2 implementation.""" + +toolchain = {'name': 'iccifort', 'version': '2013_sp1.2.144'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support + +dependencies = [('hwloc', '1.8.1')] + +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx", + "mpi_f77", "mpi_f90", + "mpi", "ompitrace", "open-pal", + "otfaux", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], +} + +moduleclass = 'mpi' -- GitLab From 32989180b34a055248d58f7c96298a753f0d8a78 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 13 Mar 2014 22:33:24 +0100 Subject: [PATCH 747/811] goolf-1.4.10-no-OFED.eb and dependencies --- .../f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb | 32 ++++++++++++ .../g/gompi/gompi-1.4.10-no-OFED.eb | 26 ++++++++++ .../g/goolf/goolf-1.4.10-no-OFED.eb | 44 ++++++++++++++++ ...0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb | 51 +++++++++++++++++++ .../OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb | 31 +++++++++++ ....10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb | 25 +++++++++ 6 files changed, 209 insertions(+) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb create mode 100644 easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb new file mode 100644 index 0000000000..7e4ef9ffc4 --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gompi', 'version': '1.4.10-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb new file mode 100644 index 0000000000..50c30a5ac2 --- /dev/null +++ b/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb @@ -0,0 +1,26 @@ +easyblock = "Toolchain" + +name = 'gompi' +version = '1.4.10' +versionsuffix = '-no-OFED' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, + including OpenMPI for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.7.2' +comp = (compname, compver) + +mpilib = 'OpenMPI' +mpiver = '1.6.4' + +# compiler toolchain dependencies +dependencies = [ + comp, + (mpilib, mpiver, versionsuffix, comp), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb new file mode 100644 index 0000000000..756c57643b --- /dev/null +++ b/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb @@ -0,0 +1,44 @@ +easyblock = "Toolchain" + +name = 'goolf' +version = '1.4.10' +versionsuffix = '-no-OFED' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, including + OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp_name = 'GCC' +comp_version = '4.7.2' +comp = (comp_name, comp_version) + +blaslib = 'OpenBLAS' +blasver = '0.2.6' +blas = '%s-%s' % (blaslib, blasver) +blas_suff = '-LAPACK-3.4.2' + +# toolchain used to build goolf dependencies +#comp_mpi_tc_name = 'gompi' +#comp_mpi_tc_ver = "%s" % version +#comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) + + +# toolchain used to build goalf dependencies +comp_mpi_tc_name = 'gompi' +comp_mpi_tc_ver = "%s%s" % (version, versionsuffix) +comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) + +# compiler toolchain dependencies +# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain +# because of toolchain preperation functions +dependencies = [ + comp, + ('OpenMPI', '1.6.4', versionsuffix, comp), + (blaslib, blasver, blas_suff, comp_mpi_tc), + ('FFTW', '3.3.3', '', comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blas_suff), comp_mpi_tc) +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..f64ed2e18b --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb @@ -0,0 +1,51 @@ +name = 'OpenBLAS' +version = '0.2.6' + +lapackver = '3.4.2' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'gompi', 'version': '1.4.10-no-OFED'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version, + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb new file mode 100644 index 0000000000..17f945a10e --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb @@ -0,0 +1,31 @@ +name = 'OpenMPI' +version = '1.6.4' +versionsuffix = '-no-OFED' + +homepage = 'http://www.open-mpi.org/' +description = "The Open MPI Project is an open source MPI-2 implementation." + +toolchain = {'name': 'GCC', 'version': '4.7.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] + +dependencies = [('hwloc', '1.6.2')] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support +configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb new file mode 100644 index 0000000000..5e0e14ba2c --- /dev/null +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb @@ -0,0 +1,25 @@ +name = 'ScaLAPACK' +version = '2.0.2' + +homepage = 'http://www.netlib.org/scalapack/' +description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines +redesigned for distributed memory MIMD parallel computers.""" + +toolchain = {'name': 'gompi', 'version': '1.4.10-no-OFED'} +toolchainopts = {'pic': True} + +source_urls = [homepage] +sources = ['%(namelower)s-%(version)s.tgz'] + +blaslib = 'OpenBLAS' +blasver = '0.2.6' +blassuff = '-LAPACK-3.4.2' + +versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff) + +dependencies = [(blaslib, blasver, blassuff)] + +## parallel build tends to fail, so disabling it +parallel = 1 + +moduleclass = 'numlib' -- GitLab From dd86580c59a204aae887d6f768ab53a983ae0490 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 13 Mar 2014 22:43:14 +0100 Subject: [PATCH 748/811] removed unneded comments and blank lines --- easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb index 756c57643b..e7b5fd7db4 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb @@ -19,13 +19,7 @@ blasver = '0.2.6' blas = '%s-%s' % (blaslib, blasver) blas_suff = '-LAPACK-3.4.2' -# toolchain used to build goolf dependencies -#comp_mpi_tc_name = 'gompi' -#comp_mpi_tc_ver = "%s" % version -#comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) - - -# toolchain used to build goalf dependencies +# toolchain used to build goolf-1.4.10-no-OFED dependencies comp_mpi_tc_name = 'gompi' comp_mpi_tc_ver = "%s%s" % (version, versionsuffix) comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) -- GitLab From 3554b1d0980b4ff5990d84426f14103bec6d1313 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 13 Mar 2014 22:45:52 +0100 Subject: [PATCH 749/811] added gzip-1.6-goolf-1.4.10-no-OFED.eb for testing --- .../g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb new file mode 100644 index 0000000000..00881818f0 --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb @@ -0,0 +1,22 @@ +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'goolf', 'version': '1.4.10-no-OFED'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = ['http://ftpmirror.gnu.org/gzip'] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' -- GitLab From 11d06675225018aecc55a9f3a09dd7939d97461a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 14 Mar 2014 10:04:44 +0100 Subject: [PATCH 750/811] add easyconfig files for slalib-c --- .../s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb | 23 +++++++++++++++++++ .../s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb | 23 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb create mode 100644 easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb diff --git a/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb new file mode 100644 index 0000000000..433f61d41e --- /dev/null +++ b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb @@ -0,0 +1,23 @@ +easyblock = 'ConfigureMake' + +name = 'slalib-c' +version = '0.0' + +homepage = 'http://star-www.rl.ac.uk/star/docs/sun67.htx/sun67.html' +description = "SLALIB is a library used by writers of positional-astronomy applications." + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +# only available for download per request, cfr. ftp://legacy.gsfc.nasa.gov/heasarc/software/slalib-info.html +sources = [SOURCE_TAR_BZ2] + +skipsteps = ['configure', 'install'] +makeopts = 'INSTALL_DIR=%(installdir)s SLA_LIB_DIR=%(installdir)s/lib/ CCOMPC="$CC" CFLAGC="-c -pedantic $CFLAGS"' + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["include/slalib.h", "include/slamac.h", "lib/libsla.a"], + 'dirs': [], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb new file mode 100644 index 0000000000..8b59888038 --- /dev/null +++ b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb @@ -0,0 +1,23 @@ +easyblock = 'ConfigureMake' + +name = 'slalib-c' +version = '0.0' + +homepage = 'http://star-www.rl.ac.uk/star/docs/sun67.htx/sun67.html' +description = "SLALIB is a library used by writers of positional-astronomy applications." + +toolchain = {'name': 'ictce', 'version': '5.5.0'} + +# only available for download per request, cfr. ftp://legacy.gsfc.nasa.gov/heasarc/software/slalib-info.html +sources = [SOURCE_TAR_BZ2] + +skipsteps = ['configure', 'install'] +makeopts = 'INSTALL_DIR=%(installdir)s SLA_LIB_DIR=%(installdir)s/lib/ CCOMPC="$CC" CFLAGC="-c -pedantic $CFLAGS"' + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["include/slalib.h", "include/slamac.h", "lib/libsla.a"], + 'dirs': [], +} + +moduleclass = 'lib' -- GitLab From 7e4790d5d6c4ecf6303abddb26d811fb72cdf9fa Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Fri, 14 Mar 2014 16:49:56 +0100 Subject: [PATCH 751/811] fixed indentation --- easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb | 6 +++--- easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb index fdb9bb58b9..76b5884dca 100644 --- a/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb @@ -9,8 +9,8 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and toolchain = {'name': 'dummy', 'version': 'dummy'} dependencies = [ - ('icc', version), - ('ifort', version), - ] + ('icc', version), + ('ifort', version), +] moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb index c51fb8ee78..85878e8ca1 100644 --- a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb +++ b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb @@ -9,8 +9,8 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and toolchain = {'name': 'dummy', 'version': 'dummy'} dependencies = [ - ('icc', version), - ('ifort', version), - ] + ('icc', version), + ('ifort', version), +] moduleclass = 'toolchain' -- GitLab From 4f0cae67686003babdb918ed19737fb07bf35fb9 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Fri, 14 Mar 2014 17:00:26 +0100 Subject: [PATCH 752/811] switched to GNU_SOURCE template --- easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb index fe81686c74..9763d27a88 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb @@ -7,7 +7,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace toolchain = {'name': 'iomkl', 'version': '6.6.2'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz -source_urls = ['http://ftpmirror.gnu.org/gzip'] +source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] # make sure the gzip, gunzip and compress binaries are available after installation -- GitLab From 62223fdc3d31bcc876a15fc4a37760bc174deda8 Mon Sep 17 00:00:00 2001 From: Ewan Higgs Date: Mon, 17 Mar 2014 14:37:47 +0100 Subject: [PATCH 753/811] Add ViennaRNA 2.1.6 ictce-5.5.0 build. --- .../ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb | 45 +++++++++++++++++++ .../v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch | 26 +++++++++++ 2 files changed, 71 insertions(+) create mode 100644 easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb create mode 100644 easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb new file mode 100644 index 0000000000..f0df356467 --- /dev/null +++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb @@ -0,0 +1,45 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Cedric Laczny , Fotis Georgatos +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html +## + +name = 'ViennaRNA' +version = '2.1.6' + +homepage = 'http://www.tbi.univie.ac.at/~ronny/RNA/vrna2.html' +description = """The Vienna RNA Package consists of a C code library and several +stand-alone programs for the prediction and comparison of RNA secondary structures.""" + +toolchain = {'name': 'ictce', 'version': '5.5.0' } +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://www.tbi.univie.ac.at/~ronny/RNA/packages/source'] + +patches = ['ViennaRNA-2.1.6_ictce.patch'] + +# Prevents the "make install" step from trying to copy to _global_ perl dir and thus make easybuild fail. +configopts = '--without-perl' +# Alternatively, you may want to use the following to copy the perl-module to a "local" directory +# Code NOT yet tested, therefor left here for future recycling +#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"' + +sanity_check_paths = { + 'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance', + 'inverse', 'plot', 'subopt', 'Lfold', 'cofold', + 'paln', 'duplex', 'alifold', 'plfold', 'up', + 'aliduplex', 'Lalifold', '2Dfold', 'parconv', + 'PKplex', 'plex', 'snoop', 'forester']] + + ['bin/Kinfold'], + 'dirs': [], +} + +moduleclass = 'bio' + diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch new file mode 100644 index 0000000000..ff068d76be --- /dev/null +++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch @@ -0,0 +1,26 @@ +--- ViennaRNA-2.1.6/Kinfold/cache.c.orig 2014-03-17 14:07:33.308562799 +0100 ++++ ViennaRNA-2.1.6/Kinfold/cache.c 2014-03-17 14:07:48.808965449 +0100 +@@ -56,7 +56,6 @@ + 61,59,53,47,43,41,37,31,29,23,17,13,11,7,3,1}; + + /* key must not be longer than 128 */ +-#pragma inline (cache_f) + unsigned cache_f(char *x) { + register char *s; + register int i; +@@ -80,6 +79,7 @@ + int cacheval; + cache_entry *c; + ++ #pragma inline (cache_f) + cacheval=cache_f(x); + if ((c=cachetab[cacheval])) + if (strcmp(c->structure,x)==0) return c; +@@ -92,6 +92,7 @@ + int cacheval; + cache_entry *c; + ++ #pragma inline (cache_f) + cacheval=cache_f(x->structure); + if ((c=cachetab[cacheval])) { + free(c->structure); -- GitLab From 3eaa3275e3ad379056e9a4ea58acce82404038fe Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 19 Mar 2014 11:52:29 +0100 Subject: [PATCH 754/811] fix Qt source_urls, add Qt easyconfig with ictce 4.1.13 --- .../q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb | 2 +- .../q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb | 2 +- .../easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb | 2 +- .../easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb | 2 +- .../easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb | 2 +- .../easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb | 2 +- .../easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb | 5 ++++- .../easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb | 17 +++++++++++++++++ 8 files changed, 27 insertions(+), 7 deletions(-) create mode 100755 easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb index 15b02947ee..feb10d4a75 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb index 2d4e7c17a1..e8472dac11 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb index f83f3ffb6a..c489c5aa68 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb index ffa5551d14..4a7a10534b 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb @@ -9,7 +9,7 @@ toolchainopts = {'lowopt': True} # use -O1 source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb index e05c77a46b..a411477c0b 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'} source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb index 654eb56d93..3c0ae0a9af 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb @@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'} source_urls = [ 'http://origin.releases.qt-project.org/qt4/source/', - 'http://master.qt-project.org/archive/qt/%(major_minor_version)s/%(version)s/' + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb index faddb7d77e..9e49fd8ca8 100644 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb @@ -5,7 +5,10 @@ homepage = 'http://qt-project.org/' description = "Qt is a comprehensive cross-platform C++ application framework." toolchain = {'name': 'gmpolf', 'version': '1.4.8'} -source_urls = ['http://download.qt-project.org/official_releases/qt/4.8/4.8.5/'] +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' +] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] dependencies = [('GLib', '2.34.3')] diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb new file mode 100755 index 0000000000..bc5d1c87ff --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb @@ -0,0 +1,17 @@ +name = 'Qt' +version = '4.8.5' + +homepage = 'http://qt-project.org/' +description = "Qt is a comprehensive cross-platform C++ application framework." + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [ + 'http://origin.releases.qt-project.org/qt4/source/', + 'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/' +] +sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] + +dependencies = [('GLib', '2.34.3')] + +moduleclass = 'devel' -- GitLab From 3c1f1dde78eb019eac5664983bd186d18f341068 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 19 Mar 2014 16:41:13 +0100 Subject: [PATCH 755/811] add missing patch file for Qt v4.8.5 with ictce/4.1.13 --- .../easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb | 2 ++ .../easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb index bc5d1c87ff..312d6b1990 100755 --- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb @@ -12,6 +12,8 @@ source_urls = [ ] sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz'] +patches = ['Qt-4.8.5_ictce-qUnused.patch'] + dependencies = [('GLib', '2.34.3')] moduleclass = 'devel' diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch b/easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch new file mode 100644 index 0000000000..e881808fd2 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch @@ -0,0 +1,15 @@ +see https://qt.gitorious.net/qt/qtbase/commit/d3951a5b0f4fe9731d1512668b43f51bd98bd84e +and http://lists.qt-project.org/pipermail/interest/2013-September/008591.html +diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h +index 7d91fa3..cc0e6a1 100644 +--- a/src/corelib/global/qglobal.h ++++ b/src/corelib/global/qglobal.h +@@ -820,7 +820,7 @@ Q_CORE_EXPORT bool qSharedBuild(); + Avoid "unused parameter" warnings + */ + +-#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT) ++#if defined(Q_CC_RVCT) + template + inline void qUnused(T &x) { (void)x; } + # define Q_UNUSED(x) qUnused(x); -- GitLab From 77d339cb10d9e252953caac6a1fbf3684a9a3f25 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 19 Mar 2014 19:54:49 +0100 Subject: [PATCH 756/811] added goolf-1.6.5.eb. Still missing deps --- easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb new file mode 100644 index 0000000000..00585a3dca --- /dev/null +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb @@ -0,0 +1,37 @@ +easyblock = "Toolchain" + +name = 'goolf' +version = '1.6.5' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, including + OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp_name = 'GCC' +comp_version = '4.8.2' +comp = (comp_name, comp_version) + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blas = '%s-%s' % (blaslib, blasver) +blassuff = '-LAPACK-3.5.0' + +# toolchain used to build goolf dependencies +comp_mpi_tc_name = 'gompi' +comp_mpi_tc_ver = "%s" % version +comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) + +# compiler toolchain depencies +# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain +# because of toolchain preperation functions +dependencies = [ + ('GCC', '4.8.2'), + ('OpenMPI', '1.6.5', '', comp), # part of gompi-1.1.0 + (blaslib, blasver, blassuff, comp_mpi_tc), + ('FFTW', '3.3.3', '', comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), +] + +moduleclass = 'toolchain' -- GitLab From 012a003cab7c239c230b453c66a8a3bf45251657 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 19 Mar 2014 23:05:48 +0100 Subject: [PATCH 757/811] added dependencies --- .../f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb | 32 ++++++++++++ easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb | 25 ++++++++++ ...OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb | 50 +++++++++++++++++++ .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb | 36 +++++++++++++ ...gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb | 25 ++++++++++ 5 files changed, 168 insertions(+) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb create mode 100644 easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb new file mode 100644 index 0000000000..94287ee108 --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb b/easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb new file mode 100644 index 0000000000..bbd1e9fa7d --- /dev/null +++ b/easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb @@ -0,0 +1,25 @@ +easyblock = "Toolchain" + +name = 'gompi' +version = '1.6.5' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, + including OpenMPI for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.8.2' +comp = (compname, compver) + +mpilib = 'OpenMPI' +mpiver = '1.6.5' + +# compiler toolchain dependencies +dependencies = [ + comp, + (mpilib, mpiver, '', comp), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb new file mode 100644 index 0000000000..2ac7e82d71 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb @@ -0,0 +1,50 @@ +name = 'OpenBLAS' +version = '0.2.8' + +lapackver = '3.5.0' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb new file mode 100644 index 0000000000..4b87a8687a --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb @@ -0,0 +1,36 @@ +name = 'OpenMPI' +version = '1.6.5' + +homepage = 'http://www.open-mpi.org/' +description = """The Open MPI Project is an open source MPI-2 implementation.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] + +patches = ['OpenMPI-1.6.5-vt_cupti_events.patch'] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading + +# needed for --with-openib +if OS_NAME in ['debian', 'ubuntu']: + osdependencies = ['libibverbs-dev'] +else: + # OK for OS_NAME == redhat, fedora, RHEL, SL, centos + osdependencies = ['libibverbs-devel'] + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb new file mode 100644 index 0000000000..4d6a349030 --- /dev/null +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb @@ -0,0 +1,25 @@ +name = 'ScaLAPACK' +version = '2.0.2' + +homepage = 'http://www.netlib.org/scalapack/' +description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines + redesigned for distributed memory MIMD parallel computers.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5'} +toolchainopts = {'pic': True} + +source_urls = [homepage] +sources = [SOURCELOWER_TGZ] + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blassuff = '-LAPACK-3.5.0' + +versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff) + +dependencies = [(blaslib, blasver, blassuff)] + +## parallel build tends to fail, so disabling it +parallel = 1 + +moduleclass = 'numlib' -- GitLab From 282fa941d5cff3d8800f75dd358ed51326367b1b Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 19 Mar 2014 23:37:09 +0100 Subject: [PATCH 758/811] goolf-1.6.5-no-OFED goolf-1.6.5-no-OFED --- .../f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb | 32 ++++++++++++ .../g/gompi/gompi-1.6.5-no-OFED.eb | 26 ++++++++++ .../g/goolf/goolf-1.6.5-no-OFED.eb | 38 ++++++++++++++ ...-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb | 50 +++++++++++++++++++ .../OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb | 30 +++++++++++ ...6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb | 25 ++++++++++ 6 files changed, 201 insertions(+) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb create mode 100644 easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb create mode 100644 easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb create mode 100644 easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb new file mode 100644 index 0000000000..86c18c4f19 --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.3' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5-no-OFED'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb new file mode 100644 index 0000000000..3595845212 --- /dev/null +++ b/easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb @@ -0,0 +1,26 @@ +easyblock = "Toolchain" + +name = 'gompi' +version = '1.6.5' +versionsuffix = '-no-OFED' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, + including OpenMPI for MPI support.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +compname = 'GCC' +compver = '4.8.2' +comp = (compname, compver) + +mpilib = 'OpenMPI' +mpiver = '1.6.5' + +# compiler toolchain dependencies +dependencies = [ + comp, + (mpilib, mpiver, versionsuffix, comp), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb new file mode 100644 index 0000000000..4bf7e91c94 --- /dev/null +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb @@ -0,0 +1,38 @@ +easyblock = "Toolchain" + +name = 'goolf' +version = '1.6.5' +versionsuffix = '-no-OFED' + +homepage = '(none)' +description = """GNU Compiler Collection (GCC) based compiler toolchain, including + OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +comp_name = 'GCC' +comp_version = '4.8.2' +comp = (comp_name, comp_version) + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blas = '%s-%s' % (blaslib, blasver) +blassuff = '-LAPACK-3.5.0' + +# toolchain used to build goolf dependencies +comp_mpi_tc_name = 'gompi' +comp_mpi_tc_ver = "%s%s" % (version, versionsuffix) +comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) + +# compiler toolchain depencies +# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain +# because of toolchain preperation functions +dependencies = [ + ('GCC', '4.8.2'), + ('OpenMPI', '1.6.5', '-no-OFED', comp), # part of gompi-1.1.0 + (blaslib, blasver, blassuff, comp_mpi_tc), + ('FFTW', '3.3.3', '', comp_mpi_tc), + ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), +] + +moduleclass = 'toolchain' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb new file mode 100644 index 0000000000..c446511bf9 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb @@ -0,0 +1,50 @@ +name = 'OpenBLAS' +version = '0.2.8' + +lapackver = '3.5.0' +versionsuffix = '-LAPACK-%s' % lapackver + +homepage = 'http://xianyi.github.com/OpenBLAS/' +description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5-no-OFED'} + +lapack_src = 'lapack-%s.tgz' % lapackver +large_src = 'large.tgz' +timing_src = 'timing.tgz' +sources = [ + 'v%(version)s.tar.gz', + lapack_src, + large_src, + timing_src, +] +source_urls = [ + # order matters, trying to download the LAPACK tarball from GitHub causes trouble + "http://www.netlib.org/lapack/", + "http://www.netlib.org/lapack/timing/", + "https://github.com/xianyi/OpenBLAS/archive/", +] + +patches = [ + (lapack_src, '.'), # copy LAPACK tarball to unpacked OpenBLAS dir + (large_src, '.'), + (timing_src, '.'), +] + +skipsteps = ['configure'] + +threading = 'USE_THREAD=1' +makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"' +installopts = threading + " PREFIX=%(installdir)s" + +# extensive testing can be enabled by uncommenting the line below +#runtest = 'PATH=.:$PATH lapack-timing' + +sanity_check_paths = { + 'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h', + 'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h', + 'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext], + 'dirs': [], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb new file mode 100644 index 0000000000..189fba5f29 --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb @@ -0,0 +1,30 @@ +name = 'OpenMPI' +version = '1.6.5' +versionsuffix = '-no-OFED' + +homepage = 'http://www.open-mpi.org/' +description = """The Open MPI Project is an open source MPI-2 implementation.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] + +patches = ['OpenMPI-1.6.5-vt_cupti_events.patch'] + +configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' +configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path +configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading + +sanity_check_paths = { + 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + + ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90", + "mpi", "ompitrace", "open-pal", + "open-rte", "vt", "vt-hyb", + "vt-mpi", "vt-mpi-unify"]] + + ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif", + "mpif-mpi-io", "mpi", "mpi_portable_platform"]], + 'dirs': ["include/openmpi/ompi/mpi/cxx"], +} + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb new file mode 100644 index 0000000000..a24ac08f75 --- /dev/null +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb @@ -0,0 +1,25 @@ +name = 'ScaLAPACK' +version = '2.0.2' + +homepage = 'http://www.netlib.org/scalapack/' +description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines + redesigned for distributed memory MIMD parallel computers.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5-no-OFED'} +toolchainopts = {'pic': True} + +source_urls = [homepage] +sources = [SOURCELOWER_TGZ] + +blaslib = 'OpenBLAS' +blasver = '0.2.8' +blassuff = '-LAPACK-3.5.0' + +versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff) + +dependencies = [(blaslib, blasver, blassuff)] + +## parallel build tends to fail, so disabling it +parallel = 1 + +moduleclass = 'numlib' -- GitLab From 8a61cb164f42e24816f426cb72e47586b849b563 Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 19 Mar 2014 23:38:54 +0100 Subject: [PATCH 759/811] added gzip-1.6-goolf-1.6.5-no-OFED.eb for testing --- .../g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb new file mode 100644 index 0000000000..8c43c42f94 --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC +# Authors:: Thekla Loizou +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html +## + +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'goolf', 'version': '1.6.5-no-OFED'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = [GNU_SOURCE] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' -- GitLab From d2990e9543d10418b0996d1d7a2a21f4cf3a318c Mon Sep 17 00:00:00 2001 From: pescobar Date: Wed, 19 Mar 2014 23:40:12 +0100 Subject: [PATCH 760/811] added gzip-1.6-goolf-1.6.5.eb for testing --- .../g/gzip/gzip-1.6-goolf-1.6.5.eb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb new file mode 100644 index 0000000000..dd296a9acd --- /dev/null +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb @@ -0,0 +1,34 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC +# Authors:: Thekla Loizou +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html +## + +name = 'gzip' +version = '1.6' + +homepage = 'http://www.gnu.org/software/gzip/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'goolf', 'version': '1.6.5'} + +# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz +source_urls = [GNU_SOURCE] +sources = [SOURCE_TAR_GZ] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"], + 'dirs': [], +} + +# run 'gzip -h' and 'gzip --version' after installation +sanity_check_commands = [True, ('gzip', '--version')] + +moduleclass = 'tools' -- GitLab From 3d567f03786991456fa78b963a8791af6fa6013e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 20 Mar 2014 16:49:19 +0100 Subject: [PATCH 761/811] fix defining tmp_logdir config setting --- test/easyconfigs/suite.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/easyconfigs/suite.py b/test/easyconfigs/suite.py index 0c775762c4..dbb1a006c9 100644 --- a/test/easyconfigs/suite.py +++ b/test/easyconfigs/suite.py @@ -38,7 +38,6 @@ import tempfile import unittest from vsc import fancylogger -import easybuild.tools.config as config import test.easyconfigs.easyconfigs as e # initialize logger for all the unit tests @@ -48,7 +47,7 @@ os.remove(log_fn) fancylogger.logToFile(log_fn) fancylogger.setLogLevelDebug() -config.variables['tmp_logdir'] = tempfile.mkdtemp(prefix='easyconfigs_test_') +os.environ['EASYBUILD_TMP_LOGDIR'] = tempfile.mkdtemp(prefix='easyconfigs_test_') # call suite() for each module and then run them all SUITE = unittest.TestSuite([x.suite() for x in [e]]) @@ -65,7 +64,8 @@ except ImportError, err: res = unittest.TextTestRunner().run(SUITE) fancylogger.logToFile(log_fn, enable=False) -shutil.rmtree(config.variables['tmp_logdir']) +shutil.rmtree(os.environ['EASYBUILD_TMP_LOGDIR']) +del os.environ['EASYBUILD_TMP_LOGDIR'] for f in glob.glob('%s*' % log_fn): os.remove(f) -- GitLab From b9b6b7acdad9d547f6c0a5a3a7e443483cddc39f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 20 Mar 2014 16:49:48 +0100 Subject: [PATCH 762/811] add test for checking locations of easyconfig files --- test/easyconfigs/easyconfigs.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index c7a289a50f..ec1d53f7b5 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -157,6 +157,22 @@ class EasyConfigTest(TestCase): conflicts = True self.assertFalse(conflicts, "No conflicts detected") + def test_easyconfig_locations(self): + """Make sure all easyconfigs files are in the right location.""" + easyconfig_dirs_regex = re.compile('.*/easybuild/easyconfigs/[a-z]/[^/]+$') + topdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) + for (dirpath, _, filenames) in os.walk(topdir): + # ignore git/svn dirs + if '/.git/' in dirpath or '.svn' in dirpath: + continue + # check whether list of .eb files is non-empty + easyconfig_files = [fn for fn in filenames if fn.endswith('eb')] + if easyconfig_files: + # check whether path matches required pattern + if not easyconfig_dirs_regex.match(dirpath): + # only exception: TEMPLATE.eb + if not (dirpath.endswith('/easybuild/easyconfigs') and filenames == ['TEMPLATE.eb']): + self.assertTrue(False, "List of easyconfig files in %s is empty: %s" % (dirpath, filenames)) def template_easyconfig_test(self, spec): """Test whether all easyconfigs can be initialized.""" -- GitLab From 30ac03c588fb027198a3d07858a9bf09db824772 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 20 Mar 2014 16:56:53 +0100 Subject: [PATCH 763/811] fix remark --- test/easyconfigs/easyconfigs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index ec1d53f7b5..bb68a41844 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -163,7 +163,7 @@ class EasyConfigTest(TestCase): topdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) for (dirpath, _, filenames) in os.walk(topdir): # ignore git/svn dirs - if '/.git/' in dirpath or '.svn' in dirpath: + if '/.git/' in dirpath or '/.svn/' in dirpath: continue # check whether list of .eb files is non-empty easyconfig_files = [fn for fn in filenames if fn.endswith('eb')] -- GitLab From 87a4e33adf4aaccd14203aef7a4908e5e2f7125a Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 20 Mar 2014 16:58:03 +0100 Subject: [PATCH 764/811] added hwloc support to OpenMPI-1.6.5-GCC-4.8.2.eb --- .../h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb | 17 +++++++++++++++++ .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb new file mode 100644 index 0000000000..1a2541a79b --- /dev/null +++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb @@ -0,0 +1,17 @@ +name = 'hwloc' +version = "1.8.1" + +homepage = 'http://www.open-mpi.org/projects/hwloc/' +description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including + NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various + system attributes such as cache and memory information as well as the locality of I/O devices such as + network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering + information about modern computing hardware so as to exploit it accordingly and efficiently.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/'] +sources = [SOURCE_TAR_GZ] + +moduleclass = 'system' diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb index 4b87a8687a..0dccde3d24 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb @@ -14,6 +14,9 @@ patches = ['OpenMPI-1.6.5-vt_cupti_events.patch'] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading +configopts += '--with-hwloc=$EBROOTHWLOC ' + +dependencies = [('hwloc', '1.8.1')] # needed for --with-openib if OS_NAME in ['debian', 'ubuntu']: -- GitLab From 60c99978c319fc273a4027192a199c2486dfffd1 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 20 Mar 2014 16:59:26 +0100 Subject: [PATCH 765/811] updated to FFTW-3.3.4 --- .../f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb | 32 +++++++++++++++++++ easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb new file mode 100644 index 0000000000..998fa89264 --- /dev/null +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb @@ -0,0 +1,32 @@ +name = 'FFTW' +version = '3.3.4' + +homepage = 'http://www.fftw.org' +description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex data.""" + +toolchain = {'name': 'gompi', 'version': '1.6.5'} +toolchainopts = {'optarch': True, 'pic': True} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [homepage] + +common_configopts = "--enable-openmp --with-pic" + +configopts = [ + common_configopts + " --enable-single --enable-sse2 --enable-mpi", + common_configopts + " --enable-long-double --enable-mpi", + common_configopts + " --enable-quad-precision", + common_configopts + " --enable-sse2 --enable-mpi", # default as last +] + +sanity_check_paths = { + 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + + ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', + '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + + ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', + 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], + 'dirs': ['lib/pkgconfig'], +} + +moduleclass = 'numlib' diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb index 00585a3dca..2dcbbded37 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb @@ -30,7 +30,7 @@ dependencies = [ ('GCC', '4.8.2'), ('OpenMPI', '1.6.5', '', comp), # part of gompi-1.1.0 (blaslib, blasver, blassuff, comp_mpi_tc), - ('FFTW', '3.3.3', '', comp_mpi_tc), + ('FFTW', '3.3.4', '', comp_mpi_tc), ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), ] -- GitLab From 41fb586ce713cf336e21d2f2865ceb3e715b7630 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 20 Mar 2014 17:21:13 +0100 Subject: [PATCH 766/811] removed FFTW-3.3.3-gompi-1.6.5.eb --- .../f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb deleted file mode 100644 index 94287ee108..0000000000 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5.eb +++ /dev/null @@ -1,32 +0,0 @@ -name = 'FFTW' -version = '3.3.3' - -homepage = 'http://www.fftw.org' -description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) - in one or more dimensions, of arbitrary input size, and of both real and complex data.""" - -toolchain = {'name': 'gompi', 'version': '1.6.5'} -toolchainopts = {'optarch': True, 'pic': True} - -sources = [SOURCELOWER_TAR_GZ] -source_urls = [homepage] - -common_configopts = "--enable-openmp --with-pic" - -configopts = [ - common_configopts + " --enable-single --enable-sse2 --enable-mpi", - common_configopts + " --enable-long-double --enable-mpi", - common_configopts + " --enable-quad-precision", - common_configopts + " --enable-sse2 --enable-mpi", # default as last -] - -sanity_check_paths = { - 'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] + - ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03', - '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] + - ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp', - 'l', 'l_mpi', 'l_omp', 'q', 'q_omp']], - 'dirs': ['lib/pkgconfig'], -} - -moduleclass = 'numlib' -- GitLab From 30dac6aeb7df115df6631e6d9105c887b69ceda5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 20 Mar 2014 17:22:51 +0100 Subject: [PATCH 767/811] fix remark w.r.t. regex --- test/easyconfigs/easyconfigs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index bb68a41844..d617cee355 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -159,7 +159,7 @@ class EasyConfigTest(TestCase): def test_easyconfig_locations(self): """Make sure all easyconfigs files are in the right location.""" - easyconfig_dirs_regex = re.compile('.*/easybuild/easyconfigs/[a-z]/[^/]+$') + easyconfig_dirs_regex = re.compile(r'/easybuild/easyconfigs/[a-z]/[^/]+$') topdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) for (dirpath, _, filenames) in os.walk(topdir): # ignore git/svn dirs @@ -169,7 +169,7 @@ class EasyConfigTest(TestCase): easyconfig_files = [fn for fn in filenames if fn.endswith('eb')] if easyconfig_files: # check whether path matches required pattern - if not easyconfig_dirs_regex.match(dirpath): + if not easyconfig_dirs_regex.search(dirpath): # only exception: TEMPLATE.eb if not (dirpath.endswith('/easybuild/easyconfigs') and filenames == ['TEMPLATE.eb']): self.assertTrue(False, "List of easyconfig files in %s is empty: %s" % (dirpath, filenames)) -- GitLab From a8cc4c977027bee45797602e52a8531545f49186 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 20 Mar 2014 17:29:41 +0100 Subject: [PATCH 768/811] added hwloc support to openmpi --- easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb | 10 +++++----- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb index 5b98a2e11a..ed98f4cf73 100644 --- a/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb @@ -24,11 +24,11 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://git-core.googlecode.com/files'] -dependencies = [ - ('cURL', '7.29.0'), - ('expat', '2.1.0'), - ('gettext', '0.18.2'), -] +#dependencies = [ +# ('cURL', '7.29.0'), +# ('expat', '2.1.0'), +# ('gettext', '0.18.2'), +#] sanity_check_paths = { 'files': ['bin/git'], diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb index 189fba5f29..792495946f 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb @@ -15,6 +15,9 @@ patches = ['OpenMPI-1.6.5-vt_cupti_events.patch'] configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading +configopts += '--with-hwloc=$EBROOTHWLOC ' + +dependencies = [('hwloc', '1.8.1')] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + -- GitLab From f93bb984a5eb9dc4219df94e09afecf258ab1da5 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 20 Mar 2014 17:46:58 +0100 Subject: [PATCH 769/811] updated to FFTW-3.3.4 --- ...gompi-1.6.5-no-OFED.eb => FFTW-3.3.4-gompi-1.6.5-no-OFED.eb} | 2 +- easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename easybuild/easyconfigs/f/FFTW/{FFTW-3.3.3-gompi-1.6.5-no-OFED.eb => FFTW-3.3.4-gompi-1.6.5-no-OFED.eb} (98%) diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5-no-OFED.eb similarity index 98% rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb rename to easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5-no-OFED.eb index 86c18c4f19..dea05843bc 100644 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.5-no-OFED.eb +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5-no-OFED.eb @@ -1,5 +1,5 @@ name = 'FFTW' -version = '3.3.3' +version = '3.3.4' homepage = 'http://www.fftw.org' description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb index 4bf7e91c94..dda99907c3 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb @@ -31,7 +31,7 @@ dependencies = [ ('GCC', '4.8.2'), ('OpenMPI', '1.6.5', '-no-OFED', comp), # part of gompi-1.1.0 (blaslib, blasver, blassuff, comp_mpi_tc), - ('FFTW', '3.3.3', '', comp_mpi_tc), + ('FFTW', '3.3.4', '', comp_mpi_tc), ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), ] -- GitLab From 80f34117b2f8bea4e384845c491323b8472ea3fc Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Thu, 20 Mar 2014 18:19:08 +0100 Subject: [PATCH 770/811] removed git-1.8.2-goolf-1.4.10.eb added by mistake --- .../g/git/git-1.8.2-goolf-1.4.10.eb | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb deleted file mode 100644 index ed98f4cf73..0000000000 --- a/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb +++ /dev/null @@ -1,42 +0,0 @@ -## -# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild -# -# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine -# Authors:: Fotis Georgatos -# Authors:: Dmitri Gribenko -# License:: MIT/GPL -# $Id$ -# -# This work implements a part of the HPCBIOS project and is a component of the policy: -# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html -## - -name = 'git' -version = '1.8.2' - -homepage = 'http://git-scm.com/' -description = """Git is a free and open source distributed version control system designed -to handle everything from small to very large projects with speed and efficiency.""" - -toolchain = {'name': 'goolf', 'version': '1.4.10'} - -# eg. http://git-core.googlecode.com/files/git-1.8.2.tar.gz -sources = [SOURCELOWER_TAR_GZ] -source_urls = ['http://git-core.googlecode.com/files'] - -#dependencies = [ -# ('cURL', '7.29.0'), -# ('expat', '2.1.0'), -# ('gettext', '0.18.2'), -#] - -sanity_check_paths = { - 'files': ['bin/git'], - 'dirs': [], -} - -# Work around git build system bug. If LIBS contains -lpthread, then configure -# will not append -lpthread to LDFLAGS, but Makefile ignores LIBS. -configopts = "--enable-pthreads='-lpthread'" - -moduleclass = 'tools' -- GitLab From a2237141d9a157c6a1ce2dfc2b63a6635e1d54f0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 21 Mar 2014 10:13:50 +0100 Subject: [PATCH 771/811] fix unit tests after changes in framework --- test/easyconfigs/easyconfigs.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index d617cee355..bef4a1c195 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -60,6 +60,11 @@ class EasyConfigTest(TestCase): # initialize configuration (required for e.g. default modules_tool setting) eb_go = eboptions.parse_options() config.init(eb_go.options, eb_go.get_options_by_section('config')) + build_options = { + 'valid_module_classes': config.module_classes(), + 'valid_stops': [x[0] for x in EasyBlock.get_steps()], + } + config.init_build_options(build_options=build_options) config.set_tmpdir() del eb_go @@ -79,13 +84,13 @@ class EasyConfigTest(TestCase): # parse all easyconfigs easyconfigs = [] for spec in specs: - easyconfigs.extend(process_easyconfig(spec, build_options={'validate': False})) + easyconfigs.extend(process_easyconfig(spec)) build_options = { 'robot_path': easyconfigs_path, 'force': True, } - self.ordered_specs = resolve_dependencies(easyconfigs, build_options=build_options) + self.ordered_specs = resolve_dependencies(easyconfigs) def test_dep_graph(self): """Unit test that builds a full dependency graph.""" @@ -194,7 +199,7 @@ def template_easyconfig_test(self, spec): self.assertTrue(False, "Obtained software name directly from easyconfig file") # parse easyconfig - ec = EasyConfig(spec, build_options={'validate': False}) + ec = EasyConfig(spec, validate=False) # sanity check for software name self.assertTrue(ec['name'], name) @@ -206,7 +211,7 @@ def template_easyconfig_test(self, spec): # instantiate easyblock with easyconfig file app_class = get_class(easyblock, name=name) - app = app_class(spec, build_options={'validate_ec': False}) + app = app_class(spec) # more sanity checks self.assertTrue(name, app.name) -- GitLab From eedb7060bc31602d6d2494e6fa2bf5e52d92c989 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 21 Mar 2014 10:53:15 +0100 Subject: [PATCH 772/811] fix specifying robot_path/force build options --- test/easyconfigs/easyconfigs.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index bef4a1c195..1b0e7da825 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -63,6 +63,8 @@ class EasyConfigTest(TestCase): build_options = { 'valid_module_classes': config.module_classes(), 'valid_stops': [x[0] for x in EasyBlock.get_steps()], + 'robot_path': get_paths_for("easyconfigs")[0], + 'force': True, } config.init_build_options(build_options=build_options) config.set_tmpdir() @@ -86,10 +88,6 @@ class EasyConfigTest(TestCase): for spec in specs: easyconfigs.extend(process_easyconfig(spec)) - build_options = { - 'robot_path': easyconfigs_path, - 'force': True, - } self.ordered_specs = resolve_dependencies(easyconfigs) def test_dep_graph(self): -- GitLab From a584e0ac66f3c81d6cd9a612895cf56c725ff93f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 21 Mar 2014 11:08:38 +0100 Subject: [PATCH 773/811] correct imports, avoid that all easyconfigs are being parsed twice --- test/easyconfigs/easyconfigs.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 1b0e7da825..24cab7ba53 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -43,8 +43,7 @@ import easybuild.main as main import easybuild.tools.options as eboptions from easybuild.framework.easyblock import EasyBlock, get_class from easybuild.framework.easyconfig.easyconfig import EasyConfig -from easybuild.framework.easyconfig.tools import get_paths_for -from easybuild.main import dep_graph, resolve_dependencies, process_easyconfig +from easybuild.framework.easyconfig.tools import dep_graph, get_paths_for, process_easyconfig, resolve_dependencies from easybuild.tools import config from easybuild.tools.module_generator import det_full_module_name @@ -76,6 +75,7 @@ class EasyConfigTest(TestCase): # make sure a logger is present for main main._log = log ordered_specs = None + parsed_easyconfigs = [] def process_all_easyconfigs(self): """Process all easyconfigs and resolve inter-easyconfig dependencies.""" @@ -83,12 +83,12 @@ class EasyConfigTest(TestCase): easyconfigs_path = get_paths_for("easyconfigs")[0] specs = glob.glob('%s/*/*/*.eb' % easyconfigs_path) - # parse all easyconfigs - easyconfigs = [] - for spec in specs: - easyconfigs.extend(process_easyconfig(spec)) + # parse all easyconfigs if they haven't been already + if not self.parsed_easyconfigs: + for spec in specs: + self.parsed_easyconfigs.extend(process_easyconfig(spec)) - self.ordered_specs = resolve_dependencies(easyconfigs) + self.ordered_specs = resolve_dependencies(self.parsed_easyconfigs) def test_dep_graph(self): """Unit test that builds a full dependency graph.""" @@ -197,7 +197,11 @@ def template_easyconfig_test(self, spec): self.assertTrue(False, "Obtained software name directly from easyconfig file") # parse easyconfig - ec = EasyConfig(spec, validate=False) + ecs = process_easyconfig(spec) + if len(ecs) == 1: + ec = ecs[0]['ec'] + else: + self.assertTrue(False, "easyconfig %s does not contain blocks, yields only one parsed easyconfig" % spec) # sanity check for software name self.assertTrue(ec['name'], name) @@ -242,6 +246,9 @@ def template_easyconfig_test(self, spec): app.close_log() os.remove(app.logfile) + # cache the parsed easyconfig, to avoid that it is parsed again + self.parsed_easyconfigs.append(ecs[0]) + # test passed, so set back to True single_tests_ok = True and prev_single_tests_ok -- GitLab From 4e7a9ae2136621000aa9b8f811dd9962c888ea57 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 21 Mar 2014 13:11:24 +0100 Subject: [PATCH 774/811] disable checking of OS deps --- test/easyconfigs/easyconfigs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 24cab7ba53..15f64e4aca 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -60,10 +60,11 @@ class EasyConfigTest(TestCase): eb_go = eboptions.parse_options() config.init(eb_go.options, eb_go.get_options_by_section('config')) build_options = { + 'check_osdeps': False, + 'force': True, + 'robot_path': get_paths_for("easyconfigs")[0], 'valid_module_classes': config.module_classes(), 'valid_stops': [x[0] for x in EasyBlock.get_steps()], - 'robot_path': get_paths_for("easyconfigs")[0], - 'force': True, } config.init_build_options(build_options=build_options) config.set_tmpdir() -- GitLab From 8fe5e38fcb79fa9c56213f478fe06f15996f3941 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 22 Mar 2014 20:28:49 +0100 Subject: [PATCH 775/811] change version of goolf v1.6.5 to goolf v1.5.14, to align with existing gompi 1.5.12 easyconfig --- .../{FFTW-3.3.4-gompi-1.6.5.eb => FFTW-3.3.4-gompi-1.5.14.eb} | 2 +- .../easyconfigs/g/gompi/{gompi-1.6.5.eb => gompi-1.5.14.eb} | 2 +- .../easyconfigs/g/goolf/{goolf-1.6.5.eb => goolf-1.5.14.eb} | 4 ++-- .../{gzip-1.6-goolf-1.6.5.eb => gzip-1.6-goolf-1.5.14.eb} | 2 +- ...K-3.5.0.eb => OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb} | 2 +- ...aLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb} | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename easybuild/easyconfigs/f/FFTW/{FFTW-3.3.4-gompi-1.6.5.eb => FFTW-3.3.4-gompi-1.5.14.eb} (95%) rename easybuild/easyconfigs/g/gompi/{gompi-1.6.5.eb => gompi-1.5.14.eb} (95%) rename easybuild/easyconfigs/g/goolf/{goolf-1.6.5.eb => goolf-1.5.14.eb} (92%) rename easybuild/easyconfigs/g/gzip/{gzip-1.6-goolf-1.6.5.eb => gzip-1.6-goolf-1.5.14.eb} (95%) rename easybuild/easyconfigs/o/OpenBLAS/{OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb => OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb} (96%) rename easybuild/easyconfigs/s/ScaLAPACK/{ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb => ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb} (92%) diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb similarity index 95% rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb rename to easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb index 998fa89264..1cf9159796 100644 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5.eb +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb @@ -5,7 +5,7 @@ homepage = 'http://www.fftw.org' description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data.""" -toolchain = {'name': 'gompi', 'version': '1.6.5'} +toolchain = {'name': 'gompi', 'version': '1.5.14'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb b/easybuild/easyconfigs/g/gompi/gompi-1.5.14.eb similarity index 95% rename from easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb rename to easybuild/easyconfigs/g/gompi/gompi-1.5.14.eb index bbd1e9fa7d..c42da3fda1 100644 --- a/easybuild/easyconfigs/g/gompi/gompi-1.6.5.eb +++ b/easybuild/easyconfigs/g/gompi/gompi-1.5.14.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'gompi' -version = '1.6.5' +version = '1.5.14' homepage = '(none)' description = """GNU Compiler Collection (GCC) based compiler toolchain, diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb b/easybuild/easyconfigs/g/goolf/goolf-1.5.14.eb similarity index 92% rename from easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb rename to easybuild/easyconfigs/g/goolf/goolf-1.5.14.eb index 2dcbbded37..89526c2d6c 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.5.14.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'goolf' -version = '1.6.5' +version = '1.5.14' homepage = '(none)' description = """GNU Compiler Collection (GCC) based compiler toolchain, including @@ -28,7 +28,7 @@ comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) # because of toolchain preperation functions dependencies = [ ('GCC', '4.8.2'), - ('OpenMPI', '1.6.5', '', comp), # part of gompi-1.1.0 + ('OpenMPI', '1.6.5', '', comp), # part of gompi (blaslib, blasver, blassuff, comp_mpi_tc), ('FFTW', '3.3.4', '', comp_mpi_tc), ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14.eb similarity index 95% rename from easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb rename to easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14.eb index dd296a9acd..e3c2131d4d 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14.eb @@ -16,7 +16,7 @@ version = '1.6' homepage = 'http://www.gnu.org/software/gzip/' description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" -toolchain = {'name': 'goolf', 'version': '1.6.5'} +toolchain = {'name': 'goolf', 'version': '1.5.14'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz source_urls = [GNU_SOURCE] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb similarity index 96% rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb rename to easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb index 2ac7e82d71..bdd5c179ef 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-LAPACK-3.5.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb @@ -7,7 +7,7 @@ versionsuffix = '-LAPACK-%s' % lapackver homepage = 'http://xianyi.github.com/OpenBLAS/' description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" -toolchain = {'name': 'gompi', 'version': '1.6.5'} +toolchain = {'name': 'gompi', 'version': '1.5.14'} lapack_src = 'lapack-%s.tgz' % lapackver large_src = 'large.tgz' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb similarity index 92% rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb rename to easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb index 4d6a349030..2a0a7e12ce 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-OpenBLAS-0.2.8-LAPACK-3.5.0.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb @@ -5,7 +5,7 @@ homepage = 'http://www.netlib.org/scalapack/' description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines redesigned for distributed memory MIMD parallel computers.""" -toolchain = {'name': 'gompi', 'version': '1.6.5'} +toolchain = {'name': 'gompi', 'version': '1.5.14'} toolchainopts = {'pic': True} source_urls = [homepage] -- GitLab From 79d80acf0b661347c53328b744367d2fa61c06ae Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 22 Mar 2014 20:35:15 +0100 Subject: [PATCH 776/811] change version of goolf v1.6.5-no-OFED to goolf v1.5.14-no-OFED, to align with existing gompi 1.5.12 easyconfig --- ...ompi-1.6.5-no-OFED.eb => FFTW-3.3.4-gompi-1.5.14-no-OFED.eb} | 2 +- .../g/gompi/{gompi-1.6.5-no-OFED.eb => gompi-1.5.14-no-OFED.eb} | 2 +- .../g/goolf/{goolf-1.6.5-no-OFED.eb => goolf-1.5.14-no-OFED.eb} | 2 +- ...-goolf-1.6.5-no-OFED.eb => gzip-1.6-goolf-1.5.14-no-OFED.eb} | 2 +- ...0.eb => OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb} | 2 +- ...K-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename easybuild/easyconfigs/f/FFTW/{FFTW-3.3.4-gompi-1.6.5-no-OFED.eb => FFTW-3.3.4-gompi-1.5.14-no-OFED.eb} (95%) rename easybuild/easyconfigs/g/gompi/{gompi-1.6.5-no-OFED.eb => gompi-1.5.14-no-OFED.eb} (96%) rename easybuild/easyconfigs/g/goolf/{goolf-1.6.5-no-OFED.eb => goolf-1.5.14-no-OFED.eb} (98%) rename easybuild/easyconfigs/g/gzip/{gzip-1.6-goolf-1.6.5-no-OFED.eb => gzip-1.6-goolf-1.5.14-no-OFED.eb} (94%) rename easybuild/easyconfigs/o/OpenBLAS/{OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb => OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb} (95%) rename easybuild/easyconfigs/s/ScaLAPACK/{ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb => ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb} (90%) diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb similarity index 95% rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5-no-OFED.eb rename to easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb index dea05843bc..6c4efd7f74 100644 --- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.6.5-no-OFED.eb +++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb @@ -5,7 +5,7 @@ homepage = 'http://www.fftw.org' description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data.""" -toolchain = {'name': 'gompi', 'version': '1.6.5-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.5.14-no-OFED'} toolchainopts = {'optarch': True, 'pic': True} sources = [SOURCELOWER_TAR_GZ] diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb similarity index 96% rename from easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb rename to easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb index 3595845212..62bfbf3784 100644 --- a/easybuild/easyconfigs/g/gompi/gompi-1.6.5-no-OFED.eb +++ b/easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'gompi' -version = '1.6.5' +version = '1.5.14' versionsuffix = '-no-OFED' homepage = '(none)' diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb similarity index 98% rename from easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb rename to easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb index dda99907c3..e040a35e43 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.5-no-OFED.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb @@ -1,7 +1,7 @@ easyblock = "Toolchain" name = 'goolf' -version = '1.6.5' +version = '1.5.14' versionsuffix = '-no-OFED' homepage = '(none)' diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb similarity index 94% rename from easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb rename to easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb index 8c43c42f94..81dfe171a8 100644 --- a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.5-no-OFED.eb +++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb @@ -16,7 +16,7 @@ version = '1.6' homepage = 'http://www.gnu.org/software/gzip/' description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" -toolchain = {'name': 'goolf', 'version': '1.6.5-no-OFED'} +toolchain = {'name': 'goolf', 'version': '1.5.14-no-OFED'} # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz source_urls = [GNU_SOURCE] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb similarity index 95% rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb rename to easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb index c446511bf9..2b422ff45f 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.5-no-OFED-LAPACK-3.5.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb @@ -7,7 +7,7 @@ versionsuffix = '-LAPACK-%s' % lapackver homepage = 'http://xianyi.github.com/OpenBLAS/' description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.""" -toolchain = {'name': 'gompi', 'version': '1.6.5-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.5.14-no-OFED'} lapack_src = 'lapack-%s.tgz' % lapackver large_src = 'large.tgz' diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb similarity index 90% rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb rename to easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb index a24ac08f75..b55976ccac 100644 --- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.5-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb +++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb @@ -5,7 +5,7 @@ homepage = 'http://www.netlib.org/scalapack/' description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines redesigned for distributed memory MIMD parallel computers.""" -toolchain = {'name': 'gompi', 'version': '1.6.5-no-OFED'} +toolchain = {'name': 'gompi', 'version': '1.5.14-no-OFED'} toolchainopts = {'pic': True} source_urls = [homepage] -- GitLab From 9a6e7d8bf1beda2b521380f398e37093cd90e0de Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Sun, 23 Mar 2014 13:00:24 +0100 Subject: [PATCH 777/811] fix in comments --- easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb b/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb index 2dcbbded37..6a57b900eb 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.6.5.eb @@ -28,7 +28,7 @@ comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) # because of toolchain preperation functions dependencies = [ ('GCC', '4.8.2'), - ('OpenMPI', '1.6.5', '', comp), # part of gompi-1.1.0 + ('OpenMPI', '1.6.5', '', comp), # part of gompi (blaslib, blasver, blassuff, comp_mpi_tc), ('FFTW', '3.3.4', '', comp_mpi_tc), ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), -- GitLab From 0026070443ccc7be9e38c8117bf294900805edaa Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Sun, 23 Mar 2014 13:33:09 +0100 Subject: [PATCH 778/811] fixed comments --- easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb index e040a35e43..878a9f4474 100644 --- a/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb +++ b/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb @@ -29,7 +29,7 @@ comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver) # because of toolchain preperation functions dependencies = [ ('GCC', '4.8.2'), - ('OpenMPI', '1.6.5', '-no-OFED', comp), # part of gompi-1.1.0 + ('OpenMPI', '1.6.5', '-no-OFED', comp), # part of gompi (blaslib, blasver, blassuff, comp_mpi_tc), ('FFTW', '3.3.4', '', comp_mpi_tc), ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc), -- GitLab From f6d3357893a5181cc0e2d04078f679f3173e86c4 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Lopez Date: Sun, 23 Mar 2014 13:35:24 +0100 Subject: [PATCH 779/811] re-added git-1.8.2-goolf-1.4.10.eb --- .../g/git/git-1.8.2-goolf-1.4.10.eb | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb new file mode 100644 index 0000000000..5b98a2e11a --- /dev/null +++ b/easybuild/easyconfigs/g/git/git-1.8.2-goolf-1.4.10.eb @@ -0,0 +1,42 @@ +## +# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild +# +# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine +# Authors:: Fotis Georgatos +# Authors:: Dmitri Gribenko +# License:: MIT/GPL +# $Id$ +# +# This work implements a part of the HPCBIOS project and is a component of the policy: +# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html +## + +name = 'git' +version = '1.8.2' + +homepage = 'http://git-scm.com/' +description = """Git is a free and open source distributed version control system designed +to handle everything from small to very large projects with speed and efficiency.""" + +toolchain = {'name': 'goolf', 'version': '1.4.10'} + +# eg. http://git-core.googlecode.com/files/git-1.8.2.tar.gz +sources = [SOURCELOWER_TAR_GZ] +source_urls = ['http://git-core.googlecode.com/files'] + +dependencies = [ + ('cURL', '7.29.0'), + ('expat', '2.1.0'), + ('gettext', '0.18.2'), +] + +sanity_check_paths = { + 'files': ['bin/git'], + 'dirs': [], +} + +# Work around git build system bug. If LIBS contains -lpthread, then configure +# will not append -lpthread to LDFLAGS, but Makefile ignores LIBS. +configopts = "--enable-pthreads='-lpthread'" + +moduleclass = 'tools' -- GitLab From 1ae915bcfc8a83515eb713f2c5419d0b87dcb7fd Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 24 Mar 2014 15:47:46 +0100 Subject: [PATCH 780/811] fix unit tests after changes in framework --- test/easyconfigs/easyconfigs.py | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 15f64e4aca..8ac48f3bce 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -41,8 +41,9 @@ from unittest import TestCase, TestLoader, main import easybuild.main as main import easybuild.tools.options as eboptions -from easybuild.framework.easyblock import EasyBlock, get_class -from easybuild.framework.easyconfig.easyconfig import EasyConfig +from easybuild.framework.easyblock import EasyBlock +from easybuild.framework.easyconfig.easyconfig import EasyConfig, fetch_parameter_from_easyconfig_file +from easybuild.framework.easyconfig.easyconfig import get_easyblock_class from easybuild.framework.easyconfig.tools import dep_graph, get_paths_for, process_easyconfig, resolve_dependencies from easybuild.tools import config from easybuild.tools.module_generator import det_full_module_name @@ -71,8 +72,6 @@ class EasyConfigTest(TestCase): del eb_go log = fancylogger.getLogger("EasyConfigTest", fname=False) - name_regex = re.compile("^name\s*=\s*['\"](.*)['\"]$", re.M) - easyblock_regex = re.compile(r"^\s*easyblock\s*=['\"](.*)['\"]$", re.M) # make sure a logger is present for main main._log = log ordered_specs = None @@ -86,6 +85,7 @@ class EasyConfigTest(TestCase): # parse all easyconfigs if they haven't been already if not self.parsed_easyconfigs: + print "parsing ALL easyconfigs..." for spec in specs: self.parsed_easyconfigs.extend(process_easyconfig(spec)) @@ -186,17 +186,6 @@ def template_easyconfig_test(self, spec): prev_single_tests_ok = single_tests_ok single_tests_ok = False - f = open(spec, 'r') - spectxt = f.read() - f.close() - - # determine software name directly from easyconfig file - res = self.name_regex.search(spectxt) - if res: - name = res.group(1) - else: - self.assertTrue(False, "Obtained software name directly from easyconfig file") - # parse easyconfig ecs = process_easyconfig(spec) if len(ecs) == 1: @@ -205,16 +194,15 @@ def template_easyconfig_test(self, spec): self.assertTrue(False, "easyconfig %s does not contain blocks, yields only one parsed easyconfig" % spec) # sanity check for software name + name = fetch_parameter_from_easyconfig_file(spec, 'name') self.assertTrue(ec['name'], name) # try and fetch easyblock spec from easyconfig - easyblock = self.easyblock_regex.search(spectxt) - if easyblock: - easyblock = easyblock.group(1) + easyblock = fetch_parameter_from_easyconfig_file(spec, 'easyblock') # instantiate easyblock with easyconfig file - app_class = get_class(easyblock, name=name) - app = app_class(spec) + app_class = get_easyblock_class(easyblock, name=name) + app = app_class(ec) # more sanity checks self.assertTrue(name, app.name) -- GitLab From 925e3576ed836d517abed79832724f23d0582386 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 24 Mar 2014 18:54:47 +0100 Subject: [PATCH 781/811] clean up print --- test/easyconfigs/easyconfigs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 8ac48f3bce..6490a96fde 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -85,7 +85,6 @@ class EasyConfigTest(TestCase): # parse all easyconfigs if they haven't been already if not self.parsed_easyconfigs: - print "parsing ALL easyconfigs..." for spec in specs: self.parsed_easyconfigs.extend(process_easyconfig(spec)) -- GitLab From f747e38682a3dc6017545129d08ac429527674cd Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 25 Mar 2014 09:00:37 +0100 Subject: [PATCH 782/811] massively speed up unit tests by disabling all logging --- test/easyconfigs/suite.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/test/easyconfigs/suite.py b/test/easyconfigs/suite.py index dbb1a006c9..6161221000 100644 --- a/test/easyconfigs/suite.py +++ b/test/easyconfigs/suite.py @@ -38,14 +38,12 @@ import tempfile import unittest from vsc import fancylogger +import easybuild.tools.build_log # initialize EasyBuild logging, so we disable it import test.easyconfigs.easyconfigs as e -# initialize logger for all the unit tests -fd, log_fn = tempfile.mkstemp(prefix='easybuild-easyconfigs-tests-', suffix='.log') -os.close(fd) -os.remove(log_fn) -fancylogger.logToFile(log_fn) -fancylogger.setLogLevelDebug() +# disable all logging to significantly speed up tests +fancylogger.disableDefaultHandlers() +fancylogger.setLogLevel('APOCALYPTIC') os.environ['EASYBUILD_TMP_LOGDIR'] = tempfile.mkdtemp(prefix='easyconfigs_test_') @@ -63,13 +61,9 @@ except ImportError, err: sys.stderr.write("WARNING: xmlrunner module not available, falling back to using unittest...\n\n") res = unittest.TextTestRunner().run(SUITE) -fancylogger.logToFile(log_fn, enable=False) shutil.rmtree(os.environ['EASYBUILD_TMP_LOGDIR']) del os.environ['EASYBUILD_TMP_LOGDIR'] -for f in glob.glob('%s*' % log_fn): - os.remove(f) - if not res.wasSuccessful(): sys.stderr.write("ERROR: Not all tests were successful.\n") sys.exit(2) -- GitLab From 83b844a107950040de6225ef1b52ab8f8ccdad1a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 25 Mar 2014 10:02:51 +0100 Subject: [PATCH 783/811] set log level on error, not apocalyptic --- test/easyconfigs/suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/easyconfigs/suite.py b/test/easyconfigs/suite.py index 6161221000..f936405be6 100644 --- a/test/easyconfigs/suite.py +++ b/test/easyconfigs/suite.py @@ -43,7 +43,7 @@ import test.easyconfigs.easyconfigs as e # disable all logging to significantly speed up tests fancylogger.disableDefaultHandlers() -fancylogger.setLogLevel('APOCALYPTIC') +fancylogger.setLogLevelError() os.environ['EASYBUILD_TMP_LOGDIR'] = tempfile.mkdtemp(prefix='easyconfigs_test_') -- GitLab From bb2b316ac7227eed1bf8bde152e96796dfab1e90 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 26 Mar 2014 22:40:11 +0100 Subject: [PATCH 784/811] tweak BOINC easyconfig, use glob support available for files_to_copy --- .../easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb b/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb index cd332e88ad..ffdbd66265 100644 --- a/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb +++ b/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb @@ -23,11 +23,12 @@ with_configure = True preconfigopts = './_autosetup &&' configopts = '--disable-server --disable-manager --enable-client' -files_to_copy = [(['client/boinc','client/boinccmd'], 'bin')] +# copy boinc and boinccmd binaries +files_to_copy = [(['client/boin*[cd]'], 'bin')] # make sure the binary are available after installation sanity_check_paths = { - 'files': ["bin/boinc",], + 'files': ["bin/boinc", "bin/boinccmd"], 'dirs': [], } -- GitLab From 7f44e15d59104926ea96473e095ebbd9bc7dbd1f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Mar 2014 16:04:18 +0100 Subject: [PATCH 785/811] add easyconfig file for GCC multilib build --- .../easyconfigs/g/GCC/GCC-4.8.2-multilib.eb | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb new file mode 100644 index 0000000000..509d5e27ca --- /dev/null +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb @@ -0,0 +1,31 @@ +name = "GCC" +version = '4.8.2' +versionsuffix = '-multilib' + +homepage = 'http://gcc.gnu.org/' +description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...).""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s', # GCC auto-resolving HTTP mirror + 'http://ftpmirror.gnu.org/gmp', # idem for GMP + 'http://ftpmirror.gnu.org/mpfr', # idem for MPFR + 'http://www.multiprecision.org/mpc/download', # MPC official +] +sources = [ + SOURCELOWER_TAR_GZ, + 'gmp-5.1.3.tar.bz2', + 'mpfr-3.1.2.tar.gz', + 'mpc-1.0.1.tar.gz', +] + +languages = ['c', 'c++', 'fortran', 'lto'] + +multilib = True + +# building GCC sometimes fails if make parallelism is too high, so let's limit it +maxparallel = 4 + +moduleclass = 'compiler' -- GitLab From d4aa4bce578662daaa026ea74973ff0a85c9b4a6 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Mar 2014 16:11:07 +0100 Subject: [PATCH 786/811] add easyconfig file for LIBSVM --- .../l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb diff --git a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb new file mode 100644 index 0000000000..ced7e71f8c --- /dev/null +++ b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb @@ -0,0 +1,27 @@ +easyblock = 'MakeCp' + +name = 'LIBSVM' +version = '3.17' + +homepage = 'http://www.csie.ntu.edu.tw/~cjlin/libsvm/' +description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" + +toolchain = {'name': 'ictce', 'version': '4.1.13'} + +source_urls = [homepage] +sources = [SOURCELOWER_TAR_GZ] + +dependencies = [('Qt', '4.8.4')] + +makeopts = ' && cd svm-toy/qt && make MOC=$EBROOTQT/bin/moc ' +makeopts += 'CFLAGS="$CFLAGS -I$EBROOTQT/include -I$EBROOTQT/include/QtGui -lQtGui -lQtCore" && cd -' + +files_to_copy = [(['svm-*'], 'bin'), 'tools'] + +# make sure the gzip, gunzip and compress binaries are available after installation +sanity_check_paths = { + 'files': ['bin/svm-%s' % x for x in ['predict', 'scale', 'toy', 'train']], + 'dirs': ['tools'], +} + +moduleclass = 'lib' -- GitLab From 7b01b528a41689d9ab5d7f245289e25a8e1a7480 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Mar 2014 16:12:14 +0100 Subject: [PATCH 787/811] remove comment --- easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb index ced7e71f8c..c033ab0207 100644 --- a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb @@ -18,7 +18,6 @@ makeopts += 'CFLAGS="$CFLAGS -I$EBROOTQT/include -I$EBROOTQT/include/QtGui -lQtG files_to_copy = [(['svm-*'], 'bin'), 'tools'] -# make sure the gzip, gunzip and compress binaries are available after installation sanity_check_paths = { 'files': ['bin/svm-%s' % x for x in ['predict', 'scale', 'toy', 'train']], 'dirs': ['tools'], -- GitLab From 7e1a623683d46e441577925e8acebdf8a37ece18 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Mar 2014 17:04:33 +0100 Subject: [PATCH 788/811] add GCC v4.8.2 CLooG easyconfigs, both with and without multilib --- .../g/GCC/GCC-4.8.2-CLooG-multilib.eb | 39 +++++++++++++++++++ .../easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb | 37 ++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb create mode 100644 easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb new file mode 100644 index 0000000000..2d3d0d9732 --- /dev/null +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb @@ -0,0 +1,39 @@ +name = "GCC" +version = '4.8.2' +versionsuffix = "-CLooG-multilib" + +homepage = 'http://gcc.gnu.org/' +description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...).""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s', # GCC auto-resolving HTTP mirror + 'http://ftpmirror.gnu.org/gmp', # idem for GMP + 'http://ftpmirror.gnu.org/mpfr', # idem for MPFR + 'http://www.multiprecision.org/mpc/download', # MPC official + 'http://www.bastoul.net/cloog/pages/download/', # CLooG official + 'ftp://gcc.gnu.org/pub/gcc/infrastructure/', # GCC dependencies + 'http://gcc.cybermirror.org/infrastructure/', # HTTP mirror for GCC dependencies +] +sources = [ + SOURCELOWER_TAR_GZ, + 'gmp-5.1.3.tar.bz2', + 'mpfr-3.1.2.tar.gz', + 'mpc-1.0.1.tar.gz', + 'cloog-0.18.2.tar.gz', +] + +languages = ['c', 'c++', 'fortran', 'lto'] + +withcloog = True + +clooguseisl = True + +multilib = True + +# building GCC sometimes fails if make parallelism is too high, so let's limit it +maxparallel = 4 + +moduleclass = 'compiler' diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb new file mode 100644 index 0000000000..b56bf2cda9 --- /dev/null +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb @@ -0,0 +1,37 @@ +name = "GCC" +version = '4.8.2' +versionsuffix = "-CLooG" + +homepage = 'http://gcc.gnu.org/' +description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...).""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = [ + 'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s', # GCC auto-resolving HTTP mirror + 'http://ftpmirror.gnu.org/gmp', # idem for GMP + 'http://ftpmirror.gnu.org/mpfr', # idem for MPFR + 'http://www.multiprecision.org/mpc/download', # MPC official + 'http://www.bastoul.net/cloog/pages/download/', # CLooG official + 'ftp://gcc.gnu.org/pub/gcc/infrastructure/', # GCC dependencies + 'http://gcc.cybermirror.org/infrastructure/', # HTTP mirror for GCC dependencies +] +sources = [ + SOURCELOWER_TAR_GZ, + 'gmp-5.1.3.tar.bz2', + 'mpfr-3.1.2.tar.gz', + 'mpc-1.0.1.tar.gz', + 'cloog-0.18.2.tar.gz', +] + +languages = ['c', 'c++', 'fortran', 'lto'] + +withcloog = True + +clooguseisl = True + +# building GCC sometimes fails if make parallelism is too high, so let's limit it +maxparallel = 4 + +moduleclass = 'compiler' -- GitLab From 989d2ee570d9521548ef39e8dd96449ebd2bfad0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Mar 2014 17:24:22 +0100 Subject: [PATCH 789/811] use CLooG v0.18.1 with GCC v4.8.2 --- easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb | 2 +- easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb index 2d3d0d9732..546001ab6b 100644 --- a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb @@ -22,7 +22,7 @@ sources = [ 'gmp-5.1.3.tar.bz2', 'mpfr-3.1.2.tar.gz', 'mpc-1.0.1.tar.gz', - 'cloog-0.18.2.tar.gz', + 'cloog-0.18.1.tar.gz', ] languages = ['c', 'c++', 'fortran', 'lto'] diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb index b56bf2cda9..f3c7e6b745 100644 --- a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb +++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb @@ -22,7 +22,7 @@ sources = [ 'gmp-5.1.3.tar.bz2', 'mpfr-3.1.2.tar.gz', 'mpc-1.0.1.tar.gz', - 'cloog-0.18.2.tar.gz', + 'cloog-0.18.1.tar.gz', ] languages = ['c', 'c++', 'fortran', 'lto'] -- GitLab From f15aa551d21e477af6625f8405fc8b610c2746da Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 28 Mar 2014 22:22:23 +0100 Subject: [PATCH 790/811] fix description --- easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb index c033ab0207..515dc5d0ab 100644 --- a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb @@ -4,7 +4,8 @@ name = 'LIBSVM' version = '3.17' homepage = 'http://www.csie.ntu.edu.tw/~cjlin/libsvm/' -description = "gzip (GNU zip) is a popular data compression program as a replacement for compress" +description = """LIBSVM is an integrated software for support vector classification, (C-SVC, nu-SVC), regression + (epsilon-SVR, nu-SVR) and distribution estimation (one-class SVM). It supports multi-class classification.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} -- GitLab From 98536323a2800b07afd8e06be1d7b2c7f0b787a0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 2 Apr 2014 16:27:57 +0200 Subject: [PATCH 791/811] enable -fPIC for libreadline, so it can be linked into shared libs (e.g. libpython2.x.so) --- .../libreadline-6.2-cgmpolf-1.1.6.eb | 1 + .../libreadline-6.2-cgmvolf-1.1.12rc1.eb | 1 + .../libreadline-6.2-cgmvolf-1.2.7.eb | 1 + .../libreadline/libreadline-6.2-cgoolf-1.1.7.eb | 1 + .../libreadline/libreadline-6.2-gmpolf-1.4.8.eb | 1 + .../libreadline-6.2-gmvolf-1.7.12.eb | 1 + .../libreadline-6.2-gmvolf-1.7.12rc1.eb | 1 + .../libreadline-6.2-goalf-1.1.0-no-OFED.eb | 1 + .../libreadline-6.2-goalf-1.5.12-no-OFED.eb | 1 + .../libreadline-6.2-gompi-1.4.12-no-OFED.eb | 1 + .../libreadline/libreadline-6.2-goolf-1.4.10.eb | 1 + .../libreadline/libreadline-6.2-ictce-4.0.10.eb | 1 + .../libreadline/libreadline-6.2-ictce-4.0.6.eb | 1 + .../libreadline/libreadline-6.2-ictce-4.1.13.eb | 1 + .../libreadline/libreadline-6.2-ictce-5.2.0.eb | 17 ++++++++++------- .../libreadline/libreadline-6.2-ictce-5.3.0.eb | 1 + .../libreadline/libreadline-6.2-ictce-5.5.0.eb | 1 + .../libreadline/libreadline-6.2-iomkl-4.6.13.eb | 1 + .../libreadline/libreadline-6.2-iqacml-3.7.3.eb | 1 + .../libreadline-6.2-iqacml-4.4.13.eb | 1 + 20 files changed, 29 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb index b104105924..ea86f44110 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgmpolf', 'version': '1.1.6'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb index 08386dbd84..845fa3e7fa 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb index 5bc7206321..49c0baecf1 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb @@ -8,6 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgmvolf', 'version': '1.2.7'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb index ce9ce7a0dc..07ea263092 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'cgoolf', 'version': '1.1.7'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb index 4b179d3cea..aaa76f5f77 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gmpolf', 'version': '1.4.8'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb index 4a3a76f70d..fcb196f792 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb @@ -8,6 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gmvolf', 'version': '1.7.12'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb index 04dfce7349..e0e2d5c7fa 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb index adb8107354..066765bca3 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb index 6829e60dce..146a8e9944 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb index 9a72756a88..db9397866d 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb index 91a1a3db51..e835cd63d6 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'goolf', 'version': '1.4.10'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb index ebff1e197f..7a1a0c8b8b 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'ictce', 'version': '4.0.10'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb index ec7c6dfb60..7cbbcd5ae7 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'ictce', 'version': '4.0.6'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb index 3edea96b6d..af015cd665 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'ictce', 'version': '4.1.13'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb index e77b116c77..169a857dc2 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb @@ -8,15 +8,18 @@ The Readline library includes additional functions to maintain a list of previou to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'ictce', 'version' : '5.2.0'} +toolchainopts = {'pic': True} -sources = ['readline-%s.tar.gz' % version] +sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] +dependencies = [('ncurses', '5.9')] + sanity_check_paths = { - 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', - 'keymaps.h', 'readline.h', - 'rlconf.h', 'rlstdc.h', - 'rltypedefs.h', 'tilde.h']], - 'dirs' : [] - } + 'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h', + 'rlstdc.h', 'rltypedefs.h', 'tilde.h']], + 'dirs' : [], +} +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb index 96c57993e7..af7f561821 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'ictce', 'version': '5.3.0'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb index 309a843372..1c9a199f1b 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'ictce', 'version': '5.5.0'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb index 7ca5bdbcd1..ac364c1247 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'iomkl', 'version': '4.6.13'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb index f197ec170b..446d0f52d7 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'iqacml', 'version': '3.7.3'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb index e8897e4b13..4833ff1469 100644 --- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb +++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb @@ -8,6 +8,7 @@ description = """The GNU Readline library provides a set of functions for use by to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands.""" toolchain = {'name': 'iqacml', 'version': '4.4.13'} +toolchainopts = {'pic': True} sources = ['readline-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/readline'] -- GitLab From 97543c68d25b0bbf1c8adada9b05a0dbee08c9e3 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Apr 2014 09:59:17 +0200 Subject: [PATCH 792/811] enable -fPIC in ncurses 5.9 ictce/5.2.0 easyconfig, just like in the others --- easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb index fb1f4e9935..ee127c7a3c 100644 --- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb +++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb @@ -7,6 +7,7 @@ and more. It uses Terminfo format, supports pads and color and multiple highligh function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.""" toolchain = {'name': 'ictce', 'version': '5.2.0'} +toolchainopts = {'optarch': True, 'pic': True} source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] -- GitLab From 7a02b8df0f9b3dae0f1acac41bd53622e9aba74a Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 3 Apr 2014 22:40:38 +0200 Subject: [PATCH 793/811] bump version to v1.12.0.0, update release notes --- RELEASE_NOTES | 25 +++++++++++++++++++++---- setup.py | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 48872f366f..ab1bbd745c 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,15 +1,32 @@ This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package. For more detailed information, please see the git log. -The latest version of easybuild-easyconfig provides 2,319 easyconfig files, for 444 different software packages -and 29 different (compiler) toolchains. +The latest version of easybuild-easyconfig provides 2,372 easyconfig files, for 451 different software packages +and 28 different (compiler) toolchains. -v1.11.1 (February 28th 2013) +v1.12.0 (April 4th 2014) +------------------------ + +feature + bugfix release +- added example easyconfig files for 6 new software packages: + CLooG (#653), ELPA (#738), LIBSVM (#788), netaddr (#753), netifcas (#753), slalib-c (#750) +- added easyconfigs for new toolchains: + ClangGCC/1.3.0 (#653), goolf/1.4.10-no-OFED (#749), goolf/1.5.14(-no-OFED) (#764, #767), ictce/6.2.5 (#726), iomkl (#747) +- added additional easyconfigs for various supported software packages: version updates, different toolchains, ... +- various enhancements, including: + - tweak BOINC easyconfig to make use of glob support available for files_to_copy (#781) + - enable -fPIC for libreadline, so it can be linked into shared libs (e.g. libpython2.x.so) (#798) +- various bug fixes, including: + - fix Qt source_urls (#756) + - enable -fPIC in ncurses 5.9 ictce/5.2.0 easyconfig, just like in the others (#801) + - fix unit tests after changes to framework (#763, #766, #769) + +v1.11.1 (February 28th 2014) ---------------------------- (no changes compared to v1.11.0, simple version bump to stay in sync with easybuild-framework -v1.11.0 (February 16th 2013) +v1.11.0 (February 16th 2014) ---------------------------- feature + bugfix release diff --git a/setup.py b/setup.py index d090434633..3a1621d82a 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.12.0.0dev" +VERSION = "1.12.0.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 81b43d379bcdd637dca3b476415dcec77df38be4 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Apr 2014 09:53:14 +0200 Subject: [PATCH 794/811] bump version to v1.13.0.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3a1621d82a..8c07948b75 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.12.0.0" +VERSION = "1.13.0.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From 0a17eb68bb25cd885e0ae640f4f76eceded51213 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 4 Apr 2014 09:54:29 +0200 Subject: [PATCH 795/811] bump version to v1.12.1.0dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3a1621d82a..1216c5c322 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.12.0.0" +VERSION = "1.12.1.0dev" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab From da53b48be86cc37d63d6a3c97f3f3aa26bb994a5 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 14 Apr 2014 00:37:58 +0200 Subject: [PATCH 796/811] add 5.3 & 5.4 versions of Lmod Signed-off-by: Fotis Georgatos --- .../easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb | 24 +++++++++++++++++++ .../easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb new file mode 100644 index 0000000000..8a7e354fe8 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb @@ -0,0 +1,24 @@ +name = "Lmod" +version = "5.3" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] + +dependencies = [("Lua", "5.1.4-8")] + +configopts = ' --with-mpathSearch=yes ' # for backward compatibility + +sanity_check_paths = { + 'files': ["lmod/%(version)s/init/profile"], + 'dirs': [] +} + +moduleclass = "tools" diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb new file mode 100644 index 0000000000..cd5ef76ead --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb @@ -0,0 +1,24 @@ +name = "Lmod" +version = "5.4" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] + +dependencies = [("Lua", "5.1.4-8")] + +configopts = ' --with-mpathSearch=yes ' # for backward compatibility + +sanity_check_paths = { + 'files': ["lmod/%(version)s/init/profile"], + 'dirs': [] +} + +moduleclass = "tools" -- GitLab From 65b61b9be7fe13a8e13062fa5818aa87bb59a90c Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Tue, 15 Apr 2014 02:20:25 +0200 Subject: [PATCH 797/811] update bits for Lmod/5.4 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/README.TXT | 10 +++++----- easybuild/easyconfigs/l/Lmod/sourceme | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/README.TXT b/easybuild/easyconfigs/l/Lmod/README.TXT index 6e4cf47e00..4c094b773e 100644 --- a/easybuild/easyconfigs/l/Lmod/README.TXT +++ b/easybuild/easyconfigs/l/Lmod/README.TXT @@ -9,7 +9,7 @@ Howto: Assuming you have successfully used the bootstrap procedure of EasyBuild, you should be able to initiate a recursive build of the following bits: -l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb +l/Lmod/Lmod-5.4-GCC-4.8.2.eb ### just aim for this one, with "-r" l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb n/ncurses/ncurses-5.9-GCC-4.8.2.eb g/GCC/GCC-4.8.2.eb @@ -17,17 +17,17 @@ g/GCC/GCC-4.8.2.eb This set is expected to be the needed substrate to launch you towards Lmod, which gets activated with the `sourceme` script sitting in the same directory: -`source sourceme` # N.B. it does direct assignments on environment variables; that's very intentional +`source sourceme` # N.B. it does direct assignments on environment variables; that's intentional Then try: `ml av` # ie. the Lmod equivalent to `module avail` ; it should work -If so, you implemented the better instance of: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html +If so, you just implemented the better instance of: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html Lmod's caching can help to work with *buildsets*; ref. https://fosdem.org/2014/schedule/event/hpc_devroom_hpcbios/ -You should now be able to try alternative Lmod/Lua versions, such as 3.x variety, toggle cache, and so forth. +You should now be able to try alternative Lmod/Lua versions, toggle cache, and so forth. enjoy, Fotis -2014-03-13 +2014-04-15 diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 3f7c86e156..b87c81208d 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -13,7 +13,7 @@ EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} TOOLCHAIN="GCC-4.8.2" VERSIONLUA="5.1.4-8" -VERSIONLMOD="5.2.5" +VERSIONLMOD="5.4" PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD -- GitLab From 29f833c5e2431fc035f0768bdcac6533884dc75b Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 26 Apr 2013 13:21:42 +0200 Subject: [PATCH 798/811] add CP2K-ictce-5.3.0 Signed-off-by: Fotis Georgatos --- .../c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb new file mode 100644 index 0000000000..fed3d4e9ee --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb @@ -0,0 +1,33 @@ +name = 'CP2K' +version = '20111205' + +homepage = 'http://www.cp2k.org' +description = """CP2K is a freely available (GPL) program, written in Fortran 95, + to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems. + It provides a general framework for different methods such as e.g. density functional theory (DFT) + using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """ + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = ['CP2K-%s.tar.gz' % version] + +patches = [ + 'fix_compile_date_lastcvs.patch', + 'do_regtest_nocompile.patch' + ] + +builddependencies = [ + ('flex', '2.5.35'), + ('Bison', '2.5') + ] + +dependencies = [('Libint', '1.1.4')] + +# don't use parallel make, results in compilation failure +# because Fortran module files aren't created before they are needed +parallel = 1 + +# regression test reports failures (120/2196 tests fail with segfault) +ignore_regtest_fails = True + +moduleclass = 'chem' -- GitLab From b0d8faced1cc7863b184962cc777d0d294079112 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 16:14:45 +0200 Subject: [PATCH 799/811] improve style on CP2K-20111205-ictce-5.3.0.u3.eb and rename to CP2K-20111205-ictce-5.3.0.eb Signed-off-by: Fotis Georgatos --- .../c/CP2K/CP2K-20111205-ictce-5.3.0.eb | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb new file mode 100644 index 0000000000..3e863ab079 --- /dev/null +++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb @@ -0,0 +1,33 @@ +name = 'CP2K' +version = '20111205' + +homepage = 'http://www.cp2k.org' +description = """CP2K is a freely available (GPL) program, written in Fortran 95, + to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems. + It provides a general framework for different methods such as e.g. density functional theory (DFT) + using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """ + +toolchain = {'name': 'ictce', 'version': '5.3.0'} + +sources = [SOURCE_TAR_GZ] + +patches = [ + 'fix_compile_date_lastcvs.patch', + 'do_regtest_nocompile.patch', +] + +builddependencies = [ + ('flex', '2.5.35'), + ('Bison', '2.5'), +] + +dependencies = [('Libint', '1.1.4')] + +# don't use parallel make, results in compilation failure +# because Fortran module files aren't created before they are needed +parallel = 1 + +# regression test reports failures (120/2196 tests fail with segfault) +ignore_regtest_fails = True + +moduleclass = 'chem' -- GitLab From 292fa80d8e119689d42fd4cb8ae009eb1bd4ad02 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 16:30:59 +0200 Subject: [PATCH 800/811] really delete old CP2K still hanging around Signed-off-by: Fotis Georgatos --- .../c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb deleted file mode 100644 index fed3d4e9ee..0000000000 --- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.u3.eb +++ /dev/null @@ -1,33 +0,0 @@ -name = 'CP2K' -version = '20111205' - -homepage = 'http://www.cp2k.org' -description = """CP2K is a freely available (GPL) program, written in Fortran 95, - to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems. - It provides a general framework for different methods such as e.g. density functional theory (DFT) - using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """ - -toolchain = {'name': 'ictce', 'version': '5.3.0'} - -sources = ['CP2K-%s.tar.gz' % version] - -patches = [ - 'fix_compile_date_lastcvs.patch', - 'do_regtest_nocompile.patch' - ] - -builddependencies = [ - ('flex', '2.5.35'), - ('Bison', '2.5') - ] - -dependencies = [('Libint', '1.1.4')] - -# don't use parallel make, results in compilation failure -# because Fortran module files aren't created before they are needed -parallel = 1 - -# regression test reports failures (120/2196 tests fail with segfault) -ignore_regtest_fails = True - -moduleclass = 'chem' -- GitLab From 31e269f7ca96322e8b37141587fe5cd74ed81d13 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 16:48:58 +0200 Subject: [PATCH 801/811] address remarks for 5.3, 5.4 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb | 7 +++++-- easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb index 8a7e354fe8..05c978e0f9 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb @@ -10,14 +10,17 @@ description = """Lmod is a Lua based module system. Modules allow for dynamic mo toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCE_TAR_BZ2] -source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] +source_urls = [ + 'http://sourceforge.net/projects/lmod/files/', + 'http://sourceforge.net/projects/lmod/files/Testing' +] dependencies = [("Lua", "5.1.4-8")] configopts = ' --with-mpathSearch=yes ' # for backward compatibility sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb index cd5ef76ead..b126ae6a13 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb @@ -10,14 +10,17 @@ description = """Lmod is a Lua based module system. Modules allow for dynamic mo toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCE_TAR_BZ2] -source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] +source_urls = [ + 'http://sourceforge.net/projects/lmod/files/', + 'http://sourceforge.net/projects/lmod/files/Testing' +] dependencies = [("Lua", "5.1.4-8")] configopts = ' --with-mpathSearch=yes ' # for backward compatibility sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } -- GitLab From 2e17b7f58c1b50a4d14ae00268852780c2b297e7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 16:49:56 +0200 Subject: [PATCH 802/811] address remarks for 5.2* Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb | 2 +- easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb | 2 +- easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb | 2 +- easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb index 769d793890..988d710727 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb @@ -15,7 +15,7 @@ source_urls = ['http://sourceforge.net/projects/lmod/files/'] dependencies = [("Lua", "5.1.4-5")] sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb index 78f3f1e26b..4d0d5e01bc 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb @@ -15,7 +15,7 @@ source_urls = ['http://sourceforge.net/projects/lmod/files/'] dependencies = [("Lua", "5.1.4-5")] sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb index f386c53edb..8b641dfb5f 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb @@ -15,7 +15,7 @@ source_urls = ['http://sourceforge.net/projects/lmod/files/'] dependencies = [("Lua", "5.1.4-5")] sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb index 14c2d00848..898aff188b 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb @@ -10,12 +10,15 @@ description = """Lmod is a Lua based module system. Modules allow for dynamic mo toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCE_TAR_BZ2] -source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] +source_urls = [ + 'http://sourceforge.net/projects/lmod/files/', + 'http://sourceforge.net/projects/lmod/files/Testing' +] dependencies = [("Lua", "5.1.4-8")] sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } -- GitLab From 967b66e3344495c4dbbbd760aac5c5f7691a6fa9 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 16:50:32 +0200 Subject: [PATCH 803/811] drop customization of mpathsearch Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb | 2 -- easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb | 2 -- 2 files changed, 4 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb index 05c978e0f9..0331bf0116 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb @@ -17,8 +17,6 @@ source_urls = [ dependencies = [("Lua", "5.1.4-8")] -configopts = ' --with-mpathSearch=yes ' # for backward compatibility - sanity_check_paths = { 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb index b126ae6a13..48d4c46271 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb @@ -17,8 +17,6 @@ source_urls = [ dependencies = [("Lua", "5.1.4-8")] -configopts = ' --with-mpathSearch=yes ' # for backward compatibility - sanity_check_paths = { 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] -- GitLab From d1dd2d2f035ed6e8a16ab9faaebeaad3ec7bc0b4 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 16:53:47 +0200 Subject: [PATCH 804/811] add export LMOD_MPATH_AVAIL=yes Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/sourceme | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index b87c81208d..05de173d32 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -19,6 +19,7 @@ PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH +export LMOD_MPATH_AVAIL=yes # most sites with life science audience would expect this source $PREFIXLMOD/init/profile export PAGER=cat # Keep it simple, for a start -- GitLab From 3d3d627577b1d1a4e4e34f7f25d59dcee85fc5cf Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 17 Apr 2014 17:03:02 +0200 Subject: [PATCH 805/811] add easyconfig for Lmod v5.4.1 --- .../l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb new file mode 100644 index 0000000000..5f11d572b5 --- /dev/null +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb @@ -0,0 +1,24 @@ +name = "Lmod" +version = "5.4.1" + +homepage = "http://sourceforge.net/projects/lmod/" +description = """Lmod is a Lua based module system. Modules allow for dynamic modification + of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod + for a complete description. Lmod is a new implementation that easily handles the MODULEPATH + Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly.""" + +toolchain = {'name': 'GCC', 'version': '4.8.2'} + +sources = [SOURCE_TAR_BZ2] +source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] + +dependencies = [("Lua", "5.1.4-8")] + +configopts = ' --with-mpathSearch=yes ' # for backward compatibility + +sanity_check_paths = { + 'files': ["lmod/%(version)s/init/profile"], + 'dirs': [] +} + +moduleclass = "tools" -- GitLab From fe17f2e1ac1d056122a87115e41aa18c7ab8d71d Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 17:32:16 +0200 Subject: [PATCH 806/811] rephrase a comment Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/sourceme | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 05de173d32..7d0716eb75 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -9,7 +9,6 @@ ## Remember to change the following, as per individual case EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} -#EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"/opt/apps/HPCBIOS.20131224"} TOOLCHAIN="GCC-4.8.2" VERSIONLUA="5.1.4-8" @@ -19,7 +18,7 @@ PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH -export LMOD_MPATH_AVAIL=yes # most sites with life science audience would expect this +export LMOD_MPATH_AVAIL=yes # `module avail` now also searches the pathnames of modulefiles source $PREFIXLMOD/init/profile export PAGER=cat # Keep it simple, for a start -- GitLab From 5b7decb2e41d487c8809ae94e71c341aaa5bb7ca Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Thu, 17 Apr 2014 23:01:11 +0200 Subject: [PATCH 807/811] promote lmod to v5.4.1 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/sourceme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 7d0716eb75..4bbb358f9c 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -12,7 +12,7 @@ EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} TOOLCHAIN="GCC-4.8.2" VERSIONLUA="5.1.4-8" -VERSIONLMOD="5.4" +VERSIONLMOD="5.4.1" PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD -- GitLab From cf4683de1fabeed90d9288269bd3b96cdb1cbda7 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 18 Apr 2014 00:11:50 +0200 Subject: [PATCH 808/811] promote lmod to v5.4.2 Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/sourceme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme index 4bbb358f9c..3030d30fab 100644 --- a/easybuild/easyconfigs/l/Lmod/sourceme +++ b/easybuild/easyconfigs/l/Lmod/sourceme @@ -12,7 +12,7 @@ EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"} TOOLCHAIN="GCC-4.8.2" VERSIONLUA="5.1.4-8" -VERSIONLMOD="5.4.1" +VERSIONLMOD="5.4.2" PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD -- GitLab From 5fb7bb46f0922bb298a98946d6a4feb577ba7812 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 18 Apr 2014 00:15:10 +0200 Subject: [PATCH 809/811] promote to Lmod/5.4.2 Signed-off-by: Fotis Georgatos --- .../l/Lmod/{Lmod-5.4.1-GCC-4.8.2.eb => Lmod-5.4.2-GCC-4.8.2.eb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename easybuild/easyconfigs/l/Lmod/{Lmod-5.4.1-GCC-4.8.2.eb => Lmod-5.4.2-GCC-4.8.2.eb} (97%) diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb similarity index 97% rename from easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb rename to easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb index 5f11d572b5..1420889489 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.4.1-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb @@ -1,5 +1,5 @@ name = "Lmod" -version = "5.4.1" +version = "5.4.2" homepage = "http://sourceforge.net/projects/lmod/" description = """Lmod is a Lua based module system. Modules allow for dynamic modification -- GitLab From 8fce30e72400607c2a5003259d74e1a1e1a84201 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Fri, 18 Apr 2014 00:19:19 +0200 Subject: [PATCH 810/811] style & fixes Signed-off-by: Fotis Georgatos --- easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb index 1420889489..bf79635a7b 100644 --- a/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb @@ -10,14 +10,15 @@ description = """Lmod is a Lua based module system. Modules allow for dynamic mo toolchain = {'name': 'GCC', 'version': '4.8.2'} sources = [SOURCE_TAR_BZ2] -source_urls = ['http://sourceforge.net/projects/lmod/files/', 'http://sourceforge.net/projects/lmod/files/Testing'] +source_urls = [ + 'http://sourceforge.net/projects/lmod/files/', + 'http://sourceforge.net/projects/lmod/files/Testing' +] dependencies = [("Lua", "5.1.4-8")] -configopts = ' --with-mpathSearch=yes ' # for backward compatibility - sanity_check_paths = { - 'files': ["lmod/%(version)s/init/profile"], + 'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"], 'dirs': [] } -- GitLab From d5073bfb1241ecbabb74463b562effa2cc8d0b2e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 25 Apr 2014 17:40:20 +0200 Subject: [PATCH 811/811] bump version to v1.12.1.0, update release notes --- RELEASE_NOTES | 7 ++++++- setup.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ab1bbd745c..585eb113b2 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,6 +4,11 @@ For more detailed information, please see the git log. The latest version of easybuild-easyconfig provides 2,372 easyconfig files, for 451 different software packages and 28 different (compiler) toolchains. +v1.12.1 (April 25th 2014) +-------------------------- + +(no changes compared to v1.12.0, simple version bump to stay in sync with easybuild-framework) + v1.12.0 (April 4th 2014) ------------------------ @@ -24,7 +29,7 @@ feature + bugfix release v1.11.1 (February 28th 2014) ---------------------------- -(no changes compared to v1.11.0, simple version bump to stay in sync with easybuild-framework +(no changes compared to v1.11.0, simple version bump to stay in sync with easybuild-framework) v1.11.0 (February 16th 2014) ---------------------------- diff --git a/setup.py b/setup.py index 1216c5c322..d068b5214a 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ from distutils import log # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1" # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware! -VERSION = "1.12.1.0dev" +VERSION = "1.12.1.0" API_VERSION = VERSION.split('.')[0] EB_VERSION = '.'.join(VERSION.split('.')[0:2]) -- GitLab