X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fmemtest;h=38e352e265b2a0037c87357a5f627184a5faa0ac;hp=67bcebc8d67b234e4b5e5b614502972c7c5f8102;hb=ca7af382032b3542584fb07b3fabe3976063e551;hpb=9e68a3bf479bc3b9411bf16e2c0420c41cc6e1a1

diff --git a/lfs/memtest b/lfs/memtest
index 67bcebc8d6..38e352e265 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,14 @@
 
 include Config
 
-VER        = 4.00
+VER        = 5.01
 
 THISAPP    = memtest86+-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586 x86_64
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 898cfc5ff7920a8c396ebe898ac2eaa5
+$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d
 
 install : $(TARGET)
 
@@ -70,8 +71,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	-mkdir -p /usr/lib/memtest86+
-	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
+
+# gcc-4.9.3 produce a corrupted version of memtest
+# we use the precomp version at the moment
+
+#ifeq "$(BUILD_ARCH)" "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)
+#	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)