Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to brotli v1.1.0 #2625

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Update to brotli v1.1.0 #2625

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7046e54
Update to brotli v1.1.0
eljobe Sep 2, 2024
b39baf7
Merge branch 'master' into brot-up
eljobe Sep 3, 2024
731e41d
Merge branch 'master' into brot-up
eljobe Sep 4, 2024
1a58157
Merge branch 'master' into brot-up
eljobe Sep 6, 2024
bc22eac
Merge branch 'master' into brot-up
eljobe Sep 19, 2024
e05948d
Merge branch 'master' into brot-up
eljobe Sep 24, 2024
ab082be
Merge branch 'master' into brot-up
eljobe Sep 25, 2024
643b1e5
Merge branch 'master' into brot-up
eljobe Oct 3, 2024
6997751
Merge branch 'master' into brot-up
eljobe Oct 3, 2024
6b9ff90
Merge branch 'master' into brot-up
eljobe Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/arbitrator-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ jobs:
path: |
target/include/brotli/
target/lib-wasm/
target/lib/libbrotlicommon-static.a
target/lib/libbrotlienc-static.a
target/lib/libbrotlidec-static.a
target/lib/libbrotlicommon.a
target/lib/libbrotlienc.a
target/lib/libbrotlidec.a
key: ${{ runner.os }}-brotli-3-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
restore-keys: ${{ runner.os }}-brotli-2-

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ jobs:
path: |
target/include/brotli/
target/lib-wasm/
target/lib/libbrotlicommon-static.a
target/lib/libbrotlienc-static.a
target/lib/libbrotlidec-static.a
target/lib/libbrotlicommon.a
target/lib/libbrotlienc.a
target/lib/libbrotlidec.a
key: ${{ runner.os }}-brotli-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}-${{ matrix.test-mode }}
restore-keys: ${{ runner.os }}-brotli-

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ jobs:
path: |
target/include/brotli/
target/lib-wasm/
target/lib/libbrotlicommon-static.a
target/lib/libbrotlienc-static.a
target/lib/libbrotlidec-static.a
target/lib/libbrotlicommon.a
target/lib/libbrotlienc.a
target/lib/libbrotlidec.a
key: ${{ runner.os }}-brotli-3a-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
restore-keys: ${{ runner.os }}-brotli-

Expand Down
13 changes: 7 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ clean:
rm -f arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/*.o
rm -f arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/*.a
rm -f arbitrator/wasm-libraries/forward/*.wat
rm -rf brotli/buildfiles
rm -rf arbitrator/stylus/tests/*/target/ arbitrator/stylus/tests/*/*.wasm
@rm -rf contracts/build contracts/cache solgen/go/
@rm -f .make/*
Expand Down Expand Up @@ -566,15 +567,15 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(prover_bin)
.make/cbrotli-lib: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make
test -f target/include/brotli/encode.h || ./scripts/build-brotli.sh -l
test -f target/include/brotli/decode.h || ./scripts/build-brotli.sh -l
test -f target/lib/libbrotlicommon-static.a || ./scripts/build-brotli.sh -l
test -f target/lib/libbrotlienc-static.a || ./scripts/build-brotli.sh -l
test -f target/lib/libbrotlidec-static.a || ./scripts/build-brotli.sh -l
test -f target/lib/libbrotlicommon.a || ./scripts/build-brotli.sh -l
test -f target/lib/libbrotlienc.a || ./scripts/build-brotli.sh -l
test -f target/lib/libbrotlidec.a || ./scripts/build-brotli.sh -l
@touch $@

.make/cbrotli-wasm: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make
test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlicommon.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlienc.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlidec.a || ./scripts/build-brotli.sh -w -d
@touch $@

.make/wasm-lib: $(DEP_PREDICATE) arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a $(ORDER_ONLY_PREDICATE) .make
Expand Down
6 changes: 3 additions & 3 deletions arbitrator/brotli/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn main() {
println!("cargo:rustc-link-search=../target/lib/");
println!("cargo:rustc-link-search=../../target/lib/");
}
println!("cargo:rustc-link-lib=static=brotlienc-static");
println!("cargo:rustc-link-lib=static=brotlidec-static");
println!("cargo:rustc-link-lib=static=brotlicommon-static");
println!("cargo:rustc-link-lib=static=brotlienc");
println!("cargo:rustc-link-lib=static=brotlidec");
println!("cargo:rustc-link-lib=static=brotlicommon");
}
6 changes: 3 additions & 3 deletions arbitrator/wasm-libraries/arbcompress/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ fn main() {
// Tell Cargo that if the given file changes, to rerun this build script.
println!("cargo:rustc-link-search=../../target/lib-wasm/");
println!("cargo:rustc-link-search=../target/lib/");
println!("cargo:rustc-link-lib=static=brotlienc-static");
println!("cargo:rustc-link-lib=static=brotlidec-static");
println!("cargo:rustc-link-lib=static=brotlicommon-static");
println!("cargo:rustc-link-lib=static=brotlienc");
println!("cargo:rustc-link-lib=static=brotlidec");
println!("cargo:rustc-link-lib=static=brotlicommon");
}
2 changes: 1 addition & 1 deletion brotli
Open in desktop
Submodule brotli updated 168 files
4 changes: 2 additions & 2 deletions scripts/build-brotli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ if $BUILD_WASM; then
mkdir -p buildfiles/install-wasm
TEMP_INSTALL_DIR_ABS=`cd -P buildfiles/install-wasm; pwd`
cd buildfiles/build-wasm
cmake ../../ -DCMAKE_C_COMPILER=emcc -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX="$TEMP_INSTALL_DIR_ABS" -DCMAKE_AR=`which emar` -DCMAKE_RANLIB=`which touch`
cmake ../../ -DCMAKE_C_COMPILER=emcc -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX="$TEMP_INSTALL_DIR_ABS" -DCMAKE_AR=`which emar` -DCMAKE_RANLIB=`which touch` -DBUILD_SHARED_LIBS=OFF
make -j
make install
cp -rv "$TEMP_INSTALL_DIR_ABS/lib" "$TARGET_DIR_ABS/lib-wasm"
Expand All @@ -106,7 +106,7 @@ fi
if $BUILD_LOCAL; then
mkdir -p buildfiles/build-local
cd buildfiles/build-local
cmake ../../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$TARGET_DIR_ABS"
cmake ../../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$TARGET_DIR_ABS" -DBUILD_SHARED_LIBS=OFF
make -j
make install
cd ..
Expand Down
Loading