summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-06-28 23:24:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-12 06:26:15 +0100
commitea74dcc0595a82798e837879963292ccce95760f (patch)
treedfaedd0a8b6bff08af9756505d8bd7c4b6447258
parent1f6bc6580c1b1be7ac68d06236c7a0a0d1d16bbb (diff)
downloadpoky-ea74dcc0595a82798e837879963292ccce95760f.tar.gz
glibc: Drop DUMMY_LOCALE_T define patch
It was needed for very old centos distros which are no longer supported (From OE-Core rev: 24663490adbb0434e810c13ab627a4903c018ca7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.34.bb1
-rw-r--r--meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch29
-rw-r--r--meta/recipes-core/glibc/glibc_2.34.bb1
3 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.34.bb b/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
index 1543b92a7e..6100f3d4c4 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
@@ -31,7 +31,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
31 file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \ 31 file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \
32 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ 32 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \
33 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ 33 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
34 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
35 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ 34 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
36" 35"
37# Makes for a rather long rev (22 characters), but... 36# Makes for a rather long rev (22 characters), but...
diff --git a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
deleted file mode 100644
index f195e07891..0000000000
--- a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 9e07bc25e344152d7bf0712152d9c5fe4abcbf46 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 20 Apr 2016 21:11:00 -0700
4Subject: [PATCH] Define DUMMY_LOCALE_T if not defined
5
6This is a hack to fix building the locale bits on an older
7CentOs 5.X machine
8
9Upstream-Status: Inappropriate [other]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 locale/programs/config.h | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/locale/programs/config.h b/locale/programs/config.h
17index 2edcf3696c..5350101e38 100644
18--- a/locale/programs/config.h
19+++ b/locale/programs/config.h
20@@ -19,6 +19,9 @@
21 #ifndef _LD_CONFIG_H
22 #define _LD_CONFIG_H 1
23
24+#ifndef DUMMY_LOCALE_T
25+#define DUMMY_LOCALE_T
26+#endif
27 /* Use the internal textdomain used for libc messages. */
28 #define PACKAGE _libc_intl_domainname
29 #ifndef VERSION
diff --git a/meta/recipes-core/glibc/glibc_2.34.bb b/meta/recipes-core/glibc/glibc_2.34.bb
index 4beeb10c29..66494c5c23 100644
--- a/meta/recipes-core/glibc/glibc_2.34.bb
+++ b/meta/recipes-core/glibc/glibc_2.34.bb
@@ -48,7 +48,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
48 file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \ 48 file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \
49 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ 49 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \
50 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ 50 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
51 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
52 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ 51 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
53 file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ 52 file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
54 file://0026-intl-Emit-no-lines-in-bison-generated-files.patch \ 53 file://0026-intl-Emit-no-lines-in-bison-generated-files.patch \