Skip to content

Commit

Permalink
Merge pull request #6731 from boegel/libgd_fix_configopts
Browse files Browse the repository at this point in the history
specify location of dependencies in configure options for libgd (to avoid system libraries being used instead)
  • Loading branch information
akesandgren committed Aug 20, 2018
2 parents 020fe26 + 826e232 commit 046fb93
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 2 deletions.
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.1.0-ictce-5.5.0.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}

source_urls = ['https://bitbucket.org/libgd/gd-libgd/downloads']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['3ceef69d5454a392e8793ae90b5f0d632dd3e20879c12856aa1d1d3d063a51c8']

dependencies = [
('fontconfig', '2.11.1'),
Expand All @@ -18,6 +19,9 @@ dependencies = [
('zlib', '1.2.7'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.1.1-foss-2016a.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'foss', 'version': '2016a'}

source_urls = ['https://bitbucket.org/libgd/gd-libgd/downloads']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['cf47bce5a4c4c6dc77ba8d0349d1eec9ceff77ed86f14b249a0780b7f18554c5']

dependencies = [
('fontconfig', '2.11.94'),
Expand All @@ -18,6 +19,9 @@ dependencies = [
('zlib', '1.2.8'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.1.1-intel-2015b.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}

source_urls = ['https://bitbucket.org/libgd/gd-libgd/downloads']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['cf47bce5a4c4c6dc77ba8d0349d1eec9ceff77ed86f14b249a0780b7f18554c5']

libpngver = '1.6.19'
dependencies = [
Expand All @@ -19,6 +20,9 @@ dependencies = [
('zlib', '1.2.8'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.1.1-intel-2016a.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}

source_urls = ['https://bitbucket.org/libgd/gd-libgd/downloads']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['cf47bce5a4c4c6dc77ba8d0349d1eec9ceff77ed86f14b249a0780b7f18554c5']

dependencies = [
('fontconfig', '2.11.94'),
Expand All @@ -18,6 +19,9 @@ dependencies = [
('zlib', '1.2.8'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.3-foss-2016b.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'foss', 'version': '2016b'}

source_urls = ['https://github.com/libgd/libgd/releases/download/gd-%(version)s/']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['458f80ffcac0ddfba7d3fb2986b6ec271123d4193478a4e807764134e5a6261d']

dependencies = [
('fontconfig', '2.12.1'),
Expand All @@ -18,6 +19,9 @@ dependencies = [
('zlib', '1.2.8'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.3-intel-2016b.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'intel', 'version': '2016b'}

source_urls = ['https://github.com/libgd/libgd/releases/download/gd-%(version)s/']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['458f80ffcac0ddfba7d3fb2986b6ec271123d4193478a4e807764134e5a6261d']

dependencies = [
('fontconfig', '2.12.1'),
Expand All @@ -18,6 +19,9 @@ dependencies = [
('zlib', '1.2.8'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.4-GCCcore-6.4.0.eb
Expand Up @@ -25,6 +25,9 @@ dependencies = [
('zlib', '1.2.11'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
6 changes: 4 additions & 2 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.4-foss-2016b.eb
Expand Up @@ -12,8 +12,7 @@ toolchain = {'name': 'foss', 'version': '2016b'}

source_urls = ['https://github.com/libgd/libgd/releases/download/gd-%(version)s/']
sources = [SOURCELOWER_TAR_GZ]

checksums = ['0a3c307b5075edbe1883543dd1153c02']
checksums = ['487a650aa614217ed08ab1bd1aa5d282f9d379cfd95c756aed0b43406381be65']

dependencies = [
('fontconfig', '2.12.1'),
Expand All @@ -22,6 +21,9 @@ dependencies = [
('zlib', '1.2.8'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ['lib/libgd.a', 'lib/libgd.%s' % SHLIB_EXT],
'dirs': ['bin', 'include'],
Expand Down
4 changes: 4 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.4-intel-2017a.eb
Expand Up @@ -10,6 +10,7 @@ toolchain = {'name': 'intel', 'version': '2017a'}

source_urls = ['https://github.com/libgd/libgd/releases/download/gd-%(version)s/']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['487a650aa614217ed08ab1bd1aa5d282f9d379cfd95c756aed0b43406381be65']

dependencies = [
('fontconfig', '2.12.1', '-libpng-1.6.29'),
Expand All @@ -18,6 +19,9 @@ dependencies = [
('zlib', '1.2.11'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.5-GCCcore-6.4.0.eb
Expand Up @@ -25,6 +25,9 @@ dependencies = [
('zlib', '1.2.11'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.5-intel-2017b.eb
Expand Up @@ -19,6 +19,9 @@ dependencies = [
('zlib', '1.2.11'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/l/libgd/libgd-2.2.5-intel-2018a.eb
Expand Up @@ -19,6 +19,9 @@ dependencies = [
('zlib', '1.2.11'),
]

configopts = "--with-fontconfig=$EBROOTFONTCONFIG --with-jpeg=$EBROOTLIBJPEGMINTURBO "
configopts += "--with-png=$EBROOTLIBPNG --with-zlib=$EBROOTZLIB"

sanity_check_paths = {
'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
'dirs': ["bin", "include"],
Expand Down

0 comments on commit 046fb93

Please sign in to comment.