Skip to content

Commit 4a6daf7

Browse files
committed
Hopefully temporary fix for broken brotli build
1 parent db79ec8 commit 4a6daf7

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

build/brotli_man_fix.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 64b979a..3f785d3 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -359,9 +359,9 @@ if(NOT BROTLI_BUNDLED_MODE)
6+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
7+
endif() # BROTLI_BUNDLED_MODE
8+
9+
-INSTALL(FILES "docs/brotli.1" DESTINATION "${SHARE_INSTALL_PREFIX}/man/man1")
10+
+INSTALL(FILES "docs/brotli.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
11+
INSTALL(FILES docs/constants.h.3 docs/decode.h.3 docs/encode.h.3 docs/types.h.3
12+
- DESTINATION "${SHARE_INSTALL_PREFIX}/man/man3")
13+
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man3")
14+
15+
if (ENABLE_COVERAGE STREQUAL "yes")
16+
SETUP_TARGET_FOR_COVERAGE(coverage test coverage)

build/build-brotli.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ download_code () {
3838

3939
configure_build () {
4040

41+
cd "$2/${SOFTWARE}/${SOFTWARE}/"
42+
checkStatus $? "change directory failed"
43+
git apply $1/brotli_man_fix.patch
44+
checkStatus $? "git apply patch failed"
45+
4146
cd "$2/${SOFTWARE}/build-${SOFTWARE}/"
4247
checkStatus $? "change directory failed"
4348

0 commit comments

Comments
 (0)