From 867caf1e7f0273850957e3ec9f4234841fe07fbf Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Fri, 24 Jan 2025 19:01:50 +0000
Subject: [PATCH] re2: Fix ftbfs and uncomment pkgconf test

Fixes: #38660

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 re2.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/re2.yaml b/re2.yaml
index 235eb424a57..acb27527bab 100644
--- a/re2.yaml
+++ b/re2.yaml
@@ -1,7 +1,7 @@
 package:
   name: re2
-  version: "2024.02.01" # Please enable the pkgconf test on update
-  epoch: 2
+  version: "2024.02.01" # On update, please check if -fdelete-null-pointer-checks is still required
+  epoch: 3
   description: Efficient, principled regular expression library
   copyright:
     - license: BSD-3-Clause
@@ -22,6 +22,9 @@ environment:
       - busybox
       - ca-certificates-bundle
       - icu-dev
+  environment:
+    # https://github.com/wolfi-dev/os/issues/34075
+    CMAKE_CXX_FLAGS: -fdelete-null-pointer-checks
 
 pipeline:
   - uses: fetch
@@ -33,6 +36,7 @@ pipeline:
     with:
       opts: |
         -DBUILD_SHARED_LIBS=ON \
+        -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \
         -DRE2_USE_ICU=ON \
         -DRE2_BUILD_TESTING="OFF"
 
@@ -43,9 +47,6 @@ pipeline:
   - uses: strip
 
 subpackages:
-  #   test:
-  #     pipeline:
-  #       - uses: test/pkgconf:
   - name: re2-dev
     pipeline:
       - uses: split/dev
@@ -54,6 +55,9 @@ subpackages:
       runtime:
         - abseil-cpp-dev
         - icu-dev
+    test:
+      pipeline:
+        - uses: test/pkgconf
 
 update:
   enabled: true