From e3925ab4dfc73f8c851ed9ea864821152998b6c4 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Fri, 28 Oct 2022 08:45:04 +0100 Subject: [PATCH] fix libsanitzer for glibc 2.36 to build GCCcore 10.x and 11.x --- .../easyconfigs/g/GCCcore/GCCcore-10.1.0.eb | 21 ++++++----- .../easyconfigs/g/GCCcore/GCCcore-10.2.0.eb | 36 ++++++++++--------- .../easyconfigs/g/GCCcore/GCCcore-10.3.0.eb | 29 ++++++++------- .../easyconfigs/g/GCCcore/GCCcore-11.1.0.eb | 2 ++ .../easyconfigs/g/GCCcore/GCCcore-11.2.0.eb | 2 ++ 5 files changed, 52 insertions(+), 38 deletions(-) diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-10.1.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-10.1.0.eb index 23a101c3f9f..5ad49480069 100644 --- a/easybuild/easyconfigs/g/GCCcore/GCCcore-10.1.0.eb +++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-10.1.0.eb @@ -31,17 +31,20 @@ patches = [ 'GCCcore-9.3.0_gmp-c99.patch', 'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch', 'GCC-10.x_fix-libsanitizer-cyclades.patch', + 'GCCcore-11_fix-libsanitzer-glibc-2.36.patch', ] checksums = [ - '954057239c89d25bc7a62bfbceb58026363ad74f079c63fdba27f95abbf60900', # gcc-10.1.0.tar.gz - 'f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea', # gmp-6.2.0.tar.bz2 - 'c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc', # mpfr-4.0.2.tar.bz2 - '6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e', # mpc-1.1.0.tar.gz - '1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd', # isl-0.22.1.tar.bz2 - '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68', # GCCcore-6.2.0-fix-find-isl.patch - '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e', # GCCcore-9.3.0_gmp-c99.patch - '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4', # GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch - 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832', # GCC-10.x_fix-libsanitizer-cyclades.patch + {'gcc-10.1.0.tar.gz': '954057239c89d25bc7a62bfbceb58026363ad74f079c63fdba27f95abbf60900'}, + {'gmp-6.2.0.tar.bz2': 'f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea'}, + {'mpfr-4.0.2.tar.bz2': 'c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc'}, + {'mpc-1.1.0.tar.gz': '6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e'}, + {'isl-0.22.1.tar.bz2': '1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd'}, + {'GCCcore-6.2.0-fix-find-isl.patch': '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68'}, + {'GCCcore-9.3.0_gmp-c99.patch': '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e'}, + {'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch': + '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4'}, + {'GCC-10.x_fix-libsanitizer-cyclades.patch': 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832'}, + {'GCCcore-11_fix-libsanitzer-glibc-2.36.patch': '5c6c3b4655883a23dd9da7ef99751e5db23f35189c03689d2ab755b22cb39a60'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-10.2.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-10.2.0.eb index d6d21047a9c..880ff3864f6 100644 --- a/easybuild/easyconfigs/g/GCCcore/GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-10.2.0.eb @@ -39,24 +39,28 @@ patches = [ 'GCCcore-10.2.0_fix-vec-builtins-conversion-on-ppc.patch', 'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch', 'GCC-10.x_fix-libsanitizer-cyclades.patch', + 'GCCcore-11_fix-libsanitzer-glibc-2.36.patch', ] checksums = [ - '27e879dccc639cd7b0cc08ed575c1669492579529b53c9ff27b0b96265fa867d', # gcc-10.2.0.tar.gz - 'f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea', # gmp-6.2.0.tar.bz2 - 'feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926', # mpfr-4.1.0.tar.bz2 - '6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e', # mpc-1.1.0.tar.gz - '1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd', # isl-0.22.1.tar.bz2 - '58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66', # newlib-3.3.0.tar.gz - 'a25b6f7761bb61c0d8e2a183bcf51fbaaeeac26868dcfc015e3b16a33fe11705', # nvptx-tools-20180301.tar.gz - '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68', # GCCcore-6.2.0-fix-find-isl.patch - '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e', # GCCcore-9.3.0_gmp-c99.patch - '8d8b9834a570b5789d47296311953b6307d4427957a73e102de43cca7a6fa108', # GCCcore-9.3.0_nvptx_sm_35_default.patch - 'f94fa117f3401b28fda0741f3f45439c09dc956d1ed27f9a3ebe40c0e7e404b6', # GCCcore-10.2.0_fix-has-include-Fortran.patch - '44edbf1cddb2d7037f9606b6995d9ef20ff664b810a3e3ef383420a4366ed278', # GCCcore-10.2.0_fix-ice-on-arm.patch - # GCCcore-10.2.0_fix-vec-builtins-conversion-on-ppc.patch - 'fb160374ba691d8267a19dee4268305a6e34123cab9e65176b5168c36e9f0962', - '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4', # GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch - 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832', # GCC-10.x_fix-libsanitizer-cyclades.patch + {'gcc-10.2.0.tar.gz': '27e879dccc639cd7b0cc08ed575c1669492579529b53c9ff27b0b96265fa867d'}, + {'gmp-6.2.0.tar.bz2': 'f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea'}, + {'mpfr-4.1.0.tar.bz2': 'feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926'}, + {'mpc-1.1.0.tar.gz': '6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e'}, + {'isl-0.22.1.tar.bz2': '1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd'}, + {'newlib-3.3.0.tar.gz': '58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66'}, + {'nvptx-tools-20180301.tar.gz': 'a25b6f7761bb61c0d8e2a183bcf51fbaaeeac26868dcfc015e3b16a33fe11705'}, + {'GCCcore-6.2.0-fix-find-isl.patch': '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68'}, + {'GCCcore-9.3.0_gmp-c99.patch': '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e'}, + {'GCCcore-9.3.0_nvptx_sm_35_default.patch': '8d8b9834a570b5789d47296311953b6307d4427957a73e102de43cca7a6fa108'}, + {'GCCcore-10.2.0_fix-has-include-Fortran.patch': + 'f94fa117f3401b28fda0741f3f45439c09dc956d1ed27f9a3ebe40c0e7e404b6'}, + {'GCCcore-10.2.0_fix-ice-on-arm.patch': '44edbf1cddb2d7037f9606b6995d9ef20ff664b810a3e3ef383420a4366ed278'}, + {'GCCcore-10.2.0_fix-vec-builtins-conversion-on-ppc.patch': + 'fb160374ba691d8267a19dee4268305a6e34123cab9e65176b5168c36e9f0962'}, + {'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch': + '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4'}, + {'GCC-10.x_fix-libsanitizer-cyclades.patch': 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832'}, + {'GCCcore-11_fix-libsanitzer-glibc-2.36.patch': '5c6c3b4655883a23dd9da7ef99751e5db23f35189c03689d2ab755b22cb39a60'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-10.3.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-10.3.0.eb index a3826b1579c..7f9079c65c0 100644 --- a/easybuild/easyconfigs/g/GCCcore/GCCcore-10.3.0.eb +++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-10.3.0.eb @@ -37,21 +37,24 @@ patches = [ 'gcc-10.3.0_fix-ice-in-tsubst.patch', 'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch', 'GCC-10.x_fix-libsanitizer-cyclades.patch', + 'GCCcore-11_fix-libsanitzer-glibc-2.36.patch', ] checksums = [ - '8fcf994811ad4e5c7ac908e8cf62af2c1982319e5551f62ae72016064dacdf16', # gcc-10.3.0.tar.gz - 'eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c', # gmp-6.2.1.tar.bz2 - 'feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926', # mpfr-4.1.0.tar.bz2 - '17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459', # mpc-1.2.1.tar.gz - 'c58922c14ae7d0791a77932f377840890f19bc486b653fa64eba7f1026fb214d', # isl-0.23.tar.bz2 - 'f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154', # newlib-4.1.0.tar.gz - '466abe1cef9cf294318ecb3c221593356f7a9e1674be987d576bc70d833d84a2', # nvptx-tools-20210115.tar.gz - '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68', # GCCcore-6.2.0-fix-find-isl.patch - '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e', # GCCcore-9.3.0_gmp-c99.patch - '8d8b9834a570b5789d47296311953b6307d4427957a73e102de43cca7a6fa108', # GCCcore-9.3.0_nvptx_sm_35_default.patch - '74e6e019458aa2feb36ae3c45f45e164725ca5edd66f4fe9f873c8ee78c35717', # gcc-10.3.0_fix-ice-in-tsubst.patch - '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4', # GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch - 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832', # GCC-10.x_fix-libsanitizer-cyclades.patch + {'gcc-10.3.0.tar.gz': '8fcf994811ad4e5c7ac908e8cf62af2c1982319e5551f62ae72016064dacdf16'}, + {'gmp-6.2.1.tar.bz2': 'eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c'}, + {'mpfr-4.1.0.tar.bz2': 'feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926'}, + {'mpc-1.2.1.tar.gz': '17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459'}, + {'isl-0.23.tar.bz2': 'c58922c14ae7d0791a77932f377840890f19bc486b653fa64eba7f1026fb214d'}, + {'newlib-4.1.0.tar.gz': 'f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154'}, + {'nvptx-tools-20210115.tar.gz': '466abe1cef9cf294318ecb3c221593356f7a9e1674be987d576bc70d833d84a2'}, + {'GCCcore-6.2.0-fix-find-isl.patch': '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68'}, + {'GCCcore-9.3.0_gmp-c99.patch': '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e'}, + {'GCCcore-9.3.0_nvptx_sm_35_default.patch': '8d8b9834a570b5789d47296311953b6307d4427957a73e102de43cca7a6fa108'}, + {'gcc-10.3.0_fix-ice-in-tsubst.patch': '74e6e019458aa2feb36ae3c45f45e164725ca5edd66f4fe9f873c8ee78c35717'}, + {'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch': + '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4'}, + {'GCC-10.x_fix-libsanitizer-cyclades.patch': 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832'}, + {'GCCcore-11_fix-libsanitzer-glibc-2.36.patch': '5c6c3b4655883a23dd9da7ef99751e5db23f35189c03689d2ab755b22cb39a60'}, ] builddependencies = [ diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-11.1.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-11.1.0.eb index a5a30163948..dde91967953 100644 --- a/easybuild/easyconfigs/g/GCCcore/GCCcore-11.1.0.eb +++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-11.1.0.eb @@ -35,6 +35,7 @@ patches = [ 'GCCcore-9.3.0_gmp-c99.patch', 'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch', 'GCC-10.x_fix-libsanitizer-cyclades.patch', + 'GCCcore-11_fix-libsanitzer-glibc-2.36.patch', 'GCCcore-11.3.0_fix-vectorizer.patch', ] checksums = [ @@ -50,6 +51,7 @@ checksums = [ {'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch': '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4'}, {'GCC-10.x_fix-libsanitizer-cyclades.patch': 'ba1f1cdc3a370281a9c1a45758db48b7edbddb70a9f6b10951fe8a77e4931832'}, + {'GCCcore-11_fix-libsanitzer-glibc-2.36.patch': '5c6c3b4655883a23dd9da7ef99751e5db23f35189c03689d2ab755b22cb39a60'}, {'GCCcore-11.3.0_fix-vectorizer.patch': '7dff25b678e2f65b81d9bf0c8402ad46c25a04b0c0d610db50b763ecc5f9ef98'}, ] diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-11.2.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-11.2.0.eb index 5efade9fb39..9d40637c25c 100644 --- a/easybuild/easyconfigs/g/GCCcore/GCCcore-11.2.0.eb +++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-11.2.0.eb @@ -34,6 +34,7 @@ patches = [ 'GCCcore-6.2.0-fix-find-isl.patch', 'GCCcore-9.3.0_gmp-c99.patch', 'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch', + 'GCCcore-11_fix-libsanitzer-glibc-2.36.patch', 'GCCcore-11.3.0_fix-vectorizer.patch', ] checksums = [ @@ -48,6 +49,7 @@ checksums = [ {'GCCcore-9.3.0_gmp-c99.patch': '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e'}, {'GCCcore-9.x-11.x_fix-unsigned-fpe-traps.patch': '03a2e4aeda78d398edd680d6a1ba842b8ceb29c126ebb7fe2e3541ddfe4fbed4'}, + {'GCCcore-11_fix-libsanitzer-glibc-2.36.patch': '5c6c3b4655883a23dd9da7ef99751e5db23f35189c03689d2ab755b22cb39a60'}, {'GCCcore-11.3.0_fix-vectorizer.patch': '7dff25b678e2f65b81d9bf0c8402ad46c25a04b0c0d610db50b763ecc5f9ef98'}, ]