diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-07-30 08:23:11 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-07-30 08:23:11 +0000 |
| commit | 33fcee0ef2b55d5a06c0b9a71e75ebfdf7edfb52 (patch) | |
| tree | a97cb574d32049c78e4967f48e273fe98e8183c3 /games-simulation | |
| parent | add lua module + cleanup (diff) | |
| download | gentoo-2-33fcee0ef2b55d5a06c0b9a71e75ebfdf7edfb52.tar.gz gentoo-2-33fcee0ef2b55d5a06c0b9a71e75ebfdf7edfb52.tar.bz2 gentoo-2-33fcee0ef2b55d5a06c0b9a71e75ebfdf7edfb52.zip | |
fix bug 428572
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'games-simulation')
| -rw-r--r-- | games-simulation/lincity-ng/ChangeLog | 6 | ||||
| -rw-r--r-- | games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch | 19 | ||||
| -rw-r--r-- | games-simulation/lincity-ng/lincity-ng-2.0.ebuild | 6 |
3 files changed, 29 insertions, 2 deletions
diff --git a/games-simulation/lincity-ng/ChangeLog b/games-simulation/lincity-ng/ChangeLog index bea702071db4..e1f0c1f66c04 100644 --- a/games-simulation/lincity-ng/ChangeLog +++ b/games-simulation/lincity-ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-simulation/lincity-ng # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/ChangeLog,v 1.22 2012/06/15 15:49:10 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/ChangeLog,v 1.23 2012/07/30 08:23:11 hasufell Exp $ + + 30 Jul 2012; Julian Ospald <hasufell@gentoo.org> lincity-ng-2.0.ebuild, + +files/lincity-ng-2.0-build.patch: + fix bug 428572 15 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> lincity-ng-2.0.ebuild: add multiprocessing for makeopts_jobs diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch new file mode 100644 index 000000000000..f7abfd420d9f --- /dev/null +++ b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch @@ -0,0 +1,19 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Mon Jul 30 07:06:54 UTC 2012 +Subject: build system + +arguments to AR would be overwritten if we export AR + +--- mk/jam/unix.jam ++++ mk/jam/unix.jam +@@ -45,4 +45,10 @@ + $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS) + } + ++# jam Archive action seems to include the arguments which will break our AR export ++actions Archive ++{ ++ $(AR) ru $(<) $(>) ++} ++ + diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild index 5fa7defb66be..5e8c0d424f58 100644 --- a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild +++ b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/lincity-ng-2.0.ebuild,v 1.8 2012/06/15 15:49:10 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/lincity-ng-2.0.ebuild,v 1.9 2012/07/30 08:23:11 hasufell Exp $ EAPI=2 inherit eutils multiprocessing games @@ -27,6 +27,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig dev-util/ftjam" +src_prepare() { + epatch "${FILESDIR}"/${P}-build.patch +} + src_compile() { jam -q -dx -j $(makeopts_jobs) || die "jam failed" } |