summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-12 13:14:24 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-12 13:14:24 +0000
commitef2ecdffc4bd141816bfec65c29f42950e9923c1 (patch)
treedb9f648db3ad15d368228064903b9334fae6b0e1 /dev-libs/tinyxml
parentstable x86, security bug 314087 (diff)
downloadgentoo-2-ef2ecdffc4bd141816bfec65c29f42950e9923c1.tar.gz
gentoo-2-ef2ecdffc4bd141816bfec65c29f42950e9923c1.tar.bz2
gentoo-2-ef2ecdffc4bd141816bfec65c29f42950e9923c1.zip
Support for USE="stl" wrt #314669
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/tinyxml')
-rw-r--r--dev-libs/tinyxml/ChangeLog8
-rw-r--r--dev-libs/tinyxml/files/Makefile1
-rw-r--r--dev-libs/tinyxml/metadata.xml3
-rw-r--r--dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild (renamed from dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild)5
4 files changed, 13 insertions, 4 deletions
diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 211970014917..a9a96e1efcdd 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/tinyxml
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.3 2010/03/07 10:00:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.4 2010/04/12 13:14:24 ssuominen Exp $
+
+*tinyxml-2.5.3_p20090813-r1 (12 Apr 2010)
+
+ 12 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +tinyxml-2.5.3_p20090813-r1.ebuild, files/Makefile, metadata.xml:
+ Support for USE="stl" wrt #314669
07 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
tinyxml-2.5.3_p20090813.ebuild:
diff --git a/dev-libs/tinyxml/files/Makefile b/dev-libs/tinyxml/files/Makefile
index 2a7bd6a5e00f..1db0244525cb 100644
--- a/dev-libs/tinyxml/files/Makefile
+++ b/dev-libs/tinyxml/files/Makefile
@@ -1,5 +1,4 @@
AR ?= ar
-CPPFLAGS += -DTIXML_USE_STL
CXX ?= g++
CXXFLAGS += -Wall
RANLIB ?= ranlib
diff --git a/dev-libs/tinyxml/metadata.xml b/dev-libs/tinyxml/metadata.xml
index 7cc5007c5d79..361dd823f6e6 100644
--- a/dev-libs/tinyxml/metadata.xml
+++ b/dev-libs/tinyxml/metadata.xml
@@ -6,4 +6,7 @@
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+ <use>
+ <flag name='stl'>Compile with TIXML_USE_STL support</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild b/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild
index 1703c3aef745..d94d86af7781 100644
--- a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild,v 1.5 2010/03/07 10:00:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild,v 1.1 2010/04/12 13:14:24 ssuominen Exp $
EAPI=2
inherit flag-o-matic toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
+IUSE="debug doc stl"
RDEPEND=""
DEPEND="doc? ( app-doc/doxygen )"
@@ -23,6 +23,7 @@ src_prepare() {
src_compile() {
use debug && append-cppflags -DDEBUG
+ use stl && append-cppflags -DTIXML_USE_STL
tc-export AR CXX RANLIB