summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-09-10 10:01:59 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-09-10 10:01:59 +0000
commitc60bc3240379d0996f5af40fdf16aa56291df31b (patch)
tree8fd0e4873b4cee2297f4780e37e7056537d354e8 /dev-games/hawknl
parentDo not use server-side gradients. It hurts performance, and causes bad render... (diff)
downloadgentoo-2-c60bc3240379d0996f5af40fdf16aa56291df31b.tar.gz
gentoo-2-c60bc3240379d0996f5af40fdf16aa56291df31b.tar.bz2
gentoo-2-c60bc3240379d0996f5af40fdf16aa56291df31b.zip
Respect LDFLAGS. Bug #336041
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-games/hawknl')
-rw-r--r--dev-games/hawknl/ChangeLog8
-rw-r--r--dev-games/hawknl/files/hawknl-1.68-build.patch11
-rw-r--r--dev-games/hawknl/hawknl-1.68-r1.ebuild9
3 files changed, 21 insertions, 7 deletions
diff --git a/dev-games/hawknl/ChangeLog b/dev-games/hawknl/ChangeLog
index 92d380ce680a..e0a9dce79253 100644
--- a/dev-games/hawknl/ChangeLog
+++ b/dev-games/hawknl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/hawknl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/ChangeLog,v 1.10 2007/02/08 20:46:07 wolf31o2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/ChangeLog,v 1.11 2010/09/10 10:01:59 tupone Exp $
+
+ 10 Sep 2010; Tupone Alfredo <tupone@gentoo.org> hawknl-1.68-r1.ebuild,
+ files/hawknl-1.68-build.patch:
+ Respect LDFLAGS. Bug #336041 by flameeyes@gentoo.org
08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
Regenerate digest in Manifest2 format.
diff --git a/dev-games/hawknl/files/hawknl-1.68-build.patch b/dev-games/hawknl/files/hawknl-1.68-build.patch
index 2ae1897d2060..cf9b609f0ee0 100644
--- a/dev-games/hawknl/files/hawknl-1.68-build.patch
+++ b/dev-games/hawknl/files/hawknl-1.68-build.patch
@@ -19,3 +19,14 @@
cp ../include/nl.h $(INCDIR)/nl.h
chmod 644 $(INCDIR)/nl.h
+--- src/makefile.linux.old 2010-09-10 09:44:53.000000000 +0200
++++ src/makefile.linux 2010-09-10 09:45:09.000000000 +0200
+@@ -13,7 +13,7 @@
+ STATIC = libNL.a
+ OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
+ CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
+-LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
++LIBFLAGS = ${LDFLAGS} -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
+ OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
+
+ all: $(OBJECTS)
diff --git a/dev-games/hawknl/hawknl-1.68-r1.ebuild b/dev-games/hawknl/hawknl-1.68-r1.ebuild
index 10d5d18977be..2bfd4017b1b9 100644
--- a/dev-games/hawknl/hawknl-1.68-r1.ebuild
+++ b/dev-games/hawknl/hawknl-1.68-r1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation, 2004 Richard Garand <richard@garandnet.net>
+# Copyright 1999-2010 Gentoo Foundation, 2004 Richard Garand <richard@garandnet.net>
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68-r1.ebuild,v 1.5 2005/12/17 03:09:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68-r1.ebuild,v 1.6 2010/09/10 10:01:59 tupone Exp $
+EAPI="2"
inherit toolchain-funcs eutils multilib
@@ -19,9 +20,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/hawknl${PV}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
sed -i \
-e '/echo /d' src/makefile.linux \