webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

memtest: use always precompiled version

Browse Source 
gcc-4.9.3 build a corrupted version

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2016-03-27 11:04:49 +02:00
parent ed974e08c5
commit ae04f2400a
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lfs/memtest
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# 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 #
@@ -73,17 +73,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@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)
cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
else
# gcc-4.9.3 produce a corrupted version of memtest
# we use the precomp version at the moment
#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)
# 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
#endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)