From 4a6daf7c11db05c1f599942ad6d22e3b010d6304 Mon Sep 17 00:00:00 2001 From: David Burnett Date: Sat, 16 Sep 2023 15:01:13 +0100 Subject: [PATCH] Hopefully temporary fix for broken brotli build --- build/brotli_man_fix.patch | 16 ++++++++++++++++ build/build-brotli.sh | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 build/brotli_man_fix.patch diff --git a/build/brotli_man_fix.patch b/build/brotli_man_fix.patch new file mode 100644 index 0000000..3df5d4d --- /dev/null +++ b/build/brotli_man_fix.patch @@ -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) diff --git a/build/build-brotli.sh b/build/build-brotli.sh index 9ac7234..34ba2a5 100755 --- a/build/build-brotli.sh +++ b/build/build-brotli.sh @@ -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"