summaryrefslogtreecommitdiffstats
path: root/package/uclibc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-09-29 12:43:55 +0200
committerPeter Korsgaard <peter@korsgaard.com>2016-09-30 11:34:51 +0200
commitfa280211bca2c5e8cf0ccb6e6931f3cda9d9d861 (patch)
treeef3120933f715a0028f2a048dcffa0d10574a6e5 /package/uclibc
parent1495e72d587d02a8e18ccef028eddcd0a6de70e2 (diff)
downloadbuildroot-fa280211bca2c5e8cf0ccb6e6931f3cda9d9d861.tar.gz
buildroot-fa280211bca2c5e8cf0ccb6e6931f3cda9d9d861.zip
uclibc: fix compile if locales are enabled
Reported via #buildroot, the newly activated locale tool should only build for the target, not for the host. Fix from upstream. Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> Tested-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/uclibc')
-rw-r--r--package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch b/package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch
new file mode 100644
index 0000000000..a04c6c6338
--- /dev/null
+++ b/package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch
@@ -0,0 +1,48 @@
+From 8c53e7524dfb9127b006e773307fdaa4df899a04 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@uclibc-ng.org>
+Date: Thu, 29 Sep 2016 11:40:52 +0200
+Subject: [PATCH] locale: remove building for the host, as it breaks
+
+Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
+---
+ utils/Makefile.in | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/utils/Makefile.in b/utils/Makefile.in
+index 5457776..8666f89 100644
+--- a/utils/Makefile.in
++++ b/utils/Makefile.in
+@@ -64,10 +64,6 @@ BUILD_CFLAGS-ldd.host := \
+ -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
+ -I$(top_srcdir)ldso/include \
+ -include $(top_srcdir)include/elf.h
+-BUILD_CFLAGS-locale.host := \
+- -DNOT_IN_libc \
+- -I$(top_srcdir)utils/ \
+- -I.
+ BUILD_CFLAGS-iconv.host := \
+ -include $(top_builddir)extra/locale/c8tables.h \
+ -I$(top_srcdir)libc/misc/wchar -DL_iconv_main
+@@ -97,7 +93,6 @@ endif
+ utils_OBJ := $(patsubst %,$(utils_OUT)/%,$(utils_OBJ))
+
+ hostutils_OBJ := $(patsubst %,%.host,$(utils_OBJ))
+-hostutils_LOCALE_OBJ := $(patsubst %,%.host,$(utils_LOCALE_OBJ))
+
+ utils: $(utils_OBJ) $(utils_LOCALE_OBJ)
+
+@@ -109,10 +104,7 @@ $(utils_OBJ): $(utils_OUT)/% : $(utils_DIR)/%.c | $(libc)
+ $(utils_OUT)/locale: $(top_srcdir)extra/locale/programs/locale.c | $(libc)
+ $(compile.u)
+
+-$(utils_OUT)/locale.host: $(top_srcdir)extra/locale/programs/locale.c | $(libc)
+- $(hcompile.u)
+-
+-hostutils: $(hostutils_OBJ) $(hostutils_LOCALE_OBJ)
++hostutils: $(hostutils_OBJ)
+
+ $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c
+ $(hcompile.u)
+--
+2.1.4
+
OpenPOWER on IntegriCloud