Skip to content

Commit

Permalink
Hopefully temporary fix for broken brotli build
Browse files Browse the repository at this point in the history
  • Loading branch information
Vargol committed Sep 16, 2023
1 parent db79ec8 commit 4a6daf7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
16 changes: 16 additions & 0 deletions build/brotli_man_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64b979a..3f785d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,9 +359,9 @@ if(NOT BROTLI_BUNDLED_MODE)
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif() # BROTLI_BUNDLED_MODE

-INSTALL(FILES "docs/brotli.1" DESTINATION "${SHARE_INSTALL_PREFIX}/man/man1")
+INSTALL(FILES "docs/brotli.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
INSTALL(FILES docs/constants.h.3 docs/decode.h.3 docs/encode.h.3 docs/types.h.3
- DESTINATION "${SHARE_INSTALL_PREFIX}/man/man3")
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man3")

if (ENABLE_COVERAGE STREQUAL "yes")
SETUP_TARGET_FOR_COVERAGE(coverage test coverage)
5 changes: 5 additions & 0 deletions build/build-brotli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ download_code () {

configure_build () {

cd "$2/${SOFTWARE}/${SOFTWARE}/"
checkStatus $? "change directory failed"
git apply $1/brotli_man_fix.patch
checkStatus $? "git apply patch failed"

cd "$2/${SOFTWARE}/build-${SOFTWARE}/"
checkStatus $? "change directory failed"

Expand Down

0 comments on commit 4a6daf7

Please sign in to comment.