Skip to content

Commit

Permalink
fixing Brunsli dependency on Brotli
Browse files Browse the repository at this point in the history
  • Loading branch information
Ehsan Moravveji committed Jun 12, 2024
1 parent 8c18bfa commit ed0a71a
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 42 deletions.
38 changes: 0 additions & 38 deletions easybuild/easyconfigs/b/Brotli/Brotli-1.0.9-GCCcore-13.2.0.eb

This file was deleted.

12 changes: 8 additions & 4 deletions easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-13.2.0.eb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
# Author: Denis Kristak
# update: Ehsan Moravveji (VSC - KU Leuven)
#
# update: Thomas Hoffmann (EMBL)
easyblock = 'CMakeMake'

name = 'Brunsli'
Expand All @@ -14,15 +13,20 @@ toolchain = {'name': 'GCCcore', 'version': '13.2.0'}

source_urls = ['https://github.com/google/brunsli/archive/']
sources = ['v%(version)s.tar.gz']
checksums = ['62762dc740f9fcc9706449c078f12c2a366416486d2882be50a9f201f99ac0bc']
patches = ['Brunsli-0.1-fix-Brotli-static-library-names.patch']
checksums = [
{'v0.1.tar.gz': '62762dc740f9fcc9706449c078f12c2a366416486d2882be50a9f201f99ac0bc'},
{'Brunsli-0.1-fix-Brotli-static-library-names.patch':
'3875ac9e63232dd467450b234c09d9a64ab4abd3bd66994a4aeb6c97fdc5fe0c'},
]

builddependencies = [
('CMake', '3.27.6'),
('binutils', '2.40'),
]

dependencies = [
('Brotli', '1.0.9'),
('Brotli', '1.1.0'),
('Highway', '1.0.7'),
]

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff -ruN brunsli-orig/brunsli.cmake brunsli/brunsli.cmake
--- brunsli-orig/brunsli.cmake 2024-06-12 15:45:01.042655000 +0200
+++ brunsli/brunsli.cmake 2024-06-12 15:46:39.369617000 +0200
@@ -64,7 +64,7 @@
${BRUNSLI_DEC_HEADERS}
)
target_link_libraries(brunslidec-static PRIVATE
- brotlidec-static
+ brotlidec
brunslicommon-static
)

@@ -73,7 +73,7 @@
${BRUNSLI_ENC_HEADERS}
)
target_link_libraries(brunslienc-static PRIVATE
- brotlienc-static
+ brotlienc
brunslicommon-static
)

0 comments on commit ed0a71a

Please sign in to comment.