| 1 |
mr_bones_ 12/08/28 20:38:39 |
| 2 |
|
| 3 |
Modified: widelands-0.17.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
set up boost variables to use the right version |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 games-strategy/widelands/widelands-0.17.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: widelands-0.17.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- widelands-0.17.ebuild 4 Aug 2012 14:39:10 -0000 1.4 |
| 23 |
+++ widelands-0.17.ebuild 28 Aug 2012 20:38:39 -0000 1.5 |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.4 2012/08/04 14:39:10 mr_bones_ Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.5 2012/08/28 20:38:39 mr_bones_ Exp $ |
| 29 |
|
| 30 |
EAPI=3 |
| 31 |
-inherit eutils versionator cmake-utils games |
| 32 |
+inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games |
| 33 |
|
| 34 |
MY_PV=build$(get_version_component_range 2) |
| 35 |
MY_P=${PN}-${MY_PV}-src |
| 36 |
@@ -24,7 +24,7 @@ |
| 37 |
media-libs/glew |
| 38 |
media-libs/sdl-ttf" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
- dev-libs/boost" |
| 41 |
+ >=dev-libs/boost-1.37" |
| 42 |
|
| 43 |
S=${WORKDIR}/${MY_P} |
| 44 |
|
| 45 |
@@ -40,6 +40,21 @@ |
| 46 |
sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die |
| 47 |
sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die |
| 48 |
sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die |
| 49 |
+ |
| 50 |
+ # how do I hate boost? Let me count the ways... |
| 51 |
+ local boost_ver=$(best_version ">=dev-libs/boost-1.37") |
| 52 |
+ |
| 53 |
+ boost_ver=${boost_ver/*boost-/} |
| 54 |
+ boost_ver=${boost_ver%.*} |
| 55 |
+ boost_ver=${boost_ver/./_} |
| 56 |
+ |
| 57 |
+ einfo "Using boost version ${boost_ver}" |
| 58 |
+ append-cxxflags \ |
| 59 |
+ -I/usr/include/boost-${boost_ver} |
| 60 |
+ append-ldflags \ |
| 61 |
+ -L/usr/$(get_libdir)/boost-${boost_ver} |
| 62 |
+ export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}" |
| 63 |
+ export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}" |
| 64 |
} |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.45 games-strategy/widelands/ChangeLog |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/ChangeLog?rev=1.45&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/ChangeLog?rev=1.45&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/ChangeLog?r1=1.44&r2=1.45 |
| 75 |
|
| 76 |
Index: ChangeLog |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v |
| 79 |
retrieving revision 1.44 |
| 80 |
retrieving revision 1.45 |
| 81 |
diff -u -r1.44 -r1.45 |
| 82 |
--- ChangeLog 4 Aug 2012 14:39:10 -0000 1.44 |
| 83 |
+++ ChangeLog 28 Aug 2012 20:38:39 -0000 1.45 |
| 84 |
@@ -1,6 +1,9 @@ |
| 85 |
# ChangeLog for games-strategy/widelands |
| 86 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.44 2012/08/04 14:39:10 mr_bones_ Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.45 2012/08/28 20:38:39 mr_bones_ Exp $ |
| 89 |
+ |
| 90 |
+ 28 Aug 2012; Michael Sterrett <mr_bones_@g.o> widelands-0.17.ebuild: |
| 91 |
+ set up boost variables to use the right version |
| 92 |
|
| 93 |
04 Aug 2012; Michael Sterrett <mr_bones_@g.o> |
| 94 |
+files/widelands-0.17-gcc47.patch, widelands-0.17.ebuild: |
| 95 |
@@ -199,4 +202,3 @@ |
| 96 |
Initial import. Original ebuild by Elias Kunnas <elias_kunnas@×××××.com>. |
| 97 |
Ebuild modified by Christoph Brill <egore@×××.de> and by myself. Original |
| 98 |
amd64 patch idea by Peter Roozemaal <mathfox@××××××.nl>. Closing bug #59674. |
| 99 |
- |
Archives