From 31ed18d3126132a55a46daa122ea55258fc22307 Mon Sep 17 00:00:00 2001 From: lwthiker Date: Sun, 17 Apr 2022 17:22:39 +0300 Subject: [PATCH] Change libbrotli compilation flags for macOS macOS doesn't support the '-Bstatic' flag. Remove it as it is not really needed (the linker will find the static libraries by their name). --- chrome/patches/curl-impersonate.patch | 4 ++-- firefox/patches/curl-impersonate.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/patches/curl-impersonate.patch b/chrome/patches/curl-impersonate.patch index 33de539..fa77f32 100644 --- a/chrome/patches/curl-impersonate.patch +++ b/chrome/patches/curl-impersonate.patch @@ -19,7 +19,7 @@ index 3e55230ee..e3ea22b96 100644 # List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files include lib/Makefile.inc diff --git a/configure.ac b/configure.ac -index 63e320236..8c41e8501 100644 +index 63e320236..86ab654c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1331,7 +1331,8 @@ if test X"$OPT_BROTLI" != Xno; then @@ -28,7 +28,7 @@ index 63e320236..8c41e8501 100644 if test -n "$PREFIX_BROTLI"; then - LIB_BROTLI="-lbrotlidec" + # curl-impersonate: Use static libbrotli -+ LIB_BROTLI="-Wl,-Bstatic -lbrotlidec-static -lbrotlicommon-static -Wl,-Bdynamic" ++ LIB_BROTLI="-lbrotlidec-static -lbrotlicommon-static" LD_BROTLI=-L${PREFIX_BROTLI}/lib$libsuff CPP_BROTLI=-I${PREFIX_BROTLI}/include DIR_BROTLI=${PREFIX_BROTLI}/lib$libsuff diff --git a/firefox/patches/curl-impersonate.patch b/firefox/patches/curl-impersonate.patch index 3d81794..d89fc1c 100644 --- a/firefox/patches/curl-impersonate.patch +++ b/firefox/patches/curl-impersonate.patch @@ -19,7 +19,7 @@ index 3e55230ee..90b504b5c 100644 # List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files include lib/Makefile.inc diff --git a/configure.ac b/configure.ac -index 63e320236..238addfaa 100644 +index 63e320236..40f67f137 100644 --- a/configure.ac +++ b/configure.ac @@ -1331,7 +1331,8 @@ if test X"$OPT_BROTLI" != Xno; then @@ -28,7 +28,7 @@ index 63e320236..238addfaa 100644 if test -n "$PREFIX_BROTLI"; then - LIB_BROTLI="-lbrotlidec" + # curl-impersonate: Use static libbrotli -+ LIB_BROTLI="-Wl,-Bstatic -lbrotlidec-static -lbrotlicommon-static -Wl,-Bdynamic" ++ LIB_BROTLI="-lbrotlidec-static -lbrotlicommon-static" LD_BROTLI=-L${PREFIX_BROTLI}/lib$libsuff CPP_BROTLI=-I${PREFIX_BROTLI}/include DIR_BROTLI=${PREFIX_BROTLI}/lib$libsuff