diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-08-21 15:33:33 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-08-21 15:33:33 +0000 |
| commit | e99518277a04f0e8cf5054a6d305b2d859a59b25 (patch) | |
| tree | 911a013f8d6703da67a94c809252d3f3b5414b93 /package | |
| parent | 1afb8226cbaf011f81158b63c2c169ce05842d21 (diff) | |
| download | buildroot-novena-e99518277a04f0e8cf5054a6d305b2d859a59b25.tar.gz buildroot-novena-e99518277a04f0e8cf5054a6d305b2d859a59b25.zip | |
- add handling of lzma for the host (unconditionally for now)
- remove non-working attempt to install an lzma to the host via sudo
Diffstat (limited to 'package')
| -rw-r--r-- | package/lzma/lzma.mk | 25 | ||||
| -rwxr-xr-x | package/lzma/lzmacheck.sh | 9 |
2 files changed, 29 insertions, 5 deletions
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index 8d6d24ae5..ecaf21b48 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -15,6 +15,12 @@ LZMA_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif LZMA_TARGET_BINARY:=bin/lzma +# lzma binary for use on the host +LZMA=$(TOOL_BUILD_DIR)/bin/lzma +HOST_LZMA_BINARY=$(shell $(CONFIG_SHELL) package/lzma/lzmacheck.sh) +HOST_LZMA_IF_ANY=$(shell $(CONFIG_SHELL) toolchain/dependencies/check-host-lzma.sh) + + $(DL_DIR)/$(LZMA_SOURCE): $(WGET) -P $(DL_DIR) $(LZMA_SITE)/$(LZMA_SOURCE) @@ -47,6 +53,20 @@ $(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \ $(STAGING_DIR)/lib/liblzmadec.la +.PHONY: lzma-host use-lzma-host-binary +use-lzma-host-binary: + if [ ! -f "$(TOOL_BUILD_DIR)/bin/lzma" ] ; then \ + [ -d $(TOOL_BUILD_DIR)/bin ] || mkdir $(TOOL_BUILD_DIR)/bin ; \ + ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOL_BUILD_DIR)/bin/lzma" ; \ + fi + +build-lzma-host-binary: $(LZMA_HOST_DIR)/src/lzma/lzma + -rm -f $(TOOL_BUILD_DIR)/bin/lzma + [ -d $(TOOL_BUILD_DIR)/bin ] || mkdir $(TOOL_BUILD_DIR)/bin + cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOL_BUILD_DIR)/bin/lzma + +host-lzma: $(HOST_LZMA_BINARY) + lzma-host: $(STAGING_DIR)/bin/lzma lzma-host-clean: @@ -55,11 +75,6 @@ lzma-host-clean: lzma-host-dirclean: rm -rf $(LZMA_HOST_DIR) -/usr/local/bin/lzma: lzma_host - sudo $(MAKE) DESTDIR=/usr/local -C $(LZMA_HOST_DIR) install - sudo $(SED) "s,^libdir=.*,libdir=\'/usr/local/lib\',g" \ - /usr/local/lib/liblzmadec.la - lzma-host-install: /usr/local/bin/lzma ###################################################################### diff --git a/package/lzma/lzmacheck.sh b/package/lzma/lzmacheck.sh new file mode 100755 index 000000000..bcb0423d1 --- /dev/null +++ b/package/lzma/lzmacheck.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +bin=$(toolchain/dependencies/check-host-lzma.sh) +if [ "x$bin" = "x" ] ; then + echo build-lzma-host-binary +else + echo use-lzma-host-binary +fi + |