-
Notifications
You must be signed in to change notification settings - Fork 782
{vis}[GCCcore/13.2.0] FreeImage v3.18.0 #22077
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
68fdba8
Add easyconfig FreeImage-3.18.0-GCCcore-13.2.0.eb
julianmorillo 7ccf5fd
Add FreeImage-3.18-fix-makefile-riscv.patch
julianmorillo bf20a36
Fixed patch name
julianmorillo f94410f
Fix patched Makefile and fix formatting issues in easyconfig
julianmorillo 916436f
Fix patch checksum
julianmorillo 28e256b
Add new needed patch for RISC-V
julianmorillo 8f45102
Add description to the patches and adjust checksums
julianmorillo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
50 changes: 50 additions & 0 deletions
50
easybuild/easyconfigs/f/FreeImage/FreeImage-3.18.0-GCCcore-13.2.0.eb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| easyblock = 'ConfigureMake' | ||
|
|
||
| name = 'FreeImage' | ||
| version = '3.18.0' | ||
|
|
||
| homepage = 'http://freeimage.sourceforge.net' | ||
| description = """FreeImage is an Open Source library project for developers who would like to support popular graphics | ||
| image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications. FreeImage is easy to | ||
| use, fast, multithreading safe.""" | ||
|
|
||
| toolchain = {'name': 'GCCcore', 'version': '13.2.0'} | ||
| toolchainopts = {'cstd': 'c++14'} | ||
|
|
||
| source_urls = [SOURCEFORGE_SOURCE] | ||
| sources = ['%(name)s3180.zip'] | ||
| patches = [ | ||
| '%(name)s-%(version)s-fix-makefile.patch', | ||
| '%(name)s-%(version)s-fix-makefile-riscv.patch', | ||
| '%(name)s-%(version)s-fix-makefile-gnu.patch', | ||
| ] | ||
|
|
||
| checksums = [ | ||
| 'f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd', # FreeImage3180.zip | ||
| '3eaa1eb9562ccfd0cb95a37879bb7e3e8c745166596d75af529478181ef006a0', # %(name)s-%(version)s-fix-makefile.patch | ||
| 'e845d53bfd829d771638b9952d3632010c7f19c88d761a786754453827bd7e9b', # %(name)s-%(version)s-fix-makefile-riscv.patch | ||
| 'b636012988e1b88609fbd2c130e2b4e6fa8c488cb07578e0353baf8e5aa52413', # %(name)s-%(version)s-fix-makefile-gnu.patch | ||
| ] | ||
|
|
||
| builddependencies = [('binutils', '2.40')] | ||
|
|
||
| dependencies = [('zlib', '1.2.13')] | ||
|
|
||
| skipsteps = ['configure'] | ||
|
|
||
| buildopts = ['', '-f Makefile.fip'] | ||
|
|
||
| installopts = [ | ||
| "INCDIR=%(installdir)s/include INSTALLDIR=%(installdir)s/lib", | ||
| "-f Makefile.fip INCDIR=%(installdir)s/include INSTALLDIR=%(installdir)s/lib", | ||
| ] | ||
|
|
||
| _incs = ['include/FreeImage%s.h' % x for x in ['', 'Plus']] | ||
| _libs = ['lib/libfreeimage%s.%s' % (x, y) for x in ['', 'plus'] for y in ['a', SHLIB_EXT]] | ||
|
|
||
| sanity_check_paths = { | ||
| 'files': _incs + _libs, | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| moduleclass = 'vis' |
15 changes: 15 additions & 0 deletions
15
easybuild/easyconfigs/f/FreeImage/FreeImage-3.18.0-fix-makefile-gnu.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # -fPIC flag is also needed for RISC-V builds | ||
| --- Makefile.gnu.orig 2025-01-15 17:26:47.616603010 +0100 | ||
| +++ Makefile.gnu 2025-01-15 17:28:09.158140964 +0100 | ||
| @@ -33,6 +33,11 @@ | ||
| CXXFLAGS += -fPIC | ||
| endif | ||
|
|
||
| +ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),riscv64) | ||
| + CFLAGS += -fPIC | ||
| + CXXFLAGS += -fPIC | ||
| +endif | ||
| + | ||
| TARGET = freeimage | ||
| STATICLIB = lib$(TARGET).a | ||
| SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so | ||
15 changes: 15 additions & 0 deletions
15
easybuild/easyconfigs/f/FreeImage/FreeImage-3.18.0-fix-makefile-riscv.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # -fPIC flag is also needed for RISC-V builds | ||
| --- Makefile.fip.orig 2025-01-16 12:58:29.624119756 +0100 | ||
| +++ Makefile.fip 2025-01-16 13:00:01.016862229 +0100 | ||
| @@ -33,6 +33,11 @@ | ||
| CXXFLAGS += -fPIC | ||
| endif | ||
|
|
||
| +ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),riscv64) | ||
| + CFLAGS += -fPIC | ||
| + CXXFLAGS += -fPIC | ||
| +endif | ||
| + | ||
| TARGET = freeimageplus | ||
| STATICLIB = lib$(TARGET).a | ||
| SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.