From 98feb26b794e31e87c58101fc7a659166dbb7e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Tue, 21 Nov 2023 20:18:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96brotli=E5=8E=8B=E7=BC=A9?= =?UTF-8?q?=E5=92=8C=E8=A7=A3=E5=8E=8B=E7=BC=A9=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/build.sh | 4 ++-- internal/compressions/reader_brotli.go | 1 + internal/compressions/writer_brotli.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/build.sh b/build/build.sh index cd0f9e4..ab708d5 100755 --- a/build/build.sh +++ b/build/build.sh @@ -123,8 +123,8 @@ function build() { # libpcap if [ "$OS" == "linux" ] && [[ "$ARCH" == "amd64" || "$ARCH" == "arm64" ]] && [ "$TAG" == "plus" ]; then - CGO_LDFLAGS="-L${SRCDIR}/libs/libpcap/${ARCH} -lpcap" - CGO_CFLAGS="-I${SRCDIR}/libs/libpcap/src/libpcap -I${SRCDIR}/libs/libpcap/src/libpcap/pcap" + CGO_LDFLAGS="-L${SRCDIR}/libs/libpcap/${ARCH} -lpcap -L${SRCDIR}/libs/libbrotli/${ARCH} -lbrotlienc -lbrotlidec -lbrotlicommon" + CGO_CFLAGS="-I${SRCDIR}/libs/libpcap/src/libpcap -I${SRCDIR}/libs/libpcap/src/libpcap/pcap -I${SRCDIR}/libs/libbrotli/src/brotli/c/include" fi if [ ! -z $CC_PATH ]; then diff --git a/internal/compressions/reader_brotli.go b/internal/compressions/reader_brotli.go index 936d296..da3d6f6 100644 --- a/internal/compressions/reader_brotli.go +++ b/internal/compressions/reader_brotli.go @@ -1,4 +1,5 @@ // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +//go:build !plus || !linux package compressions diff --git a/internal/compressions/writer_brotli.go b/internal/compressions/writer_brotli.go index d5eb938..79c8ab0 100644 --- a/internal/compressions/writer_brotli.go +++ b/internal/compressions/writer_brotli.go @@ -1,4 +1,5 @@ // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +//go:build !plus || !linux package compressions @@ -27,7 +28,7 @@ func newBrotliWriter(writer io.Writer, level int) (*BrotliWriter, error) { return &BrotliWriter{ writer: brotli.NewWriterOptions(writer, brotli.WriterOptions{ Quality: level, - LGWin: 13, // TODO 在全局设置里可以设置此值 + LGWin: 14, // TODO 在全局设置里可以设置此值 }), level: level, }, nil