0001-HACK-only-build-and-install-localedef.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. From bd5a87ea4a0cc0ba393a16bbeb166903e4085e8b 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. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  6. Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch?id=47116f66f411d4dadfce42c2fdd6d41b351ccfd4
  7. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  8. [Romain: rebase on 2.38]
  9. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  10. ---
  11. Rules | 14 ++++++++++----
  12. locale/Makefile | 6 +++---
  13. 2 files changed, 13 insertions(+), 7 deletions(-)
  14. diff --git a/Rules b/Rules
  15. index 279ae490ac..1321956be6 100644
  16. --- a/Rules
  17. +++ b/Rules
  18. @@ -221,10 +221,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
  19. $(binaries-all-notests))
  20. ifneq "$(strip $(binaries-shared-notests))" ""
  21. -$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \
  22. - $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
  23. - $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
  24. - $(+link)
  25. +$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o
  26. + $(CC) -o $@ \
  27. + $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
  28. + $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
  29. + $(filter-out $(addprefix $(csu-objpfx),start.o \
  30. + $(start-installed-name))\
  31. + $(+preinit) \
  32. + $(link-extra-libs) \
  33. + $(common-objpfx)libc% $(+postinit),$^) \
  34. + $(link-extra-libs)
  35. endif
  36. ifneq "$(strip $(binaries-shared-tests))" ""
  37. diff --git a/locale/Makefile b/locale/Makefile
  38. index d7036b0855..68afdddc7f 100644
  39. --- a/locale/Makefile
  40. +++ b/locale/Makefile
  41. @@ -33,15 +33,15 @@ categories = ctype messages monetary numeric time paper name \
  42. address telephone measurement identification collate
  43. aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
  44. xlocale localename global-locale coll-lookup
  45. -others = localedef locale
  46. +others = localedef
  47. #others-static = localedef locale
  48. -install-bin = localedef locale
  49. +install-bin = localedef
  50. extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
  51. $(locale-modules:=.o) $(lib-modules:=.o)
  52. generated += C-translit.h
  53. before-compile += $(objpfx)C-translit.h
  54. -extra-libs = libBrokenLocale
  55. +#extra-libs = libBrokenLocale
  56. extra-libs-others = $(extra-libs)
  57. libBrokenLocale-routines = broken_cur_max
  58. --
  59. 2.41.0