[package] util-linux(-ng): revert r31183, r31178 - the update introduced several...

[openwrt.git] / tools / lzma / Makefile

diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index 79d8d0c..4922f80 100644 (file)
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -7,34 +7,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lzma
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lzma

-PKG_VERSION:=432
+PKG_VERSION:=4.65

 
 

-PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://kent.dl.sourceforge.net/sourceforge/sevenzip/
-PKG_MD5SUM:=155c1ebce5bc6710ae7ecc926226d9d7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=434e51a018b4c8ef377bf81520a53af0

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/lzma
-PKG_UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/ $(TAR_OPTIONS)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)

 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 

-LIB_DIR=$(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
-ALONE_DIR=$(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
+UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
+ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone

 
 

-define Build/Compile
-       $(MAKE) -C $(LIB_DIR)
-       $(MAKE) -f makefile.gcc -C $(ALONE_DIR)
+define Host/Compile
+       $(MAKE) -C $(UTIL_DIR) -f makefile.gcc
+       $(MAKE) -C $(ALONE_DIR) -f makefile.gcc

 endef
 
 endef
 

-define Build/Install
-       $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
-       $(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/
+define Host/Install
+       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma

 endef
 
 endef
 

-define Build/Clean
-       rm -f \
-               $(STAGING_DIR_HOST)/lib/liblzma.a \
-               $(STAGING_DIR_HOST)/bin/lzma
+define Host/Clean

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))