From 1affc2b9d8cb5078134a0d01238a31241283290f Mon Sep 17 00:00:00 2001
From: Justin Vreeland <justin.vreeland@chainguard.com>
Date: Mon, 9 Dec 2024 07:41:38 -0800
Subject: [PATCH] glibc: verify the issue isn't openssf-copmiler-options

---
 glibc.yaml                    |  4 ++--
 openssf-compiler-options.yaml | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/glibc.yaml b/glibc.yaml
index 6cbf486083d..cbb2bcaf07a 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -44,7 +44,7 @@ environment:
       - flex
       - gawk
       - grep
-      - openssf-compiler-options
+      - openssf-compiler-options-null
       - python3
       - rdfind
       - texinfo
@@ -52,7 +52,7 @@ environment:
       - zlib
   # glibc manages FORTIFY_SOURCE on per-file basis
   environment:
-    CPPFLAGS: ""
+    GCC_SPEC_FILE: /dev/null
 
 pipeline:
   - uses: fetch
diff --git a/openssf-compiler-options.yaml b/openssf-compiler-options.yaml
index bba3bf595fb..0d65844a014 100644
--- a/openssf-compiler-options.yaml
+++ b/openssf-compiler-options.yaml
@@ -1,7 +1,7 @@
 package:
   name: openssf-compiler-options
   version: 20240627
-  epoch: 5
+  epoch: 6
   description: "Compiler Options Hardening Guide for C and C++"
   url: https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html
   copyright:
@@ -35,6 +35,15 @@ pipeline:
         done
       done
 
+subpackages:
+  - name: openssf-compiler-options-null
+    description: This package does not provide openssf options and should not be used
+    dependencies:
+      provider-priority: 0
+      provides:
+        - openssf-compiler-options
+
+
 test:
   environment:
     contents: