diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-01-11 01:50:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-11 01:50:32 +0000 |
| commit | f2f0b9e691ff8353d51001db68ab37fb404b1e2c (patch) | |
| tree | 525b001932089b06bab61dd77ff633e32fe3ec61 /sys-apps/memtest86 | |
| parent | stabilize (Manifest recommit) (diff) | |
| download | gentoo-2-f2f0b9e691ff8353d51001db68ab37fb404b1e2c.tar.gz gentoo-2-f2f0b9e691ff8353d51001db68ab37fb404b1e2c.tar.bz2 gentoo-2-f2f0b9e691ff8353d51001db68ab37fb404b1e2c.zip | |
Disable src_test (since one doesnt exist) #77368 and only add PIC patch if toolchain supports stack-protector #76515.
Diffstat (limited to 'sys-apps/memtest86')
| -rw-r--r-- | sys-apps/memtest86/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/memtest86/memtest86-3.2.ebuild | 21 |
2 files changed, 15 insertions, 12 deletions
diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog index ca71f07efd2b..acfd077859fb 100644 --- a/sys-apps/memtest86/ChangeLog +++ b/sys-apps/memtest86/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/memtest86 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.23 2005/01/02 19:15:26 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.24 2005/01/11 01:50:32 vapier Exp $ + + 10 Jan 2005; Mike Frysinger <vapier@gentoo.org> memtest86-3.2.ebuild: + Disable src_test (since one doesnt exist) #77368 and only add PIC patch if + toolchain supports stack-protector #76515. *memtest86-3.2 (02 Jan 2005) diff --git a/sys-apps/memtest86/memtest86-3.2.ebuild b/sys-apps/memtest86/memtest86-3.2.ebuild index 15d3c2fa897a..3a384b0fb78b 100644 --- a/sys-apps/memtest86/memtest86-3.2.ebuild +++ b/sys-apps/memtest86/memtest86-3.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.2 2005/01/11 01:34:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.3 2005/01/11 01:50:32 vapier Exp $ -inherit mount-boot eutils +inherit mount-boot eutils flag-o-matic DESCRIPTION="A stand alone memory test for x86 computers" HOMEPAGE="http://www.memtest86.com/" @@ -12,24 +12,23 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="-* x86" IUSE="serial" +RESTRICT="maketest" DEPEND="virtual/libc" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" - # bug 66630 - epatch ${FILESDIR}/${P}-test-pic.patch + test_flag -fno-stack-protector && \ + epatch "${FILESDIR}"/${P}-test-pic.patch #66630 sed -i -e '/DISCARD/d' memtest_shared.lds - if use serial ; then - sed -i \ - -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' \ - config.h \ - || die - fi + use serial && \ + sed -i \ + -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h } src_compile() { |