From 790b8869560b582bcffbaae357b3a311eec94fd0 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Wed, 15 Feb 2017 10:27:02 +0200 Subject: [PATCH 01/21] adding easyconfigs: OpenMPI-system-GCC-system-2.27.eb, GCC-system-2.27.eb --- .../b/Bison/Bison-3.0.4-GCCcore-system.eb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb new file mode 100644 index 000000000..87b1f94e7 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb @@ -0,0 +1,25 @@ +easyblock = 'ConfigureMake' + +name = 'Bison' +version = '3.0.4' + +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': 'GCCcore', 'version': 'system'} + +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' From 1fda3f08c46c076681588ed3fa9cff5e2f49785c Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 25 Sep 2017 13:49:55 +0200 Subject: [PATCH 02/21] Fix comments, update to binutils 2.29, be more conservative with building deps --- .../binutils/binutils-2.29-GCCcore-system.eb | 20 +++++++++++++ .../f/flex/flex-2.6.4-GCCcore-system.eb | 28 +++++++++++++++++++ .../help2man-1.47.4-GCCcore-system.eb | 22 +++++++++++++++ .../m/M4/M4-1.4.18-GCCcore-system.eb | 28 +++++++++++++++++++ .../z/zlib/zlib-1.2.11-GCCcore-system.eb | 24 ++++++++++++++++ 5 files changed, 122 insertions(+) create mode 100644 easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb create mode 100644 easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb create mode 100644 easybuild/easyconfigs/h/help2man/help2man-1.47.4-GCCcore-system.eb create mode 100644 easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb create mode 100644 easybuild/easyconfigs/z/zlib/zlib-1.2.11-GCCcore-system.eb diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb new file mode 100644 index 000000000..2ef25643c --- /dev/null +++ b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb @@ -0,0 +1,20 @@ +name = 'binutils' +version = '2.29' + +homepage = 'http://directory.fsf.org/project/binutils/' +description = "binutils: GNU binary utilities" + +toolchain = {'name': 'GCCcore', 'version': 'system'} + +sources = [SOURCE_TAR_GZ] +source_urls = [GNU_SOURCE] +checksums = ['172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4'] + +builddependencies = [ + ('flex', '2.6.4'), + ('Bison', '3.0.4'), + # zlib required, but being linked in statically, so not a runtime dep + ('zlib', '1.2.11'), +] + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb new file mode 100644 index 000000000..a1837f33a --- /dev/null +++ b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb @@ -0,0 +1,28 @@ +name = 'flex' +version = '2.6.4' + +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': 'GCCcore', 'version': 'system'} +toolchainopts = {'pic': True} + +source_urls = ['https://github.com/westes/flex/releases/download/v%(version)s/'] +sources = [SOURCELOWER_TAR_GZ] +checksums = ['e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995'] + +builddependencies = [ + ('Bison', '3.0.4'), + ('help2man', '1.47.4'), +] + +dependencies = [ + ('M4', '1.4.18'), +] + +moduleclass = 'lang' diff --git a/easybuild/easyconfigs/h/help2man/help2man-1.47.4-GCCcore-system.eb b/easybuild/easyconfigs/h/help2man/help2man-1.47.4-GCCcore-system.eb new file mode 100644 index 000000000..44852c268 --- /dev/null +++ b/easybuild/easyconfigs/h/help2man/help2man-1.47.4-GCCcore-system.eb @@ -0,0 +1,22 @@ +easyblock = 'ConfigureMake' + +name = 'help2man' +version = '1.47.4' + +homepage = 'https://www.gnu.org/software/help2man/' +description = """help2man produces simple manual pages from the '--help' and '--version' output of other commands.""" + +toolchain = {'name': 'GCCcore', 'version': 'system'} +# Can't rely on binutils in this case (since help2man is an implied dep) so switch off architecture optimisations +toolchainopts = {'optarch': False} + +source_urls = [GNU_SOURCE] +sources = [SOURCE_TAR_XZ] +checksums = ['d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753'] + +sanity_check_paths = { + 'files': ['bin/help2man'], + 'dirs': [], +} + +moduleclass = 'tools' diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb new file mode 100644 index 000000000..7ec4b741f --- /dev/null +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -0,0 +1,28 @@ +easyblock = 'ConfigureMake' + +name = 'M4' +version = '1.4.18' + +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': 'GCCcore', 'version': 'system'} +# Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations +toolchainopts = {'optarch': False} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [GNU_SOURCE] +checksums = ['ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab'] + +# '-fgnu89-inline' is required to avoid linking errors with older glibc's, +# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529 +configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline" + +sanity_check_paths = { + 'files': ["bin/m4"], + 'dirs': [], +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.11-GCCcore-system.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.11-GCCcore-system.eb new file mode 100644 index 000000000..972fae4f4 --- /dev/null +++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.11-GCCcore-system.eb @@ -0,0 +1,24 @@ +easyblock = 'ConfigureMake' + +name = 'zlib' +version = '1.2.11' + +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': 'GCCcore', 'version': 'system'} +# Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations +toolchainopts = {'optarch': False, 'pic': True} + +source_urls = ['http://zlib.net/fossils'] +sources = [SOURCELOWER_TAR_GZ] +checksums = ['c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1'] + +sanity_check_paths = { + 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT], + 'dirs': [], +} + +moduleclass = 'lib' From 9ee32775276539768dcf0712d8924518c821f9de Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 25 Sep 2017 13:53:42 +0200 Subject: [PATCH 03/21] Add Bison updates --- easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb index 87b1f94e7..5b1c60e2e 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb @@ -8,12 +8,15 @@ description = """Bison is a general-purpose parser generator that converts an an into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.""" toolchain = {'name': 'GCCcore', 'version': 'system'} +# Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations +toolchainopts = {'optarch': False} sources = [SOURCELOWER_TAR_GZ] source_urls = [GNU_SOURCE] +checksums = ['b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e'] builddependencies = [ - ('M4', '1.4.17'), + ('M4', '1.4.18'), ] From 64eb0736710879d44858ea2a337fe6a08bc935e6 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 25 Sep 2017 14:09:12 +0200 Subject: [PATCH 04/21] Add flex update for not using arch opts --- easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb index a1837f33a..776be5670 100644 --- a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb +++ b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb @@ -10,7 +10,8 @@ description = """ """ toolchain = {'name': 'GCCcore', 'version': 'system'} -toolchainopts = {'pic': True} +# Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations +toolchainopts = {'optarch': False, 'pic': True} source_urls = ['https://github.com/westes/flex/releases/download/v%(version)s/'] sources = [SOURCELOWER_TAR_GZ] From 1e898f3b8a30e29ee4e3b0df97e56044c4ae7878 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 26 Sep 2017 09:20:07 +0200 Subject: [PATCH 05/21] Update M4-1.4.18-GCCcore-system.eb --- easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb index 7ec4b741f..7e2ff27c8 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.""" toolchain = {'name': 'GCCcore', 'version': 'system'} -# Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations +# Can't rely on binutils in this case (since this is an implied dep) so switch off architecture optimisations toolchainopts = {'optarch': False} sources = [SOURCELOWER_TAR_GZ] From 961add3d17bbe68f9f0b0b3dc10de2ae06d8febf Mon Sep 17 00:00:00 2001 From: ocaisa Date: Wed, 27 Sep 2017 18:19:06 +0200 Subject: [PATCH 06/21] Update M4-1.4.18-GCCcore-system.eb --- easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb index 7e2ff27c8..4223b77f3 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -17,7 +17,7 @@ source_urls = [GNU_SOURCE] checksums = ['ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab'] # '-fgnu89-inline' is required to avoid linking errors with older glibc's, -# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529 +# see https://github.com/easybuilders/easybuild-easyconfigs/issues/529 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline" sanity_check_paths = { From dcf09998d89dfbda977e3574c918d7da2fab836b Mon Sep 17 00:00:00 2001 From: Markus Geimer Date: Mon, 8 Jan 2018 17:09:13 +0100 Subject: [PATCH 07/21] Fix M4 configure option --- easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb index 4223b77f3..54dc4697b 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -18,7 +18,7 @@ checksums = ['ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab'] # '-fgnu89-inline' is required to avoid linking errors with older glibc's, # see https://github.com/easybuilders/easybuild-easyconfigs/issues/529 -configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline" +configopts = "--enable-c++ CPPFLAGS=-fgnu89-inline" sanity_check_paths = { 'files': ["bin/m4"], From c5014a72941d321d964ec85376077cac241f7cd5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 17 Apr 2018 18:12:40 +0200 Subject: [PATCH 08/21] also consider lib64 in sanity_check_paths for Bison 3.0.4 --- easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb index 5b1c60e2e..7556f1cc0 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb @@ -21,7 +21,7 @@ builddependencies = [ sanity_check_paths = { - 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"], + 'files': ['bin/%s' % x for x in ['bison', 'yacc']] + [('lib/liby.a', 'lib64/liby.a')], 'dirs': [], } From 09efc48cac5250241642042c7034494c4c17d399 Mon Sep 17 00:00:00 2001 From: crubb Date: Tue, 28 Aug 2018 16:40:55 +0000 Subject: [PATCH 09/21] Consistently use -D_GNU_SOURCE in flex-2.6.4*.eb --- easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb index 776be5670..ee1e6471a 100644 --- a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb +++ b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb @@ -26,4 +26,8 @@ dependencies = [ ('M4', '1.4.18'), ] +# glibc 2.26 requires _GNU_SOURCE defined to expose reallocarray in the correct +# header, see https://github.com/westes/flex/issues/241 +preconfigopts = 'export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" && ' + moduleclass = 'lang' From 9df94c3a1957c06d2408c4259c9970c20eb95c3e Mon Sep 17 00:00:00 2001 From: Robert Schade Date: Thu, 10 Jan 2019 19:02:40 +0100 Subject: [PATCH 10/21] fix for all M4-1.4.18 --- easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb index 54dc4697b..72020d962 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -14,7 +14,12 @@ toolchainopts = {'optarch': False} sources = [SOURCELOWER_TAR_GZ] source_urls = [GNU_SOURCE] -checksums = ['ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab'] + +patches = ['M4-1.4.18_glibc_2.28.patch'] +checksums = [ + 'ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab', # m4-1.4.18.tar.gz + 'a613c18f00b1a3caa46ae4b8b849a0f4f71095ad860f4fcd6c6bb4ae211681fa', # M4-1.4.18_glibc_2.28.patch +] # '-fgnu89-inline' is required to avoid linking errors with older glibc's, # see https://github.com/easybuilders/easybuild-easyconfigs/issues/529 From 73440ff09c9258150043fa307e66837ca51cf0c3 Mon Sep 17 00:00:00 2001 From: Robert Schade Date: Fri, 11 Jan 2019 17:50:30 +0100 Subject: [PATCH 11/21] bump up build dependency of flex-2.6.4 from Bison-3.0.4 to Bison-3.0.5 to avoid unnecessary dependencies on M4-1.4.17 (that cause issues on glibc 2.28) --- easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb index ee1e6471a..f40b2d8e7 100644 --- a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb +++ b/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb @@ -18,7 +18,7 @@ sources = [SOURCELOWER_TAR_GZ] checksums = ['e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995'] builddependencies = [ - ('Bison', '3.0.4'), + ('Bison', '3.0.5'), ('help2man', '1.47.4'), ] From 841755cd1fd2b0cf4e3c835725241a4e903ef8b5 Mon Sep 17 00:00:00 2001 From: Robert Schade Date: Mon, 14 Jan 2019 14:44:09 +0100 Subject: [PATCH 12/21] added different versions of Bison-3.0.5 as dependencies of flex-2.6.4 --- .../b/Bison/Bison-3.0.5-GCCcore-system.eb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-3.0.5-GCCcore-system.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.5-GCCcore-system.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.5-GCCcore-system.eb new file mode 100644 index 000000000..063383dfa --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.5-GCCcore-system.eb @@ -0,0 +1,28 @@ +easyblock = 'ConfigureMake' + +name = 'Bison' +version = '3.0.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': 'GCCcore', 'version': 'system'} +# Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations +toolchainopts = {'optarch': False} + +sources = [SOURCELOWER_TAR_GZ] +source_urls = [GNU_SOURCE] +checksums = ['cd399d2bee33afa712bac4b1f4434e20379e9b4099bce47189e09a7675a2d566'] + +builddependencies = [ + ('M4', '1.4.18'), +] + + +sanity_check_paths = { + 'files': ['bin/%s' % x for x in ['bison', 'yacc']] + [('lib/liby.a', 'lib64/liby.a')], + 'dirs': [], +} + +moduleclass = 'lang' From 65f0f0ba637b77e2a4ada25cc09de3151f98693c Mon Sep 17 00:00:00 2001 From: Markus Geimer Date: Thu, 16 May 2019 10:08:06 +0200 Subject: [PATCH 13/21] Make `zlib` a real dependency rather than a build dep Also add checksums where missing and rearrange parameters to make easyconfigs more consistent --- .../b/binutils/binutils-2.29-GCCcore-system.eb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb index 2ef25643c..07b9f5e17 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb @@ -6,14 +6,18 @@ description = "binutils: GNU binary utilities" toolchain = {'name': 'GCCcore', 'version': 'system'} -sources = [SOURCE_TAR_GZ] source_urls = [GNU_SOURCE] -checksums = ['172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4'] +sources = [SOURCE_TAR_GZ] +checksums = [ + '172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4', # binutils-2.29.tar.gz +] builddependencies = [ ('flex', '2.6.4'), ('Bison', '3.0.4'), - # zlib required, but being linked in statically, so not a runtime dep +] + +dependencies = [ ('zlib', '1.2.11'), ] From cf3781077048ef44c0099801b14c0fabf6a6abc5 Mon Sep 17 00:00:00 2001 From: Markus Geimer Date: Thu, 16 May 2019 17:48:21 +0200 Subject: [PATCH 14/21] Adjust format of specifying checksums --- .../easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb index 07b9f5e17..8bc61397f 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb @@ -8,9 +8,7 @@ toolchain = {'name': 'GCCcore', 'version': 'system'} source_urls = [GNU_SOURCE] sources = [SOURCE_TAR_GZ] -checksums = [ - '172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4', # binutils-2.29.tar.gz -] +checksums = ['172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4'] builddependencies = [ ('flex', '2.6.4'), From 573cadd0643433445cadc474c58438deddc9d66f Mon Sep 17 00:00:00 2001 From: Markus Geimer Date: Fri, 17 May 2019 09:04:06 +0200 Subject: [PATCH 15/21] Add comment referencing https://github.com/easybuilders/easybuild-easyblocks/issues/1350 --- easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb index 8bc61397f..584baf2a4 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb @@ -16,6 +16,7 @@ builddependencies = [ ] dependencies = [ + # see https://github.com/easybuilders/easybuild-easyblocks/issues/1350 ('zlib', '1.2.11'), ] From 3ca83185dccc9e253b58ff99234dbe1185ef589b Mon Sep 17 00:00:00 2001 From: Markus Geimer Date: Fri, 17 May 2019 16:41:42 +0200 Subject: [PATCH 16/21] Clarify comment --- easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb index 584baf2a4..46f269e73 100644 --- a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb @@ -16,6 +16,7 @@ builddependencies = [ ] dependencies = [ + # zlib is a runtime dep to avoid that it gets embedded in libbfd.so, # see https://github.com/easybuilders/easybuild-easyblocks/issues/1350 ('zlib', '1.2.11'), ] From 8ef75890d61b806b8e2aeb5ebce18397a2585e7b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 3 Aug 2019 13:25:45 +0200 Subject: [PATCH 17/21] add patch for Bison 3.0.4 to fix installation on top of glibc 2.28 --- .../b/Bison/Bison-3.0.4_glibc_2.28.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 easybuild/easyconfigs/b/Bison/Bison-3.0.4_glibc_2.28.patch diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4_glibc_2.28.patch b/easybuild/easyconfigs/b/Bison/Bison-3.0.4_glibc_2.28.patch new file mode 100644 index 000000000..cba2576a3 --- /dev/null +++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4_glibc_2.28.patch @@ -0,0 +1,31 @@ +patch to avoid problems on systems using glibc 2.28 (or newer) +author: Esteban Vohringer-Martinezi (Universidad de Concepción) +diff -ru bison-3.0.4_orig/lib/fseterr.c bison-3.0.4/lib/fseterr.c +--- bison-3.0.4_orig/lib/fseterr.c 2019-06-19 15:56:23.552533933 -0400 ++++ bison-3.0.4/lib/fseterr.c 2019-06-19 15:58:32.757469045 -0400 +@@ -29,7 +29,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + fp_->_flags |= __SERR; +diff -ru bison-3.0.4_orig/lib/stdio-impl.h bison-3.0.4/lib/stdio-impl.h +--- bison-3.0.4_orig/lib/stdio-impl.h 2019-06-19 15:56:23.556533962 -0400 ++++ bison-3.0.4/lib/stdio-impl.h 2019-06-19 15:57:44.497120445 -0400 +@@ -19,6 +19,13 @@ + have different naming conventions, or their access requires some casts. */ + + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif ++ + /* BSD stdio derived implementations. */ + + #if defined __NetBSD__ /* NetBSD */ From 4c4b7748c1b9aad65ad772fde49381853b4516cb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 6 Aug 2019 15:36:46 +0200 Subject: [PATCH 18/21] consistently add patch to Bison 3.0.4 easyconfigs --- .../easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb index 7556f1cc0..2feeed35a 100644 --- a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb +++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb @@ -11,9 +11,13 @@ toolchain = {'name': 'GCCcore', 'version': 'system'} # Can't rely on binutils in this case (since this is a dep) so switch off architecture optimisations toolchainopts = {'optarch': False} -sources = [SOURCELOWER_TAR_GZ] source_urls = [GNU_SOURCE] -checksums = ['b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e'] +sources = [SOURCELOWER_TAR_GZ] +patches = ['Bison-%(version)s_glibc_2.28.patch'] +checksums = [ + 'b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e', # bison-3.0.4.tar.gz + 'bdceb534ef7717bdbbd272bbdf154d5a41e8073cd8d49fe0b02540bbdba68a57', # Bison-3.0.4_glibc_2.28.patch +] builddependencies = [ ('M4', '1.4.18'), From 160f1b41e2b7e27cd3ffec43e3ded60200edc65f Mon Sep 17 00:00:00 2001 From: easybuild Date: Tue, 25 Oct 2022 17:17:07 +0200 Subject: [PATCH 19/21] Backport glibc-2.34 SIGSTKSZ patch --- easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb index 72020d962..03d16d2f2 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -15,10 +15,15 @@ toolchainopts = {'optarch': False} sources = [SOURCELOWER_TAR_GZ] source_urls = [GNU_SOURCE] -patches = ['M4-1.4.18_glibc_2.28.patch'] +patches = [ + 'M4-1.4.18_glibc_2.28.patch', + 'M4-1.4.18_glibc_2.34.patch', +] + checksums = [ 'ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab', # m4-1.4.18.tar.gz 'a613c18f00b1a3caa46ae4b8b849a0f4f71095ad860f4fcd6c6bb4ae211681fa', # M4-1.4.18_glibc_2.28.patch + '75f0ccc981bf313f5eb4e203a9f8b1ef9e633d840064587405cf360107d4915a', # M4-1.4.18_glibc_2.34.patch ] # '-fgnu89-inline' is required to avoid linking errors with older glibc's, From fd0d9cc2ed3720f67e60622a388d54872473a16c Mon Sep 17 00:00:00 2001 From: easybuild Date: Tue, 25 Oct 2022 17:42:52 +0200 Subject: [PATCH 20/21] Fix mixed spaces/tabs --- easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb index 03d16d2f2..6df13418c 100644 --- a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb +++ b/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb @@ -16,8 +16,8 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = [GNU_SOURCE] patches = [ - 'M4-1.4.18_glibc_2.28.patch', - 'M4-1.4.18_glibc_2.34.patch', + 'M4-1.4.18_glibc_2.28.patch', + 'M4-1.4.18_glibc_2.34.patch', ] checksums = [ From a36f407ee5dd764f9d2512ea597854d15fee4a89 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 17 Jan 2025 12:00:53 +0100 Subject: [PATCH 21/21] archive binutils-2.29-GCCcore-system.eb and related easyconfigs --- .../{ => __archive__}/b/Bison/Bison-3.0.4-GCCcore-system.eb | 0 .../{ => __archive__}/b/Bison/Bison-3.0.4_glibc_2.28.patch | 0 .../{ => __archive__}/b/Bison/Bison-3.0.5-GCCcore-system.eb | 0 .../{ => __archive__}/b/binutils/binutils-2.29-GCCcore-system.eb | 0 .../{ => __archive__}/f/flex/flex-2.6.4-GCCcore-system.eb | 0 .../h/help2man/help2man-1.47.4-GCCcore-system.eb | 0 .../{ => __archive__}/m/M4/M4-1.4.18-GCCcore-system.eb | 0 .../{ => __archive__}/z/zlib/zlib-1.2.11-GCCcore-system.eb | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename easybuild/easyconfigs/{ => __archive__}/b/Bison/Bison-3.0.4-GCCcore-system.eb (100%) rename easybuild/easyconfigs/{ => __archive__}/b/Bison/Bison-3.0.4_glibc_2.28.patch (100%) rename easybuild/easyconfigs/{ => __archive__}/b/Bison/Bison-3.0.5-GCCcore-system.eb (100%) rename easybuild/easyconfigs/{ => __archive__}/b/binutils/binutils-2.29-GCCcore-system.eb (100%) rename easybuild/easyconfigs/{ => __archive__}/f/flex/flex-2.6.4-GCCcore-system.eb (100%) rename easybuild/easyconfigs/{ => __archive__}/h/help2man/help2man-1.47.4-GCCcore-system.eb (100%) rename easybuild/easyconfigs/{ => __archive__}/m/M4/M4-1.4.18-GCCcore-system.eb (100%) rename easybuild/easyconfigs/{ => __archive__}/z/zlib/zlib-1.2.11-GCCcore-system.eb (100%) diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.4-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.4-GCCcore-system.eb diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4_glibc_2.28.patch b/easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.4_glibc_2.28.patch similarity index 100% rename from easybuild/easyconfigs/b/Bison/Bison-3.0.4_glibc_2.28.patch rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.4_glibc_2.28.patch diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.5-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.5-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/b/Bison/Bison-3.0.5-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.5-GCCcore-system.eb diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/b/binutils/binutils-2.29-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/b/binutils/binutils-2.29-GCCcore-system.eb diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.6.4-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/f/flex/flex-2.6.4-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.6.4-GCCcore-system.eb diff --git a/easybuild/easyconfigs/h/help2man/help2man-1.47.4-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/h/help2man/help2man-1.47.4-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/h/help2man/help2man-1.47.4-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/h/help2man/help2man-1.47.4-GCCcore-system.eb diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.18-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/m/M4/M4-1.4.18-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.18-GCCcore-system.eb diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.11-GCCcore-system.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.11-GCCcore-system.eb similarity index 100% rename from easybuild/easyconfigs/z/zlib/zlib-1.2.11-GCCcore-system.eb rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.11-GCCcore-system.eb