Skip to content

Commit

Permalink
abseil-cpp: Workaround FTBFS by adding -fdelete-null-pointer-checks
Browse files Browse the repository at this point in the history
Add explicit build-dep on openssf-compiler-options so that CI
orders the builds correctly.

While this fixes a FTBFS, allowing a new abseil-cpp into the
archive would trigger an issue in current versions of melange[*],
so I'm avoiding bumping the epoch at this time.

Fixes: wolfi-dev#34075

[*] chainguard-dev/melange#1651

Signed-off-by: dann frazier <[email protected]>
  • Loading branch information
dannf committed Jan 5, 2025
1 parent 12037ff commit e064c22
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion abseil-cpp.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: abseil-cpp
version: "20240722.0"
version: "20240722.0" # On update, please check if -fdelete-null-pointer-checks is still required
epoch: 0
description: Abseil Common Libraries (C++)
copyright:
Expand All @@ -16,7 +16,11 @@ environment:
- ca-certificates-bundle
- cmake
- gtest-dev
- openssf-compiler-options
- samurai
environment:
# https://github.com/wolfi-dev/os/issues/34075
CMAKE_CXX_FLAGS: -fdelete-null-pointer-checks

pipeline:
- uses: git-checkout
Expand All @@ -27,6 +31,7 @@ pipeline:

- runs: |
cmake -B build -G Ninja \
-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
Expand Down

0 comments on commit e064c22

Please sign in to comment.