glibc: verify the issue isn't openssf-copmiler-options

wolfi-dev · Dec 9, 2024 · 1affc2b · 1affc2b
1 parent 6828b6a
commit 1affc2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/glibc.yaml b/glibc.yaml
@@ -44,15 +44,15 @@ environment:
       - flex
       - gawk
       - grep
-      - openssf-compiler-options
+      - openssf-compiler-options-null
       - python3
       - rdfind
       - texinfo
       - wolfi-baselayout
       - 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
@@ -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: