X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flzma%2FMakefile;h=0225844d308609f380562600180d4cfd4943f066;hb=ff535d7f58b740b642d10592b0fde28a29595ac6;hp=ea63bfec89e77521b097a86d5b16020dca30da6f;hpb=cf380b81e891eeefe19325e93493793f697bf16d;p=openwrt-working-2016%2F.git

diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index ea63bfec89..0225844d30 100644
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -7,37 +7,38 @@
 include $(TOPDIR)/rules.mk
 
 LZMA_DIR=$(BUILD_DIR)/lzma
-LZMA_SOURCE=lzma406.zip
-LZMA_SITE=http://www.7-zip.org/dl
+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):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) x $(LZMA_SITE)
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
 
 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) 
 	@rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
-	unzip -q $^ -d $(LZMA_DIR)
-	patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch
+	tar xjf $^ -C $(LZMA_DIR)
+	patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
 	touch $(LZMA_DIR)/.unpacked
-
-$(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.unpacked
-	$(MAKE) -C $(LZMA_LIB_DIR)
-
-$(LZMA_ALONE_DIR)/lzma: $(LZMA_DIR)/.unpacked
-	$(MAKE) -C $(LZMA_ALONE_DIR)
+	
+$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
+$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
+	$(MAKE) -C $(LZMA_LIB_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:
-	-$(MAKE) -C $(LZMA_LIB_DIR) clean
-	-$(MAKE) -C $(LZMA_ALONE_DIR) clean
+	-$(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
 
 lzma-dirclean:
@@ -48,4 +49,5 @@ lzma-dirclean:
 prepare: $(LZMA_DIR)/.unpacked
 compile: lzma
 install: lzma
+	$(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean