diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-25 21:04:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-26 12:41:05 +0200 |
| commit | 1cf04b9efde27c39a600862f962e0a703e3fc20f (patch) | |
| tree | 9e5c99ba274e7727a3e2cc65c39d26cc2fe45bdc /package | |
| parent | 9162b50f553369444930878e318a929509aa720f (diff) | |
rework intl/iconv/locale configuration for uClibc-ng toolchains
Diffstat (limited to 'package')
| -rw-r--r-- | package/gettext/Makefile | 1 | ||||
| -rw-r--r-- | package/systemd/Makefile | 1 | ||||
| -rw-r--r-- | package/uclibc-ng-test/Makefile | 2 | ||||
| -rw-r--r-- | package/uclibc-ng/Makefile | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 5ab5bb152..82439e19e 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= libs/misc PKG_URL:= https://www.gnu.org/software/gettext/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/gettext/ PKG_OPTS:= dev +PKG_CFLINE_GETTEXT:= depends on !ADK_TARGET_LIBC_WITHOUT_LIBICONV include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/systemd/Makefile b/package/systemd/Makefile index ac3c04389..be860b8de 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= base/init PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod PKG_BUILDDEP:= intltool-host gperf-host libcap util-linux gettext-host kmod PKG_KDEPENDS:= cgroups namespaces fhandle tmpfs-posix-acl tmpfs-xattr +PKG_NEEDS:= locale intl PKG_URL:= https://wiki.freedesktop.org/www/Software/systemd/ PKG_SITES:= https://github.com/systemd/systemd/archive/ diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile index c9515758e..309ee3d7e 100644 --- a/package/uclibc-ng-test/Makefile +++ b/package/uclibc-ng-test/Makefile @@ -36,7 +36,7 @@ endif ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) XAKE_FLAGS+= NO_DL=1 NO_TLS=1 NO_NPTL=1 endif -ifeq ($(ADK_RUNTIME_ENABLE_LOCALE),) +ifeq ($(ADK_TARGET_LIBC_WITH_LOCALE),) XAKE_FLAGS+= NO_LOCALE=1 endif diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index b3ba6f228..f22a40b85 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -33,7 +33,7 @@ uclibc-ng-install: test -z $(ADK_RUNTIME_TIMEZONE) || \ grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \ cut -f 2 > $(IDIR_UCLIBC_NG)/etc/TZ -ifeq ($(ADK_RUNTIME_ENABLE_LOCALE),y) +ifeq ($(ADK_TARGET_LIBC_WITH_LOCALE),y) ${INSTALL_DIR} $(IDIR_UCLIBC_NG)/usr/bin $(INSTALL_BIN) $(STAGING_TARGET_DIR)/uclibc-ng/usr/bin/locale $(IDIR_UCLIBC_NG)/usr/bin endif |