diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2020-10-06 06:37:29 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-10-06 06:37:29 (GMT) |
| commit | 364ed7aa96905920649d8be1455f136631f6cf5c (patch) | |
| tree | 322606b766b12c9322f9675bb2c471edd2553875 | |
| parent | b3ed2c40d37cf7d5c2143307286f5d9557ed2df3 (diff) | |
| parent | 60e782fdecff9b5ff58710716cf3e54e424e3da0 (diff) | |
Merge pull request #1398 from egtvedt/fix-glibc-2.32-version.h
glibc: fix version 2.32 not setting correct version string
| -rw-r--r-- | packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch | 26 | ||||
| -rw-r--r-- | scripts/build/libc/glibc.sh | 2 |
2 files changed, 28 insertions, 0 deletions
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 + 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}" ) |