From b1fcac316efe2f6cf376a5071b7feac3a7f4ef79 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 24 Dec 2022 21:37:48 +0100
Subject: [PATCH] Account for fixed bortli buildsystem

---
 scripts.d/50-libjxl/45-brotli.sh | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index a48ea94..083bdf1 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -13,22 +13,8 @@ ffbuild_dockerbuild() {
 
     mkdir build && cd build
 
-    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
+    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF ..
     ninja -j$(nproc)
     ninja install
-
-    # Build system is severely lacking in options, clean up after it
-    rm -r "${FFBUILD_PREFIX}"/bin
-    mv "${FFBUILD_PREFIX}"/lib/libbrotlienc{-static,}.a
-    mv "${FFBUILD_PREFIX}"/lib/libbrotlidec{-static,}.a
-    mv "${FFBUILD_PREFIX}"/lib/libbrotlicommon{-static,}.a
-
-    if [[ $TARGET == win* ]]; then
-        rm "${FFBUILD_PREFIX}"/lib/libbrotli*.dll.a
-    elif [[ $TARGET == linux* ]]; then
-        rm "${FFBUILD_PREFIX}"/lib/libbrotli*.so*
-    else
-        echo "Unknown target"
-        return -1
-    fi
 }