diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2011-09-28 14:39:18 +0000 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2011-09-28 14:39:18 +0000 |
| commit | 1a6207ffd0c79acadaca5e6ecd8d7207dfc455d3 (patch) | |
| tree | 66cc1c19103f1d3c0215034f2b4348efb3bb678c /sci-geosciences | |
| parent | dev-vcs/gitg: Bump to 0.2.5 (bug #383527) (diff) | |
| download | gentoo-2-1a6207ffd0c79acadaca5e6ecd8d7207dfc455d3.tar.gz gentoo-2-1a6207ffd0c79acadaca5e6ecd8d7207dfc455d3.tar.bz2 gentoo-2-1a6207ffd0c79acadaca5e6ecd8d7207dfc455d3.zip | |
Add patch to fix linking against tinyxml[stl]. Fixes #384781
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/opencpn/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch | 16 | ||||
| -rw-r--r-- | sci-geosciences/opencpn/opencpn-2.5.0.ebuild | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog index 3dc8b8d846f9..1c73dfb2fa96 100644 --- a/sci-geosciences/opencpn/ChangeLog +++ b/sci-geosciences/opencpn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/opencpn # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.4 2011/07/31 14:25:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.5 2011/09/28 14:39:18 mschiff Exp $ + + 28 Sep 2011; Marc Schiffbauer <mschiff@gentoo.org> opencpn-2.5.0.ebuild, + +files/opencpn-2.5.0_tinyxml_stl.patch: + Add patch to fix linking against tinyxml[stl]. Fixes #384781 *opencpn-2.5.0 (31 Jul 2011) diff --git a/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch b/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch new file mode 100644 index 000000000000..cf3980e4e8c7 --- /dev/null +++ b/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch @@ -0,0 +1,16 @@ +--- OpenCPN-2.5.0-Source/CMakeLists.txt 2011-07-26 16:51:59.000000000 +0200 ++++ opencpn/CMakeLists.txt 2011-09-28 16:28:35.181651034 +0200 +@@ -325,9 +325,12 @@ + ) + + IF(TINYXML_FOUND) ++ message (STATUS "Building with tinyxml includes") + INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR}) ++ ADD_DEFINITIONS(-DTIXML_USE_STL) + ELSE(TINYXML_FOUND) +- SET(SRCS ${SRCS} ${SRC_TINYXML}) ++ message (STATUS "tinyxml library not found") ++ SET(SRCS ${SRCS} ${SRC_TINYXML}) + ENDIF(TINYXML_FOUND) + + diff --git a/sci-geosciences/opencpn/opencpn-2.5.0.ebuild b/sci-geosciences/opencpn/opencpn-2.5.0.ebuild index 76074522f567..0f474befd6cb 100644 --- a/sci-geosciences/opencpn/opencpn-2.5.0.ebuild +++ b/sci-geosciences/opencpn/opencpn-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.5.0.ebuild,v 1.1 2011/07/31 14:25:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.5.0.ebuild,v 1.2 2011/09/28 14:39:18 mschiff Exp $ EAPI=4 @@ -34,6 +34,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${P}-multilib-strict.patch" + "${FILESDIR}/${P}_tinyxml_stl.patch" ) src_configure() { |