git.libre-soc.org Git - buildroot.git/blob

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