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.

Sign up for GitHub

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

Jump to bottom

Replace sed in Brunsli by proper patch #21180

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Replace sed in Brunsli by proper patch #21180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-13.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ 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':
'0b921fb4839f0b0223c1bf08499e84afd5d428f448664fd1337173f45a815704'},
]

builddependencies = [
('CMake', '3.27.6'),
Expand All @@ -27,7 +32,6 @@ dependencies = [

# skip use of third_party directory, since we provide Brotli via a proper dependency
preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
preconfigopts += "sed -i 's/\\(brotli...\\)-static/\\1/g' ../brunsli-%(version)s/brunsli.cmake && "

configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '

Expand Down
25 changes: 25 additions & 0 deletions easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-fix-Brotli-static-library-names.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Author: Ehsan Moravveji (VSC - KU Leuven)
# Purpose: Brunsli searches for libbrotli*-static.a, which is no longer
# created in Brotli v1.1.0. This patch just adapts the names of
# expected static libraries
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
)

Loading