f8546e8367
This release adds a lot of bugfixes for x86_64 and aarch64. It integrates gettext-tiny useful to be used with libintl stub. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 01e9f2f202a0afc658bfd82c0ff1770de7900bb1 Mon Sep 17 00:00:00 2001
|
|
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
|
Date: Mon, 5 Mar 2018 20:29:56 +0100
|
|
Subject: [PATCH] utils: fix compile of msgfmt/msgmerge
|
|
|
|
The host utils are missing the dependencies, the target
|
|
utils need libiconv enabled.
|
|
|
|
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
|
---
|
|
utils/Makefile.in | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/utils/Makefile.in b/utils/Makefile.in
|
|
index 99241845f..2f8d1c96a 100644
|
|
--- a/utils/Makefile.in
|
|
+++ b/utils/Makefile.in
|
|
@@ -83,7 +83,9 @@ utils_OUT := $(top_builddir)utils
|
|
DEPS-ldconfig := $(utils_DIR)/chroot_realpath.c
|
|
DEPS-ldconfig.host := $(DEPS-ldconfig)
|
|
DEPS-msgfmt := $(utils_DIR)/poparser.c $(utils_DIR)/StringEscape.c
|
|
+DEPS-msgfmt.host := $(DEPS-msgfmt)
|
|
DEPS-msgmerge := $(utils_DIR)/poparser.c $(utils_DIR)/StringEscape.c
|
|
+DEPS-msgmerge.host := $(DEPS-msgmerge)
|
|
|
|
utils_OBJ := getconf
|
|
ifeq ($(HAVE_SHARED),y)
|
|
@@ -96,7 +98,7 @@ utils_OBJ += iconv
|
|
utils_LOCALE_OBJ += $(utils_OUT)/locale
|
|
endif
|
|
|
|
-ifeq ($(UCLIBC_HAS_LIBINTL),y)
|
|
+ifeq ($(UCLIBC_HAS_LIBINTL)$(UCLIBC_HAS_LIBICONV),yy)
|
|
utils_OBJ += msgfmt msgmerge
|
|
endif
|
|
|
|
@@ -141,7 +143,7 @@ ifeq ($(UCLIBC_HAS_LOCALE),y)
|
|
$(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
|
|
$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
|
|
endif
|
|
-ifeq ($(UCLIBC_HAS_LIBINTL),y)
|
|
+ifeq ($(UCLIBC_HAS_LIBINTL)$(UCLIBC_HAS_LIBICONV),yy)
|
|
$(Q)$(INSTALL) -m 755 $(utils_OUT)/msgmerge$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/msgmerge
|
|
$(Q)$(INSTALL) -m 755 $(utils_OUT)/msgfmt$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/msgfmt
|
|
$(Q)$(INSTALL) -m 755 $(utils_OUT)/xgettext $(PREFIX)$(DEVEL_PREFIX)bin
|
|
--
|
|
2.16.1
|
|
|