Radix cross Linux

Index: Makefile
===================================================================
--- Makefile	(.../1.9.4)	(revision 417)
+++ Makefile	(.../1.10.0)	(revision 418)
@@ -65,7 +65,7 @@
 # ======= __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)
@@ -86,7 +86,7 @@
 # *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
 #
 LZ4_PKG_NAME                = lz4
-LZ4_PKG_VERSION             = 1.9.4
+LZ4_PKG_VERSION             = 1.10.0
 LZ4_PKG_ARCH                = $(PKGARCH)
 LZ4_PKG_DISTRO_NAME         = $(DISTRO_NAME)
 LZ4_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
@@ -124,28 +124,37 @@
 
 
 configure_switches  = PREFIX=/usr
-configure_switches += LIBDIR=/usr/lib$(LIBSUFFIX)
 configure_switches += MANDIR=/usr/share/man
 
+ifeq ($(__ENABLE_STATIC__),yes)
+configure_switches += BUILD_STATIC=yes
+else
+configure_switches += BUILD_STATIC=no
+endif
 
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+
+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_PKG)
-	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches) -j1 install $(env_sysroot)
-ifneq ($(__ENABLE_STATIC__),yes)
-	@rm -f $(LZ4_PKG)/usr/lib$(LIBSUFFIX)/*.a
-endif
+	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) $(configure_switches) LIBDIR=/usr/lib$(LIBSUFFIX) install $(env_sysroot)
 	# ======= Install Documentation =======
 	@if [ -d $(LZ4_PKG)/usr/share/man ]; then \
 	  ( cd $(LZ4_PKG)/usr/share/man ; \
@@ -173,12 +182,16 @@
 	   mv doc html ; \
 	 )
 	@( cd $(SRC_DIR) ; \
-	   if [ -r CHANGELOG ]; then \
+	   if [ -r NEWS ]; then \
 	     DOCSDIR=`echo $(LZ4_PKG)/usr/share/doc/$(src_dir_name)` ; \
-	     cat CHANGELOG | head -n 1000 > $$DOCSDIR/CHANGELOG ; \
-	     touch -r CHANGELOG $$DOCSDIR/CHANGELOG ; \
+	     cat NEWS | head -n 1000 > $$DOCSDIR/NEWS ; \
+	     touch -r NEWS $$DOCSDIR/NEWS ; \
 	   fi \
 	 )
+	# ======= Set libdir in pkg-config *.pc =======
+	@( cd $(LZ4_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,^\(libdir=\).*,\1\$${prefix}/lib$(LIBSUFFIX),g" liblz4.pc ; \
+	 )
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(LZ4_PKG))
 	# ======= tune pkg-config *.pc search path to the target destination for development =======