X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fmemtest;h=38e352e265b2a0037c87357a5f627184a5faa0ac;hp=d98ea872bd89cd0d748fe3440afed19c90a124ac;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=47a83092b5a6f2fa13d1c95de75b7bea4eb90da2

diff --git a/lfs/memtest b/lfs/memtest
index d98ea872bd..38e352e265 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -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,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	# 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+
+
+# 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)