From 694d8f7e3ee6a87b834e0de426963683f72ac723 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 24 Jul 2009 18:23:17 +0000 Subject: Fix building with GCC 4.4 wrt #277731. Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 --- dev-cpp/tclap/ChangeLog | 6 +++++- dev-cpp/tclap/Manifest | 5 +++-- dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch | 24 ++++++++++++++++++++++++ dev-cpp/tclap/tclap-1.1.0.ebuild | 13 ++++++++++--- 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch (limited to 'dev-cpp/tclap') diff --git a/dev-cpp/tclap/ChangeLog b/dev-cpp/tclap/ChangeLog index debed19ad608..cd7ed420dd55 100644 --- a/dev-cpp/tclap/ChangeLog +++ b/dev-cpp/tclap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-cpp/tclap # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/ChangeLog,v 1.2 2009/04/16 16:34:26 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/ChangeLog,v 1.3 2009/07/24 18:23:17 ssuominen Exp $ + + 24 Jul 2009; Samuli Suominen tclap-1.1.0.ebuild, + +files/tclap-1.1.0-gcc44.patch: + Fix building with GCC 4.4 wrt #277731. 16 Apr 2009; Sébastien Fabbro tclap-1.1.0.ebuild: Added ~amd64 and ~x86, minor QA diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest index eeb13b2b97cf..1acc639a84fc 100644 --- a/dev-cpp/tclap/Manifest +++ b/dev-cpp/tclap/Manifest @@ -1,4 +1,5 @@ +AUX tclap-1.1.0-gcc44.patch 790 RMD160 8c2441cc6c009fa8a3283b0ad81f8c364d4293e6 SHA1 84135468344581d6eea114454b53e366cf7dfea1 SHA256 01ec6ea2cbb4978702501415a4f7f30651fd707a7070a0847517a4efbcda0b42 DIST tclap-1.1.0.tar.gz 169622 RMD160 71fb9b0f90ed27ced00c3028b20de2820fd65b98 SHA1 6c2d66d10d96225bce938c5437d9309f467aed70 SHA256 0f80d68bf0189de37e2765d31cac635a908bb9296bcd91d9eca09933b830db94 -EBUILD tclap-1.1.0.ebuild 541 RMD160 bf6fd4dd082a3a1f42ad97e01711a13eb37a4add SHA1 d76942fa82e6f73d226f5273531895e70446c99f SHA256 316825a531bce62f1000ffc357b1569d8eca4c0ae1216a208bf58f3b2608719a -MISC ChangeLog 432 RMD160 e8a167ec4ef07d1c5e9495d0e035fa94444b9c83 SHA1 fea6f38e45c3dd31ac87f3479afd56289e8628c6 SHA256 878f319cc91c1d8483c4ca59489bcb9617e6493e355f6c8c7fa3aeb966810b6e +EBUILD tclap-1.1.0.ebuild 629 RMD160 486f70ceb03269ed4d246a8c86fee0fe6c142541 SHA1 c24cd70b6b93a327af57ccfa82b1df9ba8c49e85 SHA256 eb3a63ecdf912e381ff5a2b74d1ede77343105ed14c0f2ace9a02c73c2cb50ee +MISC ChangeLog 583 RMD160 8b89640531f7498a2b9819221bacd6f2811e2a3e SHA1 c5422ed4bd6cb49885b95723667c279f0f98590e SHA256 a631114b2018fb788302e54cfaf3dba306dca12f65fef79f3194093de5eb8fee MISC metadata.xml 281 RMD160 0d6696bbb5304702eea033dde874a18afee27d13 SHA1 6653ad7ce37854dc21f8ed3575d54a816a09fdb6 SHA256 e504a49b432079cc7b4a66de487597670c16eb8ec2857ff637874bb75e7f1ed4 diff --git a/dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch b/dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch new file mode 100644 index 000000000000..b13a91123509 --- /dev/null +++ b/dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch @@ -0,0 +1,24 @@ +diff -ur tclap-1.1.0.orig/include/tclap/MultiArg.h tclap-1.1.0/include/tclap/MultiArg.h +--- tclap-1.1.0.orig/include/tclap/MultiArg.h 2005-09-11 02:25:43.000000000 +0300 ++++ tclap-1.1.0/include/tclap/MultiArg.h 2009-07-24 21:20:59.000000000 +0300 +@@ -23,6 +23,8 @@ + #ifndef TCLAP_MULTIPLE_ARGUMENT_H + #define TCLAP_MULTIPLE_ARGUMENT_H + ++#include ++ + #include + #include + +diff -ur tclap-1.1.0.orig/include/tclap/ValueArg.h tclap-1.1.0/include/tclap/ValueArg.h +--- tclap-1.1.0.orig/include/tclap/ValueArg.h 2005-09-11 02:25:43.000000000 +0300 ++++ tclap-1.1.0/include/tclap/ValueArg.h 2009-07-24 21:20:46.000000000 +0300 +@@ -23,6 +23,8 @@ + #ifndef TCLAP_VALUE_ARGUMENT_H + #define TCLAP_VALUE_ARGUMENT_H + ++#include ++ + #include + #include + diff --git a/dev-cpp/tclap/tclap-1.1.0.ebuild b/dev-cpp/tclap/tclap-1.1.0.ebuild index 79772032c6e4..33b86029ac78 100644 --- a/dev-cpp/tclap/tclap-1.1.0.ebuild +++ b/dev-cpp/tclap/tclap-1.1.0.ebuild @@ -1,6 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/tclap-1.1.0.ebuild,v 1.2 2009/04/16 16:34:26 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/tclap-1.1.0.ebuild,v 1.3 2009/07/24 18:23:17 ssuominen Exp $ + +EAPI=2 +inherit eutils DESCRIPTION="Small flexible library for dealing with command line arguments" HOMEPAGE="http://tclap.sourceforge.net" @@ -11,9 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -DEPEND="" RDEPEND="" +DEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc44.patch +} src_install() { - emake DESTDIR="${D}" install || die 'install failed' + emake DESTDIR="${D}" install || die "emake install failed" } -- cgit v1.2.3-65-gdbad