diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/lzma/Config.in | 16 | ||||
| -rw-r--r-- | package/lzma/lzma.mk | 84 |
2 files changed, 72 insertions, 28 deletions
diff --git a/package/lzma/Config.in b/package/lzma/Config.in index a977b32f4..774d7711b 100644 --- a/package/lzma/Config.in +++ b/package/lzma/Config.in @@ -1,14 +1,22 @@ -config BR2_PACKAGE_LZMA - bool "lzma" +config BR2_PACKAGE_LZMA_TARGET + bool "Install lzma for the target system" default n help - Compression utility. + lzma utils on the target http://tukaani.org/lzma/ config BR2_PACKAGE_LZMA_TARGET_HEADERS bool "lzma headers in target" default n - depends on BR2_PACKAGE_LZMA + depends on BR2_PACKAGE_LZMA_TARGET help Put headers files in the target. + +config BR2_PACKAGE_LZMA_HOST + bool "Install lzma for the host/build system" + default n + help + lzma utils on the host + + http://tukaani.org/lzma/ diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index 5b29ab490..d0f223434 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -6,7 +6,8 @@ LZMA_VER:=4.32.0beta3 LZMA_SOURCE:=lzma-$(LZMA_VER).tar.gz LZMA_SITE:=http://tukaani.org/lzma/ -LZMA_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VER) +LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VER) +LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VER) LZMA_CFLAGS:=$(TARGET_CFLAGS) ifeq ($(BR2_LARGEFILE),y) LZMA_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @@ -18,13 +19,47 @@ endif $(DL_DIR)/$(LZMA_SOURCE): $(WGET) -P $(DL_DIR) $(LZMA_SITE)/$(LZMA_SOURCE) -$(LZMA_DIR)/.source: $(DL_DIR)/$(LZMA_SOURCE) - $(ZCAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LZMA_DIR) package/lzma/ lzma\*.patch - touch $(LZMA_DIR)/.source +###################################################################### +# +# lzma host +# +###################################################################### + +$(LZMA_HOST_DIR)/.source: $(DL_DIR)/$(LZMA_SOURCE) + zcat $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LZMA_HOST_DIR) package/lzma/ lzma\*.patch + touch $(LZMA_HOST_DIR)/.source + +$(LZMA_HOST_DIR)/.configured: $(LZMA_HOST_DIR)/.source + (cd $(LZMA_HOST_DIR); rm -f config.cache ;\ + CC="$(HOSTCC)" \ + ./configure \ + --prefix=/ \ + ); + touch $(LZMA_HOST_DIR)/.configured; + +$(LZMA_HOST_DIR)/src/lzma/lzma: $(LZMA_HOST_DIR)/.configured + $(MAKE) -C $(LZMA_HOST_DIR) all + touch -c $@ + +$(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZMA_HOST_DIR) install -$(LZMA_DIR)/.configured: $(LZMA_DIR)/.source - (cd $(LZMA_DIR); rm -f config.cache ;\ +lzma-host: uclibc $(STAGING_DIR)/bin/lzma + +###################################################################### +# +# lzma target +# +###################################################################### + +$(LZMA_TARGET_DIR)/.source: $(DL_DIR)/$(LZMA_SOURCE) + zcat $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LZMA_TARGET_DIR) package/lzma/ lzma\*.patch + touch $(LZMA_TARGET_DIR)/.source + +$(LZMA_TARGET_DIR)/.configured: $(LZMA_TARGET_DIR)/.source + (cd $(LZMA_TARGET_DIR); rm -f config.cache ;\ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(LZMA_CFLAGS)" \ ac_cv_func_malloc_0_nonnull=yes \ @@ -33,37 +68,33 @@ $(LZMA_DIR)/.configured: $(LZMA_DIR)/.source --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - --exec-prefix=$(STAGING_DIR)/usr/bin \ - --libdir=$(STAGING_DIR)/lib \ - --includedir=$(STAGING_DIR)/include \ + --exec-prefix=$(TARGET_DIR)/usr/bin \ + --libdir=$(TARGET_DIR)/lib \ + --includedir=$(TARGET_DIR)/include \ --disable-debug \ $(DISABLE_NLS) \ $(LZMA_LARGEFILE) \ ); - touch $(LZMA_DIR)/.configured; + touch $(LZMA_TARGET_DIR)/.configured; -$(LZMA_DIR)/src/lzma/lzma: $(LZMA_DIR)/.configured - $(MAKE) -C $(LZMA_DIR) all +$(LZMA_TARGET_DIR)/src/lzma/lzma: $(LZMA_TARGET_DIR)/.configured + $(MAKE) -C $(LZMA_TARGET_DIR) all touch -c $@ -$(STAGING_DIR)/bin/lzma: $(LZMA_DIR)/src/lzma/lzma - -cp -dpf $(LZMA_DIR)/src/lzma/lzma $(STAGING_DIR)/bin/; - touch -c $(STAGING_DIR)/bin/lzma - -$(TARGET_DIR)/bin/lzma: $(STAGING_DIR)/bin/lzma - cp -dpf $(STAGING_DIR)/bin/lzma $(TARGET_DIR)/bin/; +$(TARGET_DIR)/usr/bin/lzma: $(LZMA_TARGET_DIR)/src/lzma/lzma + -cp -dpf $(LZMA_TARGET_DIR)/src/lzma/lzma $(TARGET_DIR)/bin/; -$(STRIP) --strip-unneeded $(TARGET_DIR)/bin/lzma touch -c $(TARGET_DIR)/bin/lzma #lzma-headers: $(TARGET_DIR)/bin/lzma -lzma: uclibc $(TARGET_DIR)/bin/lzma +lzma-target: uclibc $(TARGET_DIR)/usr/bin/lzma lzma-source: $(DL_DIR)/$(LZMA_SOURCE) lzma-clean: - rm -f $(TARGET_DIR)/bin/lzma - -$(MAKE) -C $(LZMA_DIR) clean + rm -f $(TARGET_DIR)/usr/bin/lzma + -$(MAKE) -C $(LZMA_TARGET_DIR) clean lzma-dirclean: rm -rf $(LZMA_DIR) @@ -73,9 +104,14 @@ lzma-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LZMA)),y) -TARGETS+=lzma +ifeq ($(strip $(BR2_PACKAGE_LZMA_HOST)),y) +TARGETS+=lzma-host +endif + +ifeq ($(strip $(BR2_PACKAGE_LZMA_TARGET)),y) +TARGETS+=lzma-target endif + #ifeq ($(strip $(BR2_PACKAGE_LZMA_TARGET_HEADERS)),y) #TARGETS+=lzma-headers #endif |