busybox: backport upstream fixes for ext2 related tools (backport of r33662)

[openwrt/svn-archive/archive.git] / include / toolchain-build.mk

diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
index b9a94316fce1298ea38aeb86b09b20e807e8d1bf..d2fdb0281a104175bb24649703415b30218ddd65 100644 (file)
--- a/include/toolchain-build.mk
+++ b/include/toolchain-build.mk
@@ -7,7 +7,21 @@
 
 override CONFIG_AUTOREBUILD=
 
+REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
+TOOLCHAIN_JOBS?=$(if $(CONFIG_TOOLCHAIN_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))
+
 include $(INCLUDE_DIR)/host-build.mk
+
+HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared
+
+define FixupLibdir
+       if [ -d $(1)/lib64 -a \! -L $(1)/lib64 ]; then \
+               mkdir -p $(1)/lib; \
+               mv $(1)/lib64/* $(1)/lib/; \
+               rm -rf $(1)/lib64; \
+       fi
+       ln -sf lib $(1)/lib64
+endef