From b90ae9abee7e5cc3a92b053f00db959c853a745e Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 21 May 2018 16:45:02 +0200 Subject: [PATCH] HACK: only build and install localedef Signed-off-by: Michael Olbrich 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 [Romain: rebase on 2.38] Signed-off-by: Romain Naour [yann.morin.1998@free.fr: rebase for 2.39] Signed-off-by: Yann E. MORIN --- Rules | 14 ++++++++++---- locale/Makefile | 3 --- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Rules b/Rules index c8adc00008..4acf69790f 100644 --- a/Rules +++ b/Rules @@ -234,10 +234,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 9d9c1a7691..4d26032c15 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -76,7 +76,6 @@ aux = \ xlocale \ # aux others = \ - locale \ localedef \ # others #others-static = \ @@ -84,7 +83,6 @@ others = \ # locale \ # # others-static install-bin = \ - locale \ localedef \ # install-bin extra-objs = \ @@ -96,7 +94,6 @@ extra-objs = \ generated += C-translit.h before-compile += $(objpfx)C-translit.h -extra-libs = libBrokenLocale extra-libs-others = $(extra-libs) libBrokenLocale-routines = broken_cur_max -- 2.48.1