Changeset a190a80 in freewrt for tools/lzma

Timestamp:

Jul 20, 2006, 8:38:56 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

6977d0e

Parents:

8d05332

Message:

fix tools directory, after changing WRKDIR, repack lzma package, i hate packages without subdirectory, cleanup makefiles

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@300 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

tools/lzma

Files:

• Makefile (modified) (3 diffs)
• patches/lzma-zlib.patch (moved) (moved from tools/lzma/lzma-zlib.patch )

tools/lzma/Makefile

@@ -4 +4 @@
 include ../rules.mk
 
-WRKDIR=$(TOOLS_BUILD_DIR)/lzma
-PKG_SOURCE=lzma432.tar.bz2
-LZMA_SITE=@SF/sevenzip
-LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
+PKG_NAME:=              lzma
+PKG_VERSION:=           432
+PKG_MD5SUM:=            d3a40c06de82db6601ae565ba6cd618a
+PKG_SOURCE_URL:=        @SF/sevenzip
+PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR:=         $(TOOLS_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-LZMA_LIB_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Lib
-LZMA_ALONE_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR=           $(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
+LZMA_ALONE_DIR=         $(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
 
-TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
+TARGETS=                $(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
 
 $(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(MAKE_TRACE)
 
-$(WRKDIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
+$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
         ${EXTRACT_CMD}
-        patch -d $(WRKDIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
-        touch $(WRKDIR)/.unpacked
+        $(PATCH) $(PKG_BUILD_DIR) patches/ \*.patch
+        touch $@
         
-$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKDIR)/.built
-$(WRKDIR)/.built: $(WRKDIR)/.unpacked
+$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.unpacked
         $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
         $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
@@ -29 +31 @@
 
 lzma: $(TARGETS)
-        $(CP) $^ $(WRKDIR)
+        $(CP) $^ $(PKG_BUILD_DIR)
 
 lzma-source: $(DL_DIR)/$(PKG_SOURCE)
@@ -36 +38 @@
         -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
         -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
-        rm -f $(WRKDIR)/liblzma.a $(WRKDIR)/lzma
+        rm -f $(PKG_BUILD_DIR)/liblzma.a $(PKG_BUILD_DIR)/lzma
 
 lzma-dirclean:
-        rm -rf $(WRKDIR)
+        rm -rf $(PKG_BUILD_DIR)
 
 #############################################################
 
-prepare: $(WRKDIR)/.unpacked
+prepare: $(PKG_BUILD_DIR)/.unpacked
 compile: lzma
 install: lzma
-        $(CP) $(WRKDIR)/lzma $(STAGING_DIR)/bin/
+        $(CP) $(PKG_BUILD_DIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean