HACK-only-build-and-install-localedef.patch

From e0ee1ec4eccbfd91f56a8c9967cd1fb79fc4a744 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>
["fixed" a build failure after 64924422a99690d147a166b4de3103f3bf3eaf6c]
Signed-off-by: Ben Cressey <bcressey@amazon.com>
---
 Rules              | 14 ++++++++++----
 include/features.h |  2 +-
 locale/Makefile    |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Rules b/Rules
index 279ae490ac..1321956be6 100644
--- a/Rules
+++ b/Rules
@@ -221,10 +221,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/include/features.h b/include/features.h
index 7c51b4a2e4..8522197511 100644
--- a/include/features.h
+++ b/include/features.h
@@ -471,7 +471,7 @@
    to be disabled when building those functions, despite _GNU_SOURCE
    being defined.  */
 #if __GLIBC_USE (ISOC2X)
-# define __GLIBC_USE_C2X_STRTOL 1
+# define __GLIBC_USE_C2X_STRTOL 0
 #else
 # define __GLIBC_USE_C2X_STRTOL 0
 #endif
diff --git a/locale/Makefile b/locale/Makefile
index d7036b0855..68afdddc7f 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -33,15 +33,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.40.1