[gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/

[Christian Schmitt]

commit:     9d558699e040fb95a5f88c8d7e28794b57a40f91
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Aug 29 22:29:35 2011 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Mon Aug 29 22:29:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=9d558699

[games-util/terragear-cs] add parallel make patch

---
 .../files/terragear-cs-fix-parallel-build.patch    |   45 ++++++++++++++++++++
 games-util/terragear-cs/terragear-cs-9999.ebuild   |    5 +--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch b/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch
new file mode 100644
index 0000000..7a2438a
--- /dev/null
+++ b/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch
@@ -0,0 +1,45 @@
+diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am
+index 6557c98..eba2694 100644
+--- a/src/BuildTiles/Clipper/Makefile.am
++++ b/src/BuildTiles/Clipper/Makefile.am
+@@ -5,9 +5,7 @@ dist_pkgdata_DATA = default_priorities.txt
+ noinst_PROGRAMS = testclipper
+ 
+ testclipper_SOURCES = testclipper.cxx
+-
+-testclipper_LDADD = \
+-	$(top_builddir)/src/BuildTiles/Clipper/libClipper.a \
++testclipper_LDADD = libClipper.a \
+ 	$(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \
+ 	$(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \
+ 	$(top_builddir)/src/Lib/Polygon/libPolygon.a \
+diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am
+index 10636d5..acb41db 100644
+--- a/src/Lib/Array/Makefile.am
++++ b/src/Lib/Array/Makefile.am
+@@ -6,9 +6,7 @@ libArray_a_SOURCES = array.cxx array.hxx
+ bin_PROGRAMS = testarray
+ 
+ testarray_SOURCES = testarray.cxx
+-
+-testarray_LDADD = \
+-	$(top_builddir)/src/Lib/Array/libArray.a \
++testarray_LDADD = libArray.a \
+ 	-lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml \
+ 	$(support_LIBS) -lz 
+ 
+diff --git a/src/Lib/HGT/Makefile.am b/src/Lib/HGT/Makefile.am
+index b4ee8cb..16809aa 100644
+--- a/src/Lib/HGT/Makefile.am
++++ b/src/Lib/HGT/Makefile.am
+@@ -5,9 +5,7 @@ libHGT_a_SOURCES = hgt.cxx hgt.hxx srtmbase.cxx srtmbase.hxx
+ noinst_PROGRAMS = testhgt
+ 
+ testhgt_SOURCES = testhgt.cxx
+-
+-testhgt_LDADD = \
+-	$(top_builddir)/src/Lib/HGT/libHGT.a \
++testhgt_LDADD = libHGT.a \
+ 	-lsgbucket -lsgmisc -lsgdebug -lz -lplibul
+ 
+ INCLUDES = -I$(top_srcdir)/src

diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
index 9657e07..79c124a 100644
--- a/games-util/terragear-cs/terragear-cs-9999.ebuild
+++ b/games-util/terragear-cs/terragear-cs-9999.ebuild
@@ -25,6 +25,7 @@ DEPEND="dev-games/simgear
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch ${FILESDIR}/"${PN}"-fix-parallel-build.patch
 	epatch ${FILESDIR}/"${PN}"-setrlimit.patch
 	epatch ${FILESDIR}/"${PN}"-use-agg.patch
 	eautoreconf
@@ -33,7 +34,3 @@ src_prepare() {
 src_configure() {
 	econf $(use_with gdal)
 }
-
-src_compile() {
-	emake -j1
-}