Radix cross Linux

Index: Makefile
===================================================================
--- Makefile	(.../5.2.7-x86_32/Makefile)	(revision 417)
+++ Makefile	(.../5.6.3-x86_32/Makefile)	(revision 418)
@@ -12,13 +12,13 @@
 
 SOURCE_REQUIRES    = sources/packages/a/xz
 
-REQUIRES           = app/xz/5.2.7
+REQUIRES           = app/xz/5.6.3
 REQUIRES          += libs/glibc/2.40-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
 
-version            = 5.2.7
+version            = 5.6.3
 tar_xz_archive     = $(SRC_PACKAGE_PATH)/packages/a/xz/xz-$(version).tar.xz
 SRC_ARCHIVE        = $(tar_xz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/xz-$(version)
@@ -39,7 +39,7 @@
 # *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
 #
 XZ_32_PKG_NAME                = xz-x32
-XZ_32_PKG_VERSION             = 5.2.7
+XZ_32_PKG_VERSION             = 5.6.3
 XZ_32_PKG_ARCH                = $(PKGARCH)
 XZ_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
 XZ_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
@@ -84,6 +84,9 @@
 extra_configure_switches += --program-prefix=
 extra_configure_switches += --program-suffix=
 extra_configure_switches += --disable-rpath
+
+extra_configure_switches += --bindir=/usr/bin/32
+
 ifeq ($(__ENABLE_STATIC__),yes)
 extra_configure_switches += --enable-static=yes
 else
@@ -92,6 +95,11 @@
 extra_configure_switches += --enable-shared=yes
 
 
+TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+
+LDFLAGS += -Wl,-rpath,$(TARGET_BIN_RPATH)
+
+
 ####### Dependencies
 
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
@@ -113,24 +121,33 @@
 	@mkdir -p $(XZ_32_PKG)
 	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
 	# ======= Move 32-Bit binaries into /usr/bin/32 directory =======
-	@mkdir -p $(XZ_32_PKG)/usr/bin/32
-	@mv $(XZ_32_PKG)/usr/bin/{l,u,x}* $(XZ_32_PKG)/usr/bin/32
+	@mkdir -p $(XZ_32_PKG)/lib$(MULTILIB_X86_32_SUFFIX)
+	@mv $(XZ_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/liblzma.so.* $(XZ_32_PKG)/lib$(MULTILIB_X86_32_SUFFIX)
+	@( cd $(XZ_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   rm -f liblzma.so ; \
+	   ln -sf ../../lib$(MULTILIB_X86_32_SUFFIX)/liblzma.so.? liblzma.so ; \
+	 )
+	@mkdir -p $(XZ_32_PKG)/bin/32
+	@mv $(XZ_32_PKG)/usr/bin/32/xz $(XZ_32_PKG)/bin/32/
+	@( cd $(XZ_32_PKG)/usr/bin/32 ; \
+	   ln -sf ../../../bin/32/xz . ; \
+	 )
 	@rm -rf $(XZ_32_PKG)/usr/include
 	@rm -rf $(XZ_32_PKG)/usr/share
 	# ======= remove toolchain path from target libtool *.la files =======
 	@( cd $(XZ_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
-	   sed -i "s,$(TARGET_DEST_DIR),,g" liblzma.la  \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" liblzma.la ; \
 	 )
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(XZ_32_PKG))
 	# ======= tune libtool *.la search path to the target destination for development =======
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
-	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" liblzma.la ; \
-	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" liblzma.la \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g"   liblzma.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" liblzma.la ; \
 	 )
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
-	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" liblzma.pc \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" liblzma.pc ; \
 	 )
 	# ======= Strip Binaries =======
 	@( cd $(XZ_32_PKG); \