diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-02-12 09:13:08 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-02-12 09:13:08 +0000 |
| commit | 23541e4e06c527488434139e6acbbbee19f54fca (patch) | |
| tree | 59833c982af2d6dfc4924940194945a58c736cb5 /games-strategy | |
| parent | Version bump using the latest Gentoo patchset. Also include the Percona patch... (diff) | |
| download | gentoo-2-23541e4e06c527488434139e6acbbbee19f54fca.tar.gz gentoo-2-23541e4e06c527488434139e6acbbbee19f54fca.tar.bz2 gentoo-2-23541e4e06c527488434139e6acbbbee19f54fca.zip | |
Fix --as-needed bug #247496
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/lgeneral/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch | 13 | ||||
| -rw-r--r-- | games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild | 22 |
3 files changed, 33 insertions, 10 deletions
diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog index 6e0013554766..51c9fbe6c9ad 100644 --- a/games-strategy/lgeneral/ChangeLog +++ b/games-strategy/lgeneral/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/lgeneral -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.25 2007/05/24 06:35:26 opfer Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.26 2009/02/12 09:13:08 tupone Exp $ + + 12 Feb 2009; Alfredo Tupone <tupone@gentoo.org> + +files/lgeneral-1.2_beta12-as-needed.patch, lgeneral-1.2_beta12-r1.ebuild: + Fix --as-needed bug #247496 by flameeyes@gentoo.org 24 May 2007; Christian Faulhammer <opfer@gentoo.org> lgeneral-1.2_beta12-r1.ebuild: diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch new file mode 100644 index 000000000000..2361aa54d569 --- /dev/null +++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch @@ -0,0 +1,13 @@ +--- tools/ltrextract/Makefile.am.old 2009-02-12 09:48:37.000000000 +0100 ++++ tools/ltrextract/Makefile.am 2009-02-12 09:50:36.000000000 +0100 +@@ -3,9 +3,8 @@ + + bin_PROGRAMS = ltrextract + +-LIBS = $(top_builddir)/util/libutil.a $(INTLLIBS) + AM_CFLAGS = -DLTREXTRACT @dis_flag@ -I$(LGENERAL_PATH) -I$(top_srcdir) -I$(top_srcdir)/util $(INTLINCLUDES) +-ltrextract_LDFLAGS = -lm ++ltrextract_LDADD = $(top_builddir)/util/libutil.a $(INTLLIBS) + ltrextract_SOURCES = ltrextract.c util.c util.h \ + terrain.c terrain.h map.c map.h nation.c nation.h \ + unit_lib.c unit_lib.h scenario.c scenario.h campaign.c campaign.h \ diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild index 6b7c3fa246d2..14cefab874f0 100644 --- a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild +++ b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.6 2007/05/24 06:35:26 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.7 2009/02/12 09:13:08 tupone Exp $ +EAPI=2 inherit eutils autotools games MY_P="${P/_/}" @@ -24,14 +25,13 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch \ "${FILESDIR}"/${P}-gentoo-path.patch \ "${FILESDIR}"/${P}-gettext.patch \ "${FILESDIR}"/${P}-64bit.patch \ - "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-as-needed.patch cp /usr/share/gettext/config.rpath . rm -f missing @@ -53,12 +53,11 @@ src_unpack() { || die "sed failed (tmp)" } -src_compile() { +src_configure() { egamesconf \ --disable-dependency-tracking \ $(use_enable nls) \ || die - emake || die "emake failed" # Build the temporary lgc-pg: cd "${WORKDIR}"/tmp-build @@ -67,6 +66,13 @@ src_compile() { --disable-nls \ --datadir="${D}/${GAMES_DATADIR}" \ || die +} + +src_compile() { + emake || die "emake failed" + + # Build the temporary lgc-pg: + cd "${WORKDIR}"/tmp-build emake || die "emake failed (tmp)" } |