Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use /usr/bin/localedef during qemu builds
Enabler for accelerating glibc build with sb2. Signed-off-by: Juha Kallioinen <juha.kallioinen@jollamobile.com> Change-Id: Id037b0b356b2eb10f9a05f44d2f936d663599296
- Loading branch information
Showing
3 changed files
with
48 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff -Naur eglibc-2.15.old/localedata/Makefile eglibc-2.15/localedata/Makefile | ||
--- eglibc-2.15.old/localedata/Makefile 2011-11-17 21:56:08.000000000 +0000 | ||
+++ eglibc-2.15/localedata/Makefile 2013-03-18 15:25:40.078955980 +0000 | ||
@@ -159,7 +159,11 @@ | ||
# Dependency for the locale files. We actually make it depend only on | ||
# one of the files. | ||
$(addprefix $(objpfx),$(CTYPE_FILES)): %: \ | ||
- gen-locale.sh $(common-objpfx)locale/localedef Makefile \ | ||
+ if [ -f /usr/bin/localedef ]; then \ | ||
+ gen-locale.sh /usr/bin/localedef Makefile \ | ||
+ else \ | ||
+ gen-locale.sh $(common-objpfx)locale/localedef Makefile \ | ||
+ fi\ | ||
$(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS)) | ||
@$(SHELL) -e gen-locale.sh $(common-objpfx) \ | ||
'$(if $(cross-localedef), \ | ||
@@ -235,8 +239,12 @@ | ||
INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) | ||
|
||
# Sometimes the whole collection of locale files should be installed. | ||
-LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ | ||
-$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef | ||
+ifeq (,$(wildcard /usr/bin/localedef)) | ||
+LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C $(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef | ||
+else | ||
+LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C /usr/bin/localedef | ||
+endif | ||
+ | ||
install-locales: $(INSTALL-SUPPORTED-LOCALES) | ||
|
||
install-locales-dir: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters