From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Sep 2011 20:05:26 +0000 (+0000)
Subject: unzip: Fix for ARM platform (cannot use x86 assembly).
X-Git-Tag: v2.9-core54~13^2~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=087f08a27d670fdaa01d75a489133fd41527328c;p=people%2Fms%2Fipfire-2.x.git

unzip: Fix for ARM platform (cannot use x86 assembly).
---

diff --git a/lfs/unzip b/lfs/unzip
index 15e7967eda..d9278b70dc 100644
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -70,7 +70,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(MACHINE)" "arm"
+	# ARM cannot use the x86 assembly code.
+	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
+else
 	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
+endif
 	cd $(DIR_APP) && make prefix=/usr install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)