X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/42136877538fe79297345f554d033a41dc081daa..2b37c3ceebf60d4aba2be86a48feeafca170f3a5:/target/lzma/Makefile

diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index 17c029532..0225844d3 100644
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -7,40 +7,36 @@
 include $(TOPDIR)/rules.mk
 
 LZMA_DIR=$(BUILD_DIR)/lzma
-LZMA_SOURCE=lzma406.zip
-LZMA_SITE=http://www.7-zip.org/dl
-LZMA_MD5=a09378411cba5f786b5c49c9c58496df
+LZMA_SOURCE=lzma432.tar.bz2
+LZMA_SITE=@SF/sevenzip
+LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
 
-LZMA_LIB_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Lib
-LZMA_ALONE_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib
+LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
 
 TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
 
 $(DL_DIR)/$(LZMA_SOURCE):
-	@$(PKG_TRACE) Downloading...
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
 
 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) 
-	@$(PKG_TRACE) Preparing...
 	@rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
-	unzip -q $^ -d $(LZMA_DIR)
-	patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch $(MAKE_TRACE)
+	tar xjf $^ -C $(LZMA_DIR)
+	patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
 	touch $(LZMA_DIR)/.unpacked
 	
 $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
 $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
-	@$(PKG_TRACE) Compiling...
 	$(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
-	$(MAKE) -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
+	$(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
 	touch $@
 
 lzma: $(TARGETS)
-	cp -f $^ $(LZMA_DIR)
+	$(CP) $^ $(LZMA_DIR)
 
 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
 
 lzma-clean:
-	@$(PKG_TRACE) Cleaining...
 	-$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
 	-$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
 	rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma
@@ -53,5 +49,5 @@ lzma-dirclean:
 prepare: $(LZMA_DIR)/.unpacked
 compile: lzma
 install: lzma
-	cp $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
+	$(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean