6fbdf51596
Parallelizes locale generation based on `BR2_JLEVEL` setting. Locale generation always runs during the finalize stage and can consume a significant amount of time. Parallelizing it greatly reduces that time on multi-core machines. To parallelize it, we first invoke `localedef` for every locale in parallel with the `--no-archive` option. This creates the intermediate locale data instead of writing to the finally archive directly. Then, we invoke `localedef` again once to create the archive from the intermediate compiled locale data files. We have to do it this way because `localedef` does not do any locking when writing to the archive file, so calling it without `--no-archive` concurrently could result in a corrupt archive file or an archive file that is missing some locales. While we're at it, make two additional improvements: - Remove locale-archive before adding to it. Otherwise, repeated applications of target-finalize will keep on growing the file. - Sort the locales when creating locale-archive so its contents are reproducible. We use `find` to collect the installed locales rather than LOCALES. This makes it possible for something else (skeleton, overlay, custom package) to create and install additional locales and still have them added to locale-archive. Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com> [Arnout: - Remove -j$(PARALLEL_JOBS), it's already part of $(MAKE) - Remove HOST_DIR, TARGET_DIR, STAGING_DIR, they're already exported - Extend commit message ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
42 lines
1.2 KiB
Makefile
42 lines
1.2 KiB
Makefile
# Generates glibc locale data for target.
|
|
|
|
inputfile = $(firstword $(subst ., ,$(1)))
|
|
charmap = $(or $(word 2,$(subst ., ,$(1))),UTF-8)
|
|
|
|
# Packages all the generated locale data into the final archive.
|
|
#
|
|
# We sort the file names to produce consistent output regardless of
|
|
# the `find` outputs order.
|
|
$(TARGET_DIR)/usr/lib/locale/locale-archive: $(LOCALES)
|
|
$(Q)rm -f $(@)
|
|
$(Q)find $(TARGET_DIR)/usr/lib/locale/ -maxdepth 1 -mindepth 1 -type d -print0 \
|
|
| sort -z \
|
|
| xargs -0 \
|
|
$(HOST_DIR)/bin/localedef \
|
|
--prefix=$(TARGET_DIR) \
|
|
--$(ENDIAN)-endian \
|
|
--add-to-archive
|
|
|
|
# Generates locale data for each locale.
|
|
#
|
|
# The input data comes preferably from the toolchain, or if the toolchain
|
|
# does not have them (Linaro toolchains), we use the ones available on the
|
|
# host machine.
|
|
#
|
|
# Uses `localedef`, which is built by the `host-localedef` package.
|
|
$(LOCALES): | $(TARGET_DIR)/usr/lib/locale/
|
|
$(Q)echo "Generating locale $(@)"
|
|
$(Q)I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
|
|
$(HOST_DIR)/bin/localedef \
|
|
--prefix=$(TARGET_DIR) \
|
|
--$(ENDIAN)-endian \
|
|
--no-archive \
|
|
-i $(call inputfile,$(@)) \
|
|
-f $(call charmap,$(@)) \
|
|
$(@)
|
|
|
|
.PHONY: $(LOCALES)
|
|
|
|
$(TARGET_DIR)/usr/lib/locale/:
|
|
$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
|