Browse Source

uclibc-ng: fix locale compiling/installing, reported by Oliver

Waldemar Brodkorb 7 years ago
parent
commit
23af092bec
2 changed files with 23 additions and 1 deletions
  1. 1 1
      package/uclibc-ng/Makefile
  2. 22 0
      toolchain/uclibc-ng/Makefile

+ 1 - 1
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:

+ 22 - 0
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
@@ -335,6 +346,17 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		VERBOSE=1 \
 		install_runtime
+	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)" \
+		VERBOSE=1 \
+		install_utils
 	PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
 		ARCH="$(ADK_TARGET_ARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \