From b86c04c24bb334d364ad7aa1b2ec6a5c73727c09 Mon Sep 17 00:00:00 2001 From: Davide Vanzo Date: Thu, 22 Feb 2018 14:24:09 -0600 Subject: [PATCH 1/2] Added lib sanity check path for debian compatibility --- .../easyconfigs/j/JasPer/JasPer-2.0.10-intel-2016b.eb | 7 ++++--- .../easyconfigs/j/JasPer/JasPer-2.0.12-GCCcore-6.4.0.eb | 2 +- easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb | 2 +- .../easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb | 2 +- .../easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-6.4.0.eb | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.10-intel-2016b.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.10-intel-2016b.eb index 23bfbfb00d4a..c573c6940983 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.10-intel-2016b.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.10-intel-2016b.eb @@ -10,15 +10,16 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'intel', 'version': '2016b'} toolchainopts = {'pic': True} -sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] +sources = [SOURCELOWER_TAR_GZ] +checksums = ['54d85428e35263642358a11c312d61cbc054170546fae780e11271df5d1502e8'] -builddependencies = [('CMake', '3.6.1')] +builddependencies = [('CMake', '3.7.1')] separate_build_dir = True sanity_check_paths = { - 'files': ["bin/jasper", "lib64/libjasper.so"], + 'files': ["bin/jasper", ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)], 'dirs': ["include"], } diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-GCCcore-6.4.0.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-GCCcore-6.4.0.eb index 3714a84e8e83..0bdcc3e3868b 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-GCCcore-6.4.0.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-GCCcore-6.4.0.eb @@ -28,7 +28,7 @@ separate_build_dir = True configopts = '-DJAS_ENABLE_DOC=OFF ' sanity_check_paths = { - 'files': ['bin/jasper', 'lib64/libjasper.%s' % SHLIB_EXT], + 'files': ['bin/jasper', ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)], 'dirs': ['include'], } diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb index c6d030f5e7a0..d797f8504b08 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb @@ -18,7 +18,7 @@ builddependencies = [('CMake', '3.7.2')] separate_build_dir = True sanity_check_paths = { - 'files': ['bin/jasper', 'lib64/libjasper.%s' % SHLIB_EXT], + 'files': ['bin/jasper', ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)], 'dirs': ['include'], } diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb index 668f15ccada8..e460bf08284c 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb @@ -18,7 +18,7 @@ builddependencies = [('CMake', '3.7.2')] separate_build_dir = True sanity_check_paths = { - 'files': ['bin/jasper', 'lib64/libjasper.%s' % SHLIB_EXT], + 'files': ['bin/jasper', ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)], 'dirs': ['include'], } diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-6.4.0.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-6.4.0.eb index 0ebc8da87b2b..b89a3663ebba 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-6.4.0.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-6.4.0.eb @@ -28,7 +28,7 @@ separate_build_dir = True configopts = '-DJAS_ENABLE_DOC=OFF ' sanity_check_paths = { - 'files': ['bin/jasper', 'lib64/libjasper.%s' % SHLIB_EXT], + 'files': ['bin/jasper', ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)], 'dirs': ['include'], } From 49a5d439d0736c11b5f70cb0d76f0ab70f968441 Mon Sep 17 00:00:00 2001 From: Davide Vanzo Date: Thu, 22 Feb 2018 14:26:22 -0600 Subject: [PATCH 2/2] Added missing checksum --- easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb | 3 ++- easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb index d797f8504b08..fc73a5010ccd 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb @@ -10,8 +10,9 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'foss', 'version': '2016b'} toolchainopts = {'pic': True} -sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] +sources = [SOURCELOWER_TAR_GZ] +checksums = ['5b24faf5ed38670d6286e45ab7516b26458d05e7929b435afe569176765f4dda'] builddependencies = [('CMake', '3.7.2')] diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb index e460bf08284c..657971ea6134 100644 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb +++ b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb @@ -10,8 +10,9 @@ description = """The JasPer Project is an open-source initiative to provide a fr toolchain = {'name': 'intel', 'version': '2017a'} toolchainopts = {'pic': True} -sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/'] +sources = [SOURCELOWER_TAR_GZ] +checksums = ['5b24faf5ed38670d6286e45ab7516b26458d05e7929b435afe569176765f4dda'] builddependencies = [('CMake', '3.7.2')]