Merge pull request #8340 from geimer/binutils_without_embedded_zlib

make `zlib` a real dependency rather than a build dep in recent binutils easyconfigs (>= 2.28)
easybuilders · May 17, 2019 · 652b95e · 652b95e
2 parents 3a1e77d + 90956c0
commit 652b95e
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 26 deletions.
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.28-GCCcore-6.3.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.28-GCCcore-6.3.0.eb
@@ -6,16 +6,21 @@ description = "binutils: GNU binary utilities"
 
 toolchain = {'name': 'GCCcore', 'version': '6.3.0'}
 
-sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+checksums = ['cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf']
 
 builddependencies = [
     ('flex', '2.6.3'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.28-GCCcore-6.4.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.28-GCCcore-6.4.0.eb
@@ -2,7 +2,6 @@ name = 'binutils'
 version = '2.28'
 
 homepage = 'http://directory.fsf.org/project/binutils/'
-
 description = "binutils: GNU binary utilities"
 
 toolchain = {'name': 'GCCcore', 'version': '6.4.0'}
@@ -14,11 +13,15 @@ checksums = ['cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf']
 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'),
     # use same binutils version that was used when building GCC toolchain,
     # to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.28-GCCcore-7.1.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.28-GCCcore-7.1.0.eb
@@ -6,16 +6,21 @@ description = "binutils: GNU binary utilities"
 
 toolchain = {'name': 'GCCcore', 'version': '7.1.0'}
 
-sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+checksums = ['cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf']
 
 builddependencies = [
     ('flex', '2.6.3'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-7.2.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.29-GCCcore-7.2.0.eb
@@ -6,17 +6,21 @@ description = "binutils: GNU binary utilities"
 
 toolchain = {'name': 'GCCcore', 'version': '7.2.0'}
 
-sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
 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'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git 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]
+sources = [SOURCE_TAR_GZ]
 checksums = ['172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4']
 
 builddependencies = [
     ('flex', '2.6.4'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked in statically, so not a runtime dep
+]
+
+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'),
 ]
 

diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.30-GCCcore-7.3.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.30-GCCcore-7.3.0.eb
@@ -17,10 +17,14 @@ checksums = [
 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'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.30-GCCcore-8.1.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.30-GCCcore-8.1.0.eb
@@ -17,10 +17,14 @@ checksums = [
 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'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.31.1-GCCcore-7.4.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.31.1-GCCcore-7.4.0.eb
@@ -13,10 +13,14 @@ checksums = ['e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88']
 builddependencies = [
     ('flex', '2.6.4'),
     ('Bison', '3.2.2'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.31.1-GCCcore-8.2.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.31.1-GCCcore-8.2.0.eb
@@ -13,10 +13,14 @@ checksums = ['e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88']
 builddependencies = [
     ('flex', '2.6.4'),
     ('Bison', '3.0.5'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.32-GCCcore-8.3.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.32-GCCcore-8.3.0.eb
@@ -13,10 +13,14 @@ checksums = ['9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e']
 builddependencies = [
     ('flex', '2.6.4'),
     ('Bison', '3.3.2'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.32-GCCcore-9.1.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.32-GCCcore-9.1.0.eb
@@ -13,10 +13,14 @@ checksums = ['9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e']
 builddependencies = [
     ('flex', '2.6.4'),
     ('Bison', '3.3.2'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
+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'),
+]
+
 moduleclass = 'tools'