1*4882a593SmuzhiyunFrom 442e9a3f262c49cf61f9e7bdf12882f0a427666b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Michael Olbrich <m.olbrich@pengutronix.de> 3*4882a593SmuzhiyunDate: Mon, 21 May 2018 16:45:02 +0200 4*4882a593SmuzhiyunSubject: [PATCH] HACK: only build and install localedef 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch?id=47116f66f411d4dadfce42c2fdd6d41b351ccfd4 9*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun Rules | 14 ++++++++++---- 12*4882a593Smuzhiyun locale/Makefile | 6 +++--- 13*4882a593Smuzhiyun 2 files changed, 13 insertions(+), 7 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/Rules b/Rules 16*4882a593Smuzhiyunindex b1137afe71..2aeac31922 100644 17*4882a593Smuzhiyun--- a/Rules 18*4882a593Smuzhiyun+++ b/Rules 19*4882a593Smuzhiyun@@ -216,10 +216,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ 20*4882a593Smuzhiyun $(binaries-all-notests)) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun ifneq "$(strip $(binaries-shared-notests))" "" 23*4882a593Smuzhiyun-$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \ 24*4882a593Smuzhiyun- $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ 25*4882a593Smuzhiyun- $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) 26*4882a593Smuzhiyun- $(+link) 27*4882a593Smuzhiyun+$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o 28*4882a593Smuzhiyun+ $(CC) -o $@ \ 29*4882a593Smuzhiyun+ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ 30*4882a593Smuzhiyun+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ 31*4882a593Smuzhiyun+ $(filter-out $(addprefix $(csu-objpfx),start.o \ 32*4882a593Smuzhiyun+ $(start-installed-name))\ 33*4882a593Smuzhiyun+ $(+preinit) \ 34*4882a593Smuzhiyun+ $(link-extra-libs) \ 35*4882a593Smuzhiyun+ $(common-objpfx)libc% $(+postinit),$^) \ 36*4882a593Smuzhiyun+ $(link-extra-libs) 37*4882a593Smuzhiyun endif 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun ifneq "$(strip $(binaries-shared-tests))" "" 40*4882a593Smuzhiyundiff --git a/locale/Makefile b/locale/Makefile 41*4882a593Smuzhiyunindex b7c60681fa..de4cf4003f 100644 42*4882a593Smuzhiyun--- a/locale/Makefile 43*4882a593Smuzhiyun+++ b/locale/Makefile 44*4882a593Smuzhiyun@@ -33,15 +33,15 @@ categories = ctype messages monetary numeric time paper name \ 45*4882a593Smuzhiyun address telephone measurement identification collate 46*4882a593Smuzhiyun aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ 47*4882a593Smuzhiyun xlocale localename global-locale coll-lookup 48*4882a593Smuzhiyun-others = localedef locale 49*4882a593Smuzhiyun+others = localedef 50*4882a593Smuzhiyun #others-static = localedef locale 51*4882a593Smuzhiyun-install-bin = localedef locale 52*4882a593Smuzhiyun+install-bin = localedef 53*4882a593Smuzhiyun extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \ 54*4882a593Smuzhiyun $(locale-modules:=.o) $(lib-modules:=.o) 55*4882a593Smuzhiyun generated += C-translit.h 56*4882a593Smuzhiyun before-compile += $(objpfx)C-translit.h 57*4882a593Smuzhiyun 58*4882a593Smuzhiyun-extra-libs = libBrokenLocale 59*4882a593Smuzhiyun+#extra-libs = libBrokenLocale 60*4882a593Smuzhiyun extra-libs-others = $(extra-libs) 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun libBrokenLocale-routines = broken_cur_max 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun2.33.0 65*4882a593Smuzhiyun 66