snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

memtest86+: fix build 

Co-authored-by: maxice8 <thinkabit.ukim@gmail.com>

fixes #10359
fixes #10358
This commit is contained in:
newbluemoon 2019-03-29 16:46:36 +01:00 committed by maxice8
parent ab27589311
commit c2f1a08cfd
No known key found for this signature in database
GPG Key ID: 543B9D4F4299F06B
4 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
srcpkgs/memtest86+/INSTALL
View File

@ -1,13 +1,15 @@
# grub: follows /etc/kernel.d/post-install/50-grub actions # grub: follows /etc/kernel.d/post-install/50-grub actions
case ${ACTION} in case ${ACTION} in
post) post)
RESULT=1 RESULT=0
if command -v grub-mkconfig >/dev/null 2>&1; then if ! command -v grub-mkconfig >/dev/null 2>&1; then
exit 0
fi
if [ -d $ROOTDIR/boot/grub ]; then if [ -d $ROOTDIR/boot/grub ]; then
grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
RESULT=$? RESULT=$?
fi fi
fi
[ $RESULT -ne 0 ] && exit $RESULT [ $RESULT -ne 0 ] && exit $RESULT
;; ;;
esac esac

8
srcpkgs/memtest86+/REMOVE
View File

@ -1,13 +1,15 @@
# grub: follows /etc/kernel.d/post-install/50-grub actions # grub: follows /etc/kernel.d/post-install/50-grub actions
case ${ACTION} in case ${ACTION} in
post) post)
RESULT=1 RESULT=0
if command -v grub-mkconfig >/dev/null 2>&1; then if ! command -v grub-mkconfig >/dev/null 2>&1; then
exit 0
fi
if [ -d $ROOTDIR/boot/grub ]; then if [ -d $ROOTDIR/boot/grub ]; then
grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
RESULT=$? RESULT=$?
fi fi
fi
[ $RESULT -ne 0 ] && exit $RESULT [ $RESULT -ne 0 ] && exit $RESULT
;; ;;
esac esac

11
srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch Normal file
View File

@ -0,0 +1,11 @@
--- Makefile.orig 2019-03-29 16:41:29.629879497 +0100
+++ Makefile 2019-03-29 16:41:55.351031244 +0100
@@ -53,7 +53,7 @@
$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
test.o: test.c
- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
+ $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
random.o: random.c
$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c

12
srcpkgs/memtest86+/template
View File

@ -1,15 +1,15 @@
# Template file for 'memtest86+' # Template file for 'memtest86+'
pkgname=memtest86+ pkgname=memtest86+
version=5.01 version=5.01
revision=4 revision=5
homepage="http://www.memtest.org" archs="i686 x86_64"
distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz" short_desc="Advanced Memory Diagnostic Tool"
short_desc="An Advanced Memory Diagnostic Tool"
maintainer="Juan RP <xtraeme@voidlinux.org>" maintainer="Juan RP <xtraeme@voidlinux.org>"
license="GPL-2" license="GPL-2.0-or-later"
homepage="http://www.memtest.org"
distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
archs="i686 x86_64"
nostrip=yes nostrip=yes
noverifyrdeps=yes noverifyrdeps=yes