* [gentoo-commits] gentoo-x86 commit in dev-libs/tinyxml: tinyxml-2.6.2-r2.ebuild ChangeLog tinyxml-2.6.2.ebuild tinyxml-2.6.2-r1.ebuild
@ 2012-03-15 0:09 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; only message in thread
From: Bernard Cafarelli (voyageur) @ 2012-03-15 0:09 UTC (permalink / raw
To: gentoo-commits
voyageur 12/03/15 00:09:38
Modified: tinyxml-2.6.2-r2.ebuild ChangeLog
tinyxml-2.6.2.ebuild
Removed: tinyxml-2.6.2-r1.ebuild
Log:
Control static archives building, not installation only with USE=static-libs, thanks ssuominen in bug #408239
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild?r1=1.1&r2=1.2
Index: tinyxml-2.6.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyxml-2.6.2-r2.ebuild 14 Mar 2012 23:07:32 -0000 1.1
+++ tinyxml-2.6.2-r2.ebuild 15 Mar 2012 00:09:38 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v 1.1 2012/03/14 23:07:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v 1.2 2012/03/15 00:09:38 voyageur Exp $
EAPI=4
inherit flag-o-matic toolchain-funcs eutils multilib
@@ -33,6 +33,10 @@
use debug && append-cppflags -DDEBUG
use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch
+ if ! use static-libs; then
+ sed -e "/^all:/s/\$(name).a //" -i Makefile || die
+ fi
+
tc-export AR CXX RANLIB
[[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
@@ -40,7 +44,6 @@
src_install() {
dolib.so *$(get_libname)*
- use static-libs && dolib.a *.a
insinto /usr/include
doins *.h
1.20 dev-libs/tinyxml/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 14 Mar 2012 23:07:32 -0000 1.19
+++ ChangeLog 15 Mar 2012 00:09:38 -0000 1.20
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/tinyxml
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.19 2012/03/14 23:07:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.20 2012/03/15 00:09:38 voyageur Exp $
+
+ 15 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> tinyxml-2.6.2.ebuild,
+ -tinyxml-2.6.2-r1.ebuild, tinyxml-2.6.2-r2.ebuild:
+ Control static archives building, not installation only with USE=static-libs,
+ thanks ssuominen in bug #408239
*tinyxml-2.6.2-r2 (14 Mar 2012)
1.6 dev-libs/tinyxml/tinyxml-2.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild?r1=1.5&r2=1.6
Index: tinyxml-2.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tinyxml-2.6.2.ebuild 28 Oct 2011 08:48:30 -0000 1.5
+++ tinyxml-2.6.2.ebuild 15 Mar 2012 00:09:38 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild,v 1.5 2011/10/28 08:48:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild,v 1.6 2012/03/15 00:09:38 voyageur Exp $
EAPI=4
inherit flag-o-matic toolchain-funcs eutils
@@ -33,12 +33,15 @@
use debug && append-cppflags -DDEBUG
use stl && append-cppflags -DTIXML_USE_STL
+ if ! use static-libs; then
+ sed -e "/^all:/s/\$(name).a //" -i Makefile || die
+ fi
+
tc-export AR CXX RANLIB
}
src_install() {
dolib.so *.so*
- use static-libs && dolib.a *.a
insinto /usr/include
doins *.h
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-15 0:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15 0:09 [gentoo-commits] gentoo-x86 commit in dev-libs/tinyxml: tinyxml-2.6.2-r2.ebuild ChangeLog tinyxml-2.6.2.ebuild tinyxml-2.6.2-r1.ebuild Bernard Cafarelli (voyageur)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox