From 80a2e0cf8764cd38a6b4783786a54d614a78243e Mon Sep 17 00:00:00 2001
From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Date: Mon, 5 Oct 2020 09:49:07 +0200
Subject: glibc: fix version 2.32 not setting correct version string

Backport change from glibc upstream that defines RELEASE as stable
instead of release. This will at least cause the default_cflags to be
set to expected default values again.

Ref issue #1396, although the bigger issue of respecting crosstool-ng
CT_GLIBC_EXTRA_CFLAGS is most likely still not fixed.

Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>

diff --git a/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch b/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch
new file mode 100644
index 0000000..e02e69b
--- /dev/null
+++ b/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch
@@ -0,0 +1,26 @@
+From 23482f788665df83edc8b542698f45fed45a2711 Mon Sep 17 00:00:00 2001
+From: Carlos O'Donell <carlos@redhat.com>
+Date: Fri, 2 Oct 2020 09:23:35 -0400
+Subject: [PATCH] Set version.h RELEASE to "stable" (Bug 26700)
+
+The RELEASE macro was accidentaly set to "release" instead of
+the expected "stable" by the release manager.  This is a mistake
+that leads to the build using "-g -O1" instead of "-g -O2" if
+configure was executed with "CFLAGS=" (CFLAGS set but empty).
+---
+ version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/version.h b/version.h
+index 83cd196798..e6ca7a8857 100644
+--- a/version.h
++++ b/version.h
+@@ -1,4 +1,4 @@
+ /* This file just defines the current version number of libc.  */
+ 
+-#define RELEASE "release"
++#define RELEASE "stable"
+ #define VERSION "2.32"
+-- 
+2.25.1
+
-- 
cgit v0.10.2-6-g49f6


From 60e782fdecff9b5ff58710716cf3e54e424e3da0 Mon Sep 17 00:00:00 2001
From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Date: Mon, 5 Oct 2020 15:35:57 +0200
Subject: glibc: set glibc build system default_cflags empty

By setting glibc build system default_cflags to be empty before
building, we will enforce the build system to only use the crosstool-ng
CFLAGS when building glibc.

Properly solves the issue identified in #1396.

Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>

diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 31fa067..ba6e548 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -314,6 +314,8 @@ glibc_backend_once()
             ;;
     esac
 
+    # Make sure glibc build system respects our provided CFLAGS.
+    extra_make_args+=( default_cflags= )
     extra_make_args+=( "BUILD_CFLAGS=${build_cflags}" )
     extra_make_args+=( "BUILD_CPPFLAGS=${build_cppflags}" )
     extra_make_args+=( "BUILD_LDFLAGS=${build_ldflags}" )
-- 
cgit v0.10.2-6-g49f6