diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-22 15:37:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-22 15:37:45 +0200 |
| commit | 23af092bec253c98d0088ed8db0a777361205524 (patch) | |
| tree | afee2932e4fc30da41ab313e8a859aaf525f6a5f | |
| parent | 5803fec291365c5a659dff83107d183b902f25e1 (diff) | |
uclibc-ng: fix locale compiling/installing, reported by Oliver
| -rw-r--r-- | package/uclibc-ng/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 61ba8de95..6e5b5abf8 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -38,7 +38,7 @@ uclibc-ng-install: cut -f 2 > $(IDIR_UCLIBC_NG)/etc/TZ ifeq ($(ADK_RUNTIME_ENABLE_LOCALE),y) ${INSTALL_DIR} $(IDIR_UCLIBC_NG)/usr/bin - $(INSTALL_BIN) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_UCLIBC_NG)/usr/bin + $(INSTALL_BIN) $(STAGING_TARGET_DIR)/uclibc-ng/usr/bin/locale $(IDIR_UCLIBC_NG)/usr/bin endif uclibc-ng-dev-install: diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 0561243ac..d6028311a 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -310,6 +310,17 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ VERBOSE=1 \ all + PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ + ARCH="$(ADK_TARGET_ARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + HOSTCC="$(HOST_CC)" \ + PREFIX=$(STAGING_TARGET_DIR) \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=/ \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + VERBOSE=1 \ + utils touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled @@ -344,6 +355,17 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + VERBOSE=1 \ + install_utils + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + ARCH="$(ADK_TARGET_ARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + HOSTCC="$(HOST_CC)" \ + PREFIX=$(STAGING_TARGET_DIR)/uclibc-ng \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=/ \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ TEST_INSTALLED_UCLIBC=1 \ UCLIBC_ONLY=1 \ VERBOSE=1 \ |