X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmemtest;h=a1d6e2c5fee1afc7071dba4232b5c80622465490;hb=84578512f52e62bc994b944f88f1785c73b4d96a;hp=820b4aec54db0bb48b18c29ea796261d3c3d867d;hpb=ea317fe337f95e1e9d14dcd85b3cf90b18f89cab;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/memtest b/lfs/memtest
index 820b4aec54..a1d6e2c5fe 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-2016  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        = 1.65
+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 = b3a18166532ae84aea20425c83626651
+$(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)