From 324b6bff097e5de9854ae16a58b1b09406673612 Mon Sep 17 00:00:00 2001 From: er13 Date: Sat, 21 Mar 2015 15:19:03 +0000 Subject: [PATCH] lzma: * combine two lzma versions to one single makefile (makes it easier to switch between both) * refs #2690 git-svn-id: file:///var/svn/freetz/trunk@13029 149334a1-2f27-0410-a3b9-fc62619ac1e6 --- tools/make/lzma/lzma.mk | 13 ++++-- .../{ => 443}/010-endless_loop_fix.patch | 0 .../{ => 443}/020-warnings_parentheses.patch | 0 .../020-warnings_printf_format.patch | 0 .../patches/{ => 443}/100-liblzma_cxx.patch | 0 .../105-setDecoderPropertiesRaw.patch | 0 .../patches/{ => 443}/110-liblzma-zlib.patch | 0 .../465}/001-LZMA_Alone_LFS_support.patch | 0 .../patches/465}/010-endless_loop_fix.patch | 0 .../465}/020-warnings_printf_format.patch | 0 .../465}/020-warnings_unused_variables.patch | 0 .../patches/465}/100-liblzma_c.patch | 0 .../patches/465}/100-liblzma_cxx.patch | 0 .../465}/105-setDecoderPropertiesRaw.patch | 0 .../patches/465}/110-liblzma-zlib.patch | 0 tools/make/lzma465/lzma465.mk | 45 ------------------- 16 files changed, 9 insertions(+), 49 deletions(-) rename tools/make/lzma/patches/{ => 443}/010-endless_loop_fix.patch (100%) rename tools/make/lzma/patches/{ => 443}/020-warnings_parentheses.patch (100%) rename tools/make/lzma/patches/{ => 443}/020-warnings_printf_format.patch (100%) rename tools/make/lzma/patches/{ => 443}/100-liblzma_cxx.patch (100%) rename tools/make/lzma/patches/{ => 443}/105-setDecoderPropertiesRaw.patch (100%) rename tools/make/lzma/patches/{ => 443}/110-liblzma-zlib.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/001-LZMA_Alone_LFS_support.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/010-endless_loop_fix.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/020-warnings_printf_format.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/020-warnings_unused_variables.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/100-liblzma_c.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/100-liblzma_cxx.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/105-setDecoderPropertiesRaw.patch (100%) rename tools/make/{lzma465/patches => lzma/patches/465}/110-liblzma-zlib.patch (100%) delete mode 100644 tools/make/lzma465/lzma465.mk diff --git a/tools/make/lzma/lzma.mk b/tools/make/lzma/lzma.mk index 573f031ed0..a8c33ba2f3 100644 --- a/tools/make/lzma/lzma.mk +++ b/tools/make/lzma/lzma.mk @@ -1,12 +1,17 @@ LZMA_VERSION:=443 LZMA_SOURCE:=lzma$(LZMA_VERSION).tar.bz2 -LZMA_SOURCE_MD5:=c4e1b467184c7cffd4371c74df2baf0f +LZMA_SOURCE_MD5_443:=c4e1b467184c7cffd4371c74df2baf0f +LZMA_SOURCE_MD5_465:=29d5ffd03a5a3e51aef6a74e9eafb759 +LZMA_SOURCE_MD5:=$(LZMA_SOURCE_MD5_$(LZMA_VERSION)) LZMA_SITE:=@SF/sevenzip LZMA_DIR:=$(TOOLS_SOURCE_DIR)/lzma$(LZMA_VERSION) LZMA_MAKE_DIR:=$(TOOLS_DIR)/make/lzma -LZMA_ALONE_DIR:=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone -LZMA_LIB_DIR:=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib + +LZMA_IMPL_SUBDIR_443:=C +LZMA_IMPL_SUBDIR_465:=CPP +LZMA_ALONE_DIR:=$(LZMA_DIR)/$(LZMA_IMPL_SUBDIR_$(LZMA_VERSION))/7zip/Compress/LZMA_Alone +LZMA_LIB_DIR:=$(LZMA_DIR)/$(LZMA_IMPL_SUBDIR_$(LZMA_VERSION))/7zip/Compress/LZMA_Lib lzma-source: $(DL_DIR)/$(LZMA_SOURCE) $(DL_DIR)/$(LZMA_SOURCE): | $(DL_DIR) @@ -16,7 +21,7 @@ lzma-unpacked: $(LZMA_DIR)/.unpacked $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) | $(TOOLS_SOURCE_DIR) $(UNPACK_TARBALL_PREREQUISITES) mkdir -p $(LZMA_DIR) $(call UNPACK_TARBALL,$(DL_DIR)/$(LZMA_SOURCE),$(LZMA_DIR)) - $(call APPLY_PATCHES,$(LZMA_MAKE_DIR)/patches,$(LZMA_DIR)) + $(call APPLY_PATCHES,$(LZMA_MAKE_DIR)/patches/$(LZMA_VERSION),$(LZMA_DIR)) touch $@ $(LZMA_ALONE_DIR)/lzma: $(LZMA_DIR)/.unpacked diff --git a/tools/make/lzma/patches/010-endless_loop_fix.patch b/tools/make/lzma/patches/443/010-endless_loop_fix.patch similarity index 100% rename from tools/make/lzma/patches/010-endless_loop_fix.patch rename to tools/make/lzma/patches/443/010-endless_loop_fix.patch diff --git a/tools/make/lzma/patches/020-warnings_parentheses.patch b/tools/make/lzma/patches/443/020-warnings_parentheses.patch similarity index 100% rename from tools/make/lzma/patches/020-warnings_parentheses.patch rename to tools/make/lzma/patches/443/020-warnings_parentheses.patch diff --git a/tools/make/lzma/patches/020-warnings_printf_format.patch b/tools/make/lzma/patches/443/020-warnings_printf_format.patch similarity index 100% rename from tools/make/lzma/patches/020-warnings_printf_format.patch rename to tools/make/lzma/patches/443/020-warnings_printf_format.patch diff --git a/tools/make/lzma/patches/100-liblzma_cxx.patch b/tools/make/lzma/patches/443/100-liblzma_cxx.patch similarity index 100% rename from tools/make/lzma/patches/100-liblzma_cxx.patch rename to tools/make/lzma/patches/443/100-liblzma_cxx.patch diff --git a/tools/make/lzma/patches/105-setDecoderPropertiesRaw.patch b/tools/make/lzma/patches/443/105-setDecoderPropertiesRaw.patch similarity index 100% rename from tools/make/lzma/patches/105-setDecoderPropertiesRaw.patch rename to tools/make/lzma/patches/443/105-setDecoderPropertiesRaw.patch diff --git a/tools/make/lzma/patches/110-liblzma-zlib.patch b/tools/make/lzma/patches/443/110-liblzma-zlib.patch similarity index 100% rename from tools/make/lzma/patches/110-liblzma-zlib.patch rename to tools/make/lzma/patches/443/110-liblzma-zlib.patch diff --git a/tools/make/lzma465/patches/001-LZMA_Alone_LFS_support.patch b/tools/make/lzma/patches/465/001-LZMA_Alone_LFS_support.patch similarity index 100% rename from tools/make/lzma465/patches/001-LZMA_Alone_LFS_support.patch rename to tools/make/lzma/patches/465/001-LZMA_Alone_LFS_support.patch diff --git a/tools/make/lzma465/patches/010-endless_loop_fix.patch b/tools/make/lzma/patches/465/010-endless_loop_fix.patch similarity index 100% rename from tools/make/lzma465/patches/010-endless_loop_fix.patch rename to tools/make/lzma/patches/465/010-endless_loop_fix.patch diff --git a/tools/make/lzma465/patches/020-warnings_printf_format.patch b/tools/make/lzma/patches/465/020-warnings_printf_format.patch similarity index 100% rename from tools/make/lzma465/patches/020-warnings_printf_format.patch rename to tools/make/lzma/patches/465/020-warnings_printf_format.patch diff --git a/tools/make/lzma465/patches/020-warnings_unused_variables.patch b/tools/make/lzma/patches/465/020-warnings_unused_variables.patch similarity index 100% rename from tools/make/lzma465/patches/020-warnings_unused_variables.patch rename to tools/make/lzma/patches/465/020-warnings_unused_variables.patch diff --git a/tools/make/lzma465/patches/100-liblzma_c.patch b/tools/make/lzma/patches/465/100-liblzma_c.patch similarity index 100% rename from tools/make/lzma465/patches/100-liblzma_c.patch rename to tools/make/lzma/patches/465/100-liblzma_c.patch diff --git a/tools/make/lzma465/patches/100-liblzma_cxx.patch b/tools/make/lzma/patches/465/100-liblzma_cxx.patch similarity index 100% rename from tools/make/lzma465/patches/100-liblzma_cxx.patch rename to tools/make/lzma/patches/465/100-liblzma_cxx.patch diff --git a/tools/make/lzma465/patches/105-setDecoderPropertiesRaw.patch b/tools/make/lzma/patches/465/105-setDecoderPropertiesRaw.patch similarity index 100% rename from tools/make/lzma465/patches/105-setDecoderPropertiesRaw.patch rename to tools/make/lzma/patches/465/105-setDecoderPropertiesRaw.patch diff --git a/tools/make/lzma465/patches/110-liblzma-zlib.patch b/tools/make/lzma/patches/465/110-liblzma-zlib.patch similarity index 100% rename from tools/make/lzma465/patches/110-liblzma-zlib.patch rename to tools/make/lzma/patches/465/110-liblzma-zlib.patch diff --git a/tools/make/lzma465/lzma465.mk b/tools/make/lzma465/lzma465.mk deleted file mode 100644 index 6230e8d4d4..0000000000 --- a/tools/make/lzma465/lzma465.mk +++ /dev/null @@ -1,45 +0,0 @@ -LZMA465_VERSION:=465 -LZMA465_SOURCE:=lzma$(LZMA465_VERSION).tar.bz2 -LZMA465_SOURCE_MD5:=29d5ffd03a5a3e51aef6a74e9eafb759 -LZMA465_SITE:=@SF/sevenzip - -LZMA465_DIR:=$(TOOLS_SOURCE_DIR)/lzma$(LZMA465_VERSION) -LZMA465_MAKE_DIR:=$(TOOLS_DIR)/make/lzma$(LZMA465_VERSION) -LZMA465_ALONE_DIR:=$(LZMA465_DIR)/CPP/7zip/Compress/LZMA_Alone -LZMA465_LIB_DIR:=$(LZMA465_DIR)/CPP/7zip/Compress/LZMA_Lib - -lzma$(LZMA465_VERSION)-source: $(DL_DIR)/$(LZMA465_SOURCE) -$(DL_DIR)/$(LZMA465_SOURCE): | $(DL_DIR) - $(DL_TOOL) $(DL_DIR) $(LZMA465_SOURCE) $(LZMA465_SITE) $(LZMA465_SOURCE_MD5) - -lzma$(LZMA465_VERSION)-unpacked: $(LZMA465_DIR)/.unpacked -$(LZMA465_DIR)/.unpacked: $(DL_DIR)/$(LZMA465_SOURCE) | $(TOOLS_SOURCE_DIR) $(UNPACK_TARBALL_PREREQUISITES) - mkdir -p $(LZMA465_DIR) - $(call UNPACK_TARBALL,$(DL_DIR)/$(LZMA465_SOURCE),$(LZMA465_DIR)) - $(call APPLY_PATCHES,$(LZMA465_MAKE_DIR)/patches,$(LZMA465_DIR)) - touch $@ - -$(LZMA465_ALONE_DIR)/lzma: $(LZMA465_DIR)/.unpacked - $(MAKE) -f makefile.gcc -C $(LZMA465_ALONE_DIR) - -$(LZMA465_LIB_DIR)/liblzma.a: $(LZMA465_DIR)/.unpacked - $(MAKE) -f makefile.gcc -C $(LZMA465_LIB_DIR) - touch -c $@ - -$(LZMA465_DIR)/liblzma.a: $(LZMA465_LIB_DIR)/liblzma.a - $(INSTALL_FILE) - -$(TOOLS_DIR)/lzma$(LZMA465_VERSION): $(LZMA465_ALONE_DIR)/lzma - $(INSTALL_FILE) - -lzma$(LZMA465_VERSION): $(LZMA465_DIR)/liblzma.a $(TOOLS_DIR)/lzma$(LZMA465_VERSION) - -lzma$(LZMA465_VERSION)-clean: - -$(MAKE) -C $(LZMA465_LIB_DIR) clean - $(RM) $(LZMA465_DIR)/liblzma.a - -lzma$(LZMA465_VERSION)-dirclean: - $(RM) -r $(LZMA465_DIR) - -lzma$(LZMA465_VERSION)-distclean: lzma$(LZMA465_VERSION)-dirclean - $(RM) $(TOOLS_DIR)/lzma$(LZMA465_VERSION)