From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 15 Sep 2015 18:46:51 +0000 (+0200)
Subject: memtest: use precompiled memtest binary on x86_64
X-Git-Tag: v2.17-core94~17^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d77b70188a5b0423ae70d9093d8daee864fb8e4;p=ipfire-2.x.git

memtest: use precompiled memtest binary on x86_64

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/memtest b/lfs/memtest
index d98ea872bd..cef29d69e8 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = i586 x86_64
 
 ###############################################################################
 # Top-level Rules
@@ -71,11 +71,19 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	-mkdir -p /usr/lib/memtest86+
+
+ifeq "$(MACHINE)" "i586"
 	# Enable SMP as default
 	cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h
 	cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
 	cd $(DIR_APP) && make $(EXTRA_MAKE)
-	-mkdir -p /usr/lib/memtest86+
 	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
+else
+	# 64bit only systems cannot link mentest without 32bit gcc libs
+	# so we use the precompiled binary from memtest author
+	cd $(DIR_APP) && cp -f precomp.bin /usr/lib/memtest86+/memtest.bin
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)