Merge remote-tracking branch 'ms/ipsec-subnets' into next

[ipfire-2.x.git] / lfs / memtest

diff --git a/lfs/memtest b/lfs/memtest
index d98ea872bd89cd0d748fe3440afed19c90a124ac..cef29d69e89b39d155993bfc114d1d647bbf0ae2 100644 (file)
--- 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)