diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2005-06-23 16:01:40 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2005-06-23 16:01:40 +0000 |
| commit | 13981f125f08a1ed94dd6aa6f1a9d6f855bc1d98 (patch) | |
| tree | 8399625a11cddf98d23205299f1e3cf621db2f74 /games-fps | |
| parent | Replaced 'mkdev' with 'mknod' (bug #96725). (diff) | |
| download | gentoo-2-13981f125f08a1ed94dd6aa6f1a9d6f855bc1d98.tar.gz gentoo-2-13981f125f08a1ed94dd6aa6f1a9d6f855bc1d98.tar.bz2 gentoo-2-13981f125f08a1ed94dd6aa6f1a9d6f855bc1d98.zip | |
don't use asm for hardened (bug #96696)
(Portage version: 2.0.51.19)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/duke3d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/duke3d/duke3d-20040817.ebuild | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog index 84eeca9e751f..fa5fa886b981 100644 --- a/games-fps/duke3d/ChangeLog +++ b/games-fps/duke3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/duke3d # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.19 2005/03/28 13:17:51 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.20 2005/06/23 16:01:40 mr_bones_ Exp $ + + 23 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> + duke3d-20040817.ebuild: + don't use asm for hardened (bug #96696) 28 Mar 2005; Guy Martin <gmsoft@gentoo.org> duke3d-20040817.ebuild: OMG ! This thing runs on hppa ! diff --git a/games-fps/duke3d/duke3d-20040817.ebuild b/games-fps/duke3d/duke3d-20040817.ebuild index 4b57dd69df08..5f2fdea49a6b 100644 --- a/games-fps/duke3d/duke3d-20040817.ebuild +++ b/games-fps/duke3d/duke3d-20040817.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.5 2005/03/28 13:17:51 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.6 2005/06/23 16:01:40 mr_bones_ Exp $ fromcvs=0 ECVS_MODULE="duke3d" @@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ppc hppa" -IUSE="perl opengl" # nophysfs" +IUSE="hardened perl opengl" # nophysfs" RDEPEND="virtual/x11 media-libs/libsdl @@ -29,8 +29,7 @@ RDEPEND="virtual/x11 perl? ( dev-lang/perl ) opengl? ( virtual/opengl )" DEPEND="${RDEPEND} - x86? ( dev-lang/nasm ) - >=sys-apps/sed-4" + !hardened? ( x86? ( dev-lang/nasm ) )" S="${WORKDIR}/${ECVS_MODULE}" @@ -69,7 +68,7 @@ src_unpack() { -e "/^use_physfs := / s:=.*:= false:" \ Makefile \ || die "sed duke3d Makefile failed" - if use x86 ; then + if ! use hardened && use x86 ; then sed -i \ -e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile \ || die "sed failed" @@ -83,10 +82,8 @@ src_unpack() { } src_compile() { - cd source/buildengine - emake OPTFLAGS="${CFLAGS}" || die "buildengine failed" - cd .. - emake OPTIMIZE="${CFLAGS}" || die "duke3d failed" + emake -C source/buildengine OPTFLAGS="${CFLAGS}" || die "buildengine failed" + emake -C source OPTIMIZE="${CFLAGS}" || die "duke3d failed" } src_install() { |