Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JasPer - Fix sanity check paths for Debian OS #5897

Merged
merged 2 commits into from
Feb 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions easybuild/easyconfigs/j/JasPer/JasPer-2.0.10-intel-2016b.eb
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vanzod Why change the CMake here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just because I cannot build and generate a report with CMake/3.6.1 on Debian 9.
I can revert it back now that a report is there.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? CMake 3.6.1 doesn't build on Debian 9?

I prefer stick to our policy of not bumping dependency versions, although here it's not a huge issue since it's only a build dep...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, nevermind, if this helps on Debian 9, it's fine to bump the version in this particular case since it can't introduce any conflicts.


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"],
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}

Expand Down
5 changes: 3 additions & 2 deletions easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-foss-2016b.eb
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ 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')]

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'],
}

Expand Down
5 changes: 3 additions & 2 deletions easybuild/easyconfigs/j/JasPer/JasPer-2.0.12-intel-2017a.eb
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ 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')]

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'],
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}

Expand Down