diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-25 13:27:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-25 13:27:11 +0000 |
| commit | 697cd2121b841e68415509a7ecefdaeb6ac0ac34 (patch) | |
| tree | 71bb72c0cf61c68157724c251bbb28847c2c5741 /games-strategy/lgeneral | |
| parent | amd64/x86 stable (diff) | |
| download | gentoo-2-697cd2121b841e68415509a7ecefdaeb6ac0ac34.tar.gz gentoo-2-697cd2121b841e68415509a7ecefdaeb6ac0ac34.tar.bz2 gentoo-2-697cd2121b841e68415509a7ecefdaeb6ac0ac34.zip | |
Fix building with make >= 3.82 wrt #337610 by Diego E. Pettenò.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/lgeneral')
| -rw-r--r-- | games-strategy/lgeneral/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch | 23 | ||||
| -rw-r--r-- | games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild | 7 |
3 files changed, 33 insertions, 5 deletions
diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog index 6be5a5e86afb..5489fb03d217 100644 --- a/games-strategy/lgeneral/ChangeLog +++ b/games-strategy/lgeneral/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/lgeneral -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.29 2009/10/30 11:23:04 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.30 2010/09/25 13:27:11 ssuominen Exp $ + + 25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + lgeneral-1.2_beta13.ebuild, +files/lgeneral-1.2_beta13-make-382.patch: + Fix building with make >= 3.82 wrt #337610 by Diego E. Pettenò. 30 Oct 2009; Markus Meier <maekke@gentoo.org> lgeneral-1.2_beta13.ebuild: amd64/x86 stable, bug #290055 diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch new file mode 100644 index 000000000000..f4eed33c2bdb --- /dev/null +++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch @@ -0,0 +1,23 @@ +http://bugs.gentoo.org/337610 + +--- intl/Makefile.in ++++ intl/Makefile.in +@@ -206,12 +206,12 @@ + # The dependency for intlh.inst is different in gettext and all other + # packages. Because we cannot you GNU make features we have to solve + # the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: ++intlh.inst: intlh.inst.in ../config.status ++ cd .. \ ++ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ ++ $(SHELL) ./config.status ++.PHONY: intlh.inst ++intlh.inst: + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild index dee0eb733fc8..95d1e8beb398 100644 --- a/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild +++ b/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild,v 1.3 2009/10/30 11:23:04 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild,v 1.4 2010/09/25 13:27:11 ssuominen Exp $ EAPI=2 inherit eutils autotools games @@ -30,7 +30,8 @@ src_prepare() { "${FILESDIR}"/${P}-gentoo-path.patch \ "${FILESDIR}"/${P}-64bit.patch \ "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-make-382.patch cp /usr/share/gettext/config.rpath . rm -f missing |