Index: Makefile
===================================================================
--- Makefile (.../5.2.7) (revision 417)
+++ Makefile (.../5.6.3) (revision 418)
@@ -65,7 +65,7 @@
# ======= __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)
@@ -87,7 +87,7 @@
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
XZ_PKG_NAME = xz
-XZ_PKG_VERSION = 5.2.7
+XZ_PKG_VERSION = 5.6.3
XZ_PKG_ARCH = $(PKGARCH)
XZ_PKG_DISTRO_NAME = $(DISTRO_NAME)
XZ_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
@@ -132,6 +132,7 @@
extra_configure_switches += --program-prefix=
extra_configure_switches += --program-suffix=
extra_configure_switches += --disable-rpath
+
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
else
@@ -149,6 +150,12 @@
# $(BUILD_ENVIRONMENT) ../configure
#
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+
+LDFLAGS += -Wl,-rpath,$(TARGET_BIN_RPATH)
+
+
####### Dependencies
$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
@@ -170,6 +177,12 @@
$(install_target): $(build_target)
@mkdir -p $(XZ_PKG)
@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ @mkdir -p $(XZ_PKG)/lib$(LIBSUFFIX)
+ @mv $(XZ_PKG)/usr/lib$(LIBSUFFIX)/liblzma.so.* $(XZ_PKG)/lib$(LIBSUFFIX)
+ @( cd $(XZ_PKG)/usr/lib$(LIBSUFFIX) ; \
+ rm -f liblzma.so ; \
+ ln -sf ../../lib$(LIBSUFFIX)/liblzma.so.? liblzma.so ; \
+ )
@mkdir -p $(XZ_PKG)/bin
@mv $(XZ_PKG)/usr/bin/xz $(XZ_PKG)/bin
@( cd $(XZ_PKG)/usr/bin ; \
@@ -203,18 +216,18 @@
)
# ======= remove toolchain path from target libtool *.la files =======
@( cd $(XZ_PKG)/usr/lib$(LIBSUFFIX) ; \
- 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_PKG))
# ======= tune libtool *.la search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
- 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$(LIBSUFFIX)/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_PKG); \