From 05f5b08ad045e5e2423c8cac03a4a8ecfae35542 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 11:54:47 +0000 Subject: [PATCH] chore(deps): Bump hs-apigen from `079c186` to `4431630` Bumps [hs-apigen](https://github.com/TokTok/hs-apigen) from `079c186` to `4431630`. - [Release notes](https://github.com/TokTok/hs-apigen/releases) - [Commits](https://github.com/TokTok/hs-apigen/compare/079c186ec413582dd3f3e6173a13a2471116f90c...44316307ed3abb8deb8b010bdc5935b96d637690) --- updated-dependencies: - dependency-name: hs-apigen dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .bazelrc | 43 +++++++++++++++++++++++++++++++++++----- .github/workflows/ci.yml | 2 ++ WORKSPACE | 13 ++++++++++++ hs-apigen | 2 +- third_party/pcre.BUILD | 15 ++++++++++++++ 5 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 third_party/pcre.BUILD diff --git a/.bazelrc b/.bazelrc index ab22ab1f..cc51915e 100644 --- a/.bazelrc +++ b/.bazelrc @@ -122,6 +122,7 @@ build --host_linkopt='-Wl,--warn-execstack' build:local --linkopt='-Wl,--fatal-warnings' build:local --host_linkopt='-Wl,--fatal-warnings' +build:local --linkopt='-fuse-ld=mold' build:strict --linkopt='-Wl,--detect-odr-violations' build:strict --host_linkopt='-Wl,--detect-odr-violations' @@ -181,6 +182,7 @@ build:asan-libfuzzer --@rules_fuzzing//fuzzing:cc_engine_sanitizer=asan build:sanitizer --config=debug build:sanitizer --copt='-UNDEBUG' build:sanitizer --copt='-O3' +build:sanitizer --per_file_copt='//cyclone[:/]@-O0' build:sanitizer --per_file_copt='//c-toxcore[:/]@-O0' build:sanitizer --per_file_copt='//c-toxcore[:/]@-fno-inline,-fno-omit-frame-pointer' build:sanitizer --flaky_test_attempts=1 @@ -216,11 +218,14 @@ build:tsan --test_env=TSAN_OPTIONS=color=always,history_size=7,force_seq_cst_ato build:ubsan --config=sanitizer build:ubsan --features=ubsan -build:ubsan --copt='-fsanitize=nullability,undefined' -#build:ubsan --per_file_copt='//c-toxcore[:/]@-fsanitize=integer' -build:ubsan --copt='-fno-sanitize-recover=all' -build:ubsan --copt='-fno-sanitize-trap=all' -build:ubsan --linkopt='-fsanitize=integer,nullability,undefined' +build:ubsan --copt='-fsanitize=nullability,undefined' +build:ubsan --host_copt='-fsanitize=nullability,undefined' +build:ubsan --copt='-fno-sanitize-recover=all' +build:ubsan --host_copt='-fno-sanitize-recover=all' +build:ubsan --copt='-fno-sanitize-trap=all' +build:ubsan --host_copt='-fno-sanitize-trap=all' +build:ubsan --linkopt='-fsanitize=nullability,undefined' +build:ubsan --host_linkopt='-fsanitize=nullability,undefined' # https://github.com/bazelbuild/bazel/issues/11122 build:ubsan --linkopt='-fsanitize-link-c++-runtime' build:ubsan --per_file_copt='//c-toxcore[:/]@-D_DEBUG' @@ -365,6 +370,34 @@ build:c-as-cpp --per_file_copt='//c-toxcore[:/]@-Wno-old-style-cast' build:c-as-cpp --per_file_copt='//c-toxcore[:/]@-Wno-unreachable-code-return' build:c-as-cpp --per_file_copt='//c-toxcore[:/]@-Wno-unused-macros' +# Cyclone. +build --per_file_copt='//cyclone[:/]@-fno-sanitize=undefined' +build --per_file_copt='//cyclone[:/]@-Wno-bad-function-cast' +build --per_file_copt='//cyclone[:/]@-Wno-c++-compat' +build --per_file_copt='//cyclone[:/]@-Wno-c2x-compat' +build --per_file_copt='//cyclone[:/]@-Wno-cast-align' +build --per_file_copt='//cyclone[:/]@-Wno-cast-function-type' +build --per_file_copt='//cyclone[:/]@-Wno-cast-qual' +build --per_file_copt='//cyclone[:/]@-Wno-double-promotion' +build --per_file_copt='//cyclone[:/]@-Wno-float-equal' +build --per_file_copt='//cyclone[:/]@-Wno-incompatible-function-pointer-types' +build --per_file_copt='//cyclone[:/]@-Wno-missing-prototypes' +build --per_file_copt='//cyclone[:/]@-Wno-missing-variable-declarations' +build --per_file_copt='//cyclone[:/]@-Wno-pedantic' +build --per_file_copt='//cyclone[:/]@-Wno-sign-compare' +build --per_file_copt='//cyclone[:/]@-Wno-strict-prototypes' +build --per_file_copt='//cyclone[:/]@-Wno-switch-enum' +build --per_file_copt='//cyclone[:/]@-Wno-undef' +build --per_file_copt='//cyclone[:/]@-Wno-unreachable-code-break' +build --per_file_copt='//cyclone[:/]@-Wno-unreachable-code' +build --per_file_copt='//cyclone[:/]@-Wno-unused-but-set-variable' +build --per_file_copt='//cyclone[:/]@-Wno-unused-function' +build --per_file_copt='//cyclone[:/]@-Wno-unused-macros' +build --per_file_copt='//cyclone[:/]@-Wno-unused-variable' +build --per_file_copt='//cyclone[:/]@-Wno-variadic-macros' + +build --host_per_file_copt='//cyclone[:/]@-Wno-incompatible-function-pointer-types' + # Cython code isn't very clean. build --per_file_copt='//py_toxcore_c[:/]@-Wno-cast-align' build --per_file_copt='//py_toxcore_c[:/]@-Wno-cast-function-type-strict' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3bfa901..8d2c0af4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,6 +103,8 @@ jobs: . "$HOME/.nix-profile/etc/profile.d/nix.sh" nix-channel --add https://github.com/NixOS/nixpkgs/archive/a81bbdfb658428a45c69a42aa73d4bd18127c467.tar.gz nixpkgs nix-channel --update + - name: Install mold + run: sudo apt-get install mold - name: Build run: | . /home/runner/.nix-profile/etc/profile.d/nix.sh diff --git a/WORKSPACE b/WORKSPACE index acda605b..8ef0c522 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -549,6 +549,19 @@ nixpkgs_package( repository = "@nixpkgs", ) +nixpkgs_package( + name = "pcre.out", + attribute_path = "pcre.out", + repository = "@nixpkgs", +) + +nixpkgs_package( + name = "pcre", + attribute_path = "pcre.dev", + build_file = "@toktok//third_party:pcre.BUILD", + repository = "@nixpkgs", +) + nixpkgs_package( name = "gl.out", attribute_path = "libGL.out", diff --git a/hs-apigen b/hs-apigen index 079c186e..44316307 160000 --- a/hs-apigen +++ b/hs-apigen @@ -1 +1 @@ -Subproject commit 079c186ec413582dd3f3e6173a13a2471116f90c +Subproject commit 44316307ed3abb8deb8b010bdc5935b96d637690 diff --git a/third_party/pcre.BUILD b/third_party/pcre.BUILD new file mode 100644 index 00000000..f87545a1 --- /dev/null +++ b/third_party/pcre.BUILD @@ -0,0 +1,15 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + +filegroup( + name = "include", + srcs = ["include/pcre.h"], + visibility = ["//visibility:public"], +) + +cc_library( + name = "pcre", + srcs = ["@pcre.out//:lib"], + hdrs = ["include/pcre.h"], + strip_include_prefix = "include", + visibility = ["//visibility:public"], +)