| 1 |
commit: f3e0f6b5e25c105883519fed4d701329201d0dc4 |
| 2 |
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de> |
| 3 |
AuthorDate: Wed Sep 28 23:16:45 2011 +0000 |
| 4 |
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de> |
| 5 |
CommitDate: Wed Sep 28 23:17:37 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=f3e0f6b5 |
| 7 |
|
| 8 |
[games-util/terragear-cs] parallel build patch is now upstream |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/terragear-cs-fix-parallel-build.patch | 45 -------------------- |
| 12 |
games-util/terragear-cs/terragear-cs-9999.ebuild | 1 - |
| 13 |
2 files changed, 0 insertions(+), 46 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
deleted file mode 100644 |
| 17 |
index 7a2438a..0000000 |
| 18 |
--- a/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,45 +0,0 @@ |
| 21 |
-diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am |
| 22 |
-index 6557c98..eba2694 100644 |
| 23 |
---- a/src/BuildTiles/Clipper/Makefile.am |
| 24 |
-+++ b/src/BuildTiles/Clipper/Makefile.am |
| 25 |
-@@ -5,9 +5,7 @@ dist_pkgdata_DATA = default_priorities.txt |
| 26 |
- noinst_PROGRAMS = testclipper |
| 27 |
- |
| 28 |
- testclipper_SOURCES = testclipper.cxx |
| 29 |
-- |
| 30 |
--testclipper_LDADD = \ |
| 31 |
-- $(top_builddir)/src/BuildTiles/Clipper/libClipper.a \ |
| 32 |
-+testclipper_LDADD = libClipper.a \ |
| 33 |
- $(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \ |
| 34 |
- $(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \ |
| 35 |
- $(top_builddir)/src/Lib/Polygon/libPolygon.a \ |
| 36 |
-diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am |
| 37 |
-index 10636d5..acb41db 100644 |
| 38 |
---- a/src/Lib/Array/Makefile.am |
| 39 |
-+++ b/src/Lib/Array/Makefile.am |
| 40 |
-@@ -6,9 +6,7 @@ libArray_a_SOURCES = array.cxx array.hxx |
| 41 |
- bin_PROGRAMS = testarray |
| 42 |
- |
| 43 |
- testarray_SOURCES = testarray.cxx |
| 44 |
-- |
| 45 |
--testarray_LDADD = \ |
| 46 |
-- $(top_builddir)/src/Lib/Array/libArray.a \ |
| 47 |
-+testarray_LDADD = libArray.a \ |
| 48 |
- -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml \ |
| 49 |
- $(support_LIBS) -lz |
| 50 |
- |
| 51 |
-diff --git a/src/Lib/HGT/Makefile.am b/src/Lib/HGT/Makefile.am |
| 52 |
-index b4ee8cb..16809aa 100644 |
| 53 |
---- a/src/Lib/HGT/Makefile.am |
| 54 |
-+++ b/src/Lib/HGT/Makefile.am |
| 55 |
-@@ -5,9 +5,7 @@ libHGT_a_SOURCES = hgt.cxx hgt.hxx srtmbase.cxx srtmbase.hxx |
| 56 |
- noinst_PROGRAMS = testhgt |
| 57 |
- |
| 58 |
- testhgt_SOURCES = testhgt.cxx |
| 59 |
-- |
| 60 |
--testhgt_LDADD = \ |
| 61 |
-- $(top_builddir)/src/Lib/HGT/libHGT.a \ |
| 62 |
-+testhgt_LDADD = libHGT.a \ |
| 63 |
- -lsgbucket -lsgmisc -lsgdebug -lz -lplibul |
| 64 |
- |
| 65 |
- INCLUDES = -I$(top_srcdir)/src |
| 66 |
|
| 67 |
diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild |
| 68 |
index 521b8be..c318b67 100644 |
| 69 |
--- a/games-util/terragear-cs/terragear-cs-9999.ebuild |
| 70 |
+++ b/games-util/terragear-cs/terragear-cs-9999.ebuild |
| 71 |
@@ -25,7 +25,6 @@ DEPEND="dev-games/simgear-cs |
| 72 |
RDEPEND="${DEPEND}" |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
- epatch ${FILESDIR}/"${PN}"-fix-parallel-build.patch |
| 76 |
epatch ${FILESDIR}/"${PN}"-setrlimit.patch |
| 77 |
epatch ${FILESDIR}/"${PN}"-use-agg.patch |
| 78 |
eautoreconf |
Archives