diff options
| -rw-r--r-- | Config.in | 5 | ||||
| -rw-r--r-- | package/systemd/Config.in | 1 | ||||
| -rw-r--r-- | package/systemd/systemd.mk | 10 | ||||
| -rwxr-xr-x | support/dependencies/dependencies.sh | 13 |
4 files changed, 25 insertions, 4 deletions
@@ -94,6 +94,11 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER config BR2_NEEDS_HOST_UTF8_LOCALE bool +# Hidden boolean selected by packages that explicitly need C.UTF-8 locale +# to be available on host system. +config BR2_NEEDS_HOST_C_UTF8_LOCALE + bool + source "arch/Config.in" menu "Build options" diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 661f40dee4..8978e3bac1 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -27,6 +27,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS select BR2_TARGET_TZ_INFO + select BR2_NEEDS_HOST_C_UTF8_LOCALE help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 126727d602..793b966ff5 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -385,23 +385,25 @@ endef SYSTEMD_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) +SYSTEMD_ENV = $(TARGET_MAKE_ENV) LANG=C.UTF-8 LC_ALL=C.UTF-8 + define SYSTEMD_CONFIGURE_CMDS rm -rf $(@D)/build mkdir -p $(@D)/build - $(TARGET_MAKE_ENV) meson $(SYSTEMD_CONF_OPTS) $(@D) $(@D)/build + $(SYSTEMD_ENV) meson $(SYSTEMD_CONF_OPTS) $(@D) $(@D)/build endef define SYSTEMD_BUILD_CMDS - $(TARGET_MAKE_ENV) ninja $(SYSTEMD_NINJA_OPTS) -C $(@D)/build + $(SYSTEMD_ENV) ninja $(SYSTEMD_NINJA_OPTS) -C $(@D)/build endef define SYSTEMD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(SYSTEMD_NINJA_OPTS) \ + $(SYSTEMD_ENV) DESTDIR=$(TARGET_DIR) ninja $(SYSTEMD_NINJA_OPTS) \ -C $(@D)/build install endef define SYSTEMD_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) ninja $(SYSTEMD_NINJA_OPTS) \ + $(SYSTEMD_ENV) DESTDIR=$(STAGING_DIR) ninja $(SYSTEMD_NINJA_OPTS) \ -C $(@D)/build install endef diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 1804e85508..17dbe08fa4 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -207,6 +207,19 @@ if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then fi fi +if grep -q ^BR2_NEEDS_HOST_C_UTF8_LOCALE=y $BR2_CONFIG; then + if ! which locale > /dev/null ; then + echo + echo "You need locale support on your build machine" + exit 1 ; + fi + if ! LC_ALL=C.UTF-8 locale -c charmap | grep -q '^UTF-8$'; then + echo + echo "You need C.UTF-8 locale suppport on the host system" + exit 1 ; + fi +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) |
