Radix cross Linux

Index: Makefile
===================================================================
--- Makefile	(.../1.9.4-x86_32)	(revision 417)
+++ Makefile	(.../1.10.0-x86_32)	(revision 418)
@@ -12,13 +12,13 @@
 
 SOURCE_REQUIRES    = sources/packages/l/lz4
 
-REQUIRES           = libs/lz4/1.9.4
+REQUIRES           = libs/lz4/1.10.0
 REQUIRES          += libs/glibc/2.40-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
 
-version            = 1.9.4
+version            = 1.10.0
 tar_xz_archive     = $(SRC_PACKAGE_PATH)/packages/l/lz4/lz4-$(version).tar.xz
 SRC_ARCHIVE        = $(tar_xz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/lz4-$(version)
@@ -38,7 +38,7 @@
 # *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
 #
 LZ4_32_PKG_NAME                = lz4-x32
-LZ4_32_PKG_VERSION             = 1.9.4
+LZ4_32_PKG_VERSION             = 1.10.0
 LZ4_32_PKG_ARCH                = $(PKGARCH)
 LZ4_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
 LZ4_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
@@ -76,31 +76,44 @@
 
 
 configure_switches  = PREFIX=/usr
-configure_switches += LIBDIR=/usr/lib$(MULTILIB_X86_32_SUFFIX)
 configure_switches += MANDIR=/usr/share/man
 configure_switches += BINDIR=/usr/bin/32
 
+ifeq ($(__ENABLE_STATIC__),yes)
+configure_switches += BUILD_STATIC=yes
+else
+configure_switches += BUILD_STATIC=no
+endif
 
+
+TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+
+CFLAGS += -Wl,-rpath,$(TARGET_BIN_RPATH)
+
+
 ####### Dependencies
 
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
 	$(UNPACK_SRC_ARCHIVE)
 	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   sed -i 's,^\(LIBVER_SRC[ \t]*:=\).*,\1 ../lib/lz4.h,' programs/Makefile ; \
+	 )
 	@touch $@
 
 $(build_target): $(src_done)
-	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches) -C lib
-	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches) -C programs lz4 lz4c
+	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches)
 	@touch $@
 
 $(install_target): $(build_target)
 	@mkdir -p $(LZ4_32_PKG)
-	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches) -j1 install $(env_sysroot)
-ifneq ($(__ENABLE_STATIC__),yes)
-	@rm -f $(LZ4_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/*.a
-endif
+	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches) LIBDIR=/usr/lib$(MULTILIB_X86_32_SUFFIX) install $(env_sysroot)
 	@rm -rf $(LZ4_32_PKG)/usr/include
 	@rm -rf $(LZ4_32_PKG)/usr/share
+	# ======= Set libdir in pkg-config *.pc =======
+	@( cd $(LZ4_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,^\(libdir=\).*,\1\$${prefix}/lib$(MULTILIB_X86_32_SUFFIX),g" liblz4.pc ; \
+	 )
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(LZ4_32_PKG))
 	# ======= tune pkg-config *.pc search path to the target destination for development =======