9f6d4c3a87
For glibc 2.31.x:
- Update LICENSES file hash due to url change:
"Prefer https to http for gnu.org and fsf.org URLs"
- riscv64 does not build with kernel headers < 5.0, but upstream
has not yet comitted a single fix, neither in master nor in the
maintenance branch:
https://sourceware.org/ml/libc-alpha/2020-02/msg00018.html
For localedef 2.31.x:
- Remove upstream patch for localedef:
0003-localedef-Use-initializer-for-flexible-array-member-.patch
Note that this version bump required some patches applied on
several packages (already applied):
[Busybox] 13f2d688a2
[openssh] bad75bca31
[gcc] disable libsanitizer with gcc 7.5
See:
https://sourceware.org/legacy-ml/libc-announce/2020/msg00001.html
Tested by toolchain builder:
https://gitlab.com/kubu93/toolchains-builder/pipelines/129551000
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
Date: Mon, 21 May 2018 16:45:02 +0200
|
|
Subject: [PATCH] HACK: only build and install localedef
|
|
|
|
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch?id=47116f66f411d4dadfce42c2fdd6d41b351ccfd4
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
Rules | 14 ++++++++++----
|
|
locale/Makefile | 6 +++---
|
|
2 files changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/Rules b/Rules
|
|
index 16afa6acaa..6c208db788 100644
|
|
--- a/Rules
|
|
+++ b/Rules
|
|
@@ -190,10 +190,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
|
|
$(binaries-all-notests))
|
|
|
|
ifneq "$(strip $(binaries-shared-notests))" ""
|
|
-$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \
|
|
- $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
|
- $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
|
- $(+link)
|
|
+$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o
|
|
+ $(CC) -o $@ \
|
|
+ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
|
|
+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
|
|
+ $(filter-out $(addprefix $(csu-objpfx),start.o \
|
|
+ $(start-installed-name))\
|
|
+ $(+preinit) \
|
|
+ $(link-extra-libs) \
|
|
+ $(common-objpfx)libc% $(+postinit),$^) \
|
|
+ $(link-extra-libs)
|
|
endif
|
|
|
|
ifneq "$(strip $(binaries-shared-tests))" ""
|
|
diff --git a/locale/Makefile b/locale/Makefile
|
|
index 764e751c36..c28322d71f 100644
|
|
--- a/locale/Makefile
|
|
+++ b/locale/Makefile
|
|
@@ -32,15 +32,15 @@ categories = ctype messages monetary numeric time paper name \
|
|
address telephone measurement identification collate
|
|
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
|
|
xlocale localename global-locale coll-lookup
|
|
-others = localedef locale
|
|
+others = localedef
|
|
#others-static = localedef locale
|
|
-install-bin = localedef locale
|
|
+install-bin = localedef
|
|
extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
|
|
$(locale-modules:=.o) $(lib-modules:=.o)
|
|
generated += C-translit.h
|
|
before-compile += $(objpfx)C-translit.h
|
|
|
|
-extra-libs = libBrokenLocale
|
|
+#extra-libs = libBrokenLocale
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libBrokenLocale-routines = broken_cur_max
|
|
--
|
|
2.21.0
|
|
|