brotli now requires flag to build static libs, bring libass brotli li…

…b names back in line
Vargol · Jan 6, 2023 · b547de7 · b547de7
1 parent 7d357c5
commit b547de7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/build/build-brotli.sh b/build/build-brotli.sh
@@ -41,7 +41,7 @@ configure_build () {
   cd "$2/${SOFTWARE}/build-${SOFTWARE}/"
   checkStatus $? "change directory failed"
 
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=$3 -DINSTALL_PKGCONFIG_DIR=$3/lib/pkgconfig -DCMAKE_BUILD_TYPE=Release ../${SOFTWARE}
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=$3 -DINSTALL_PKGCONFIG_DIR=$3/lib/pkgconfig -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ../${SOFTWARE}
   checkStatus $? "configuration of ${SOFTWARE} failed"
 
 }
@@ -69,9 +69,6 @@ make_compile () {
   make install
   checkStatus $? "installation of ${SOFTWARE} failed"
 
-  rm $3/lib/libbrotli*.dylib
-  ln -s $3/lib/libbrotlidec-static.a $3/lib/libbrotlidec.a
-  ln -s $3/lib/libbrotlicommon-static.a $3/lib/libbrotlicommon.a
 }
 
 build_main () {

diff --git a/build/build-libass.sh b/build/build-libass.sh
@@ -40,7 +40,7 @@ configure_build () {
   checkStatus $? "change directory failed"
 
   # prepare build
-  LDFLAGS="-L$3/lib -lc++ -lpng -lbz2 -lz -lbrotlidec-static -lbrotlicommon-static"  ./configure --prefix="$3" --enable-static --disable-shared --disable-fontconfig --disable-dependency-tracking
+  LDFLAGS="-L$3/lib -lc++ -lpng -lbz2 -lz -lbrotlidec -lbrotlicommon"  ./configure --prefix="$3" --enable-static --disable-shared --disable-fontconfig --disable-dependency-tracking
   checkStatus $? "configuration of ${SOFTWARE} failed"
 
 }