diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-02 12:57:09 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-02 12:57:09 +0000 |
| commit | 479dbb9ba5afe52bb789ef325799672a7d6da758 (patch) | |
| tree | a0990c50f88d9c2b2aee07a6614669ac6963b8fa /sci-libs/cifparse-obj | |
| parent | Stable for amd64, wrt bug #417997 (diff) | |
| download | historical-479dbb9ba5afe52bb789ef325799672a7d6da758.tar.gz historical-479dbb9ba5afe52bb789ef325799672a7d6da758.tar.bz2 historical-479dbb9ba5afe52bb789ef325799672a7d6da758.zip | |
sci-libs/cifparse-obj: Fix for gcc-4.7
Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/cifparse-obj')
| -rw-r--r-- | sci-libs/cifparse-obj/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/cifparse-obj/Manifest | 14 | ||||
| -rw-r--r-- | sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild | 7 | ||||
| -rw-r--r-- | sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch | 64 |
4 files changed, 82 insertions, 11 deletions
diff --git a/sci-libs/cifparse-obj/ChangeLog b/sci-libs/cifparse-obj/ChangeLog index 91fe5947cd81..8374a7c4f431 100644 --- a/sci-libs/cifparse-obj/ChangeLog +++ b/sci-libs/cifparse-obj/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/cifparse-obj -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cifparse-obj/ChangeLog,v 1.14 2011/11/21 15:23:05 jlec Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cifparse-obj/ChangeLog,v 1.15 2012/06/02 12:57:09 jlec Exp $ + + 02 Jun 2012; Justin Lecher <jlec@gentoo.org> cifparse-obj-7.025.ebuild, + +files/cifparse-obj-7.025-gcc4.7.patch: + Fix for gcc-4.7 21 Nov 2011; Justin Lecher <jlec@gentoo.org> cifparse-obj-7.025.ebuild: keyworded for ~x86-macos ~x64-macos, tested by Johan Hattne #390123 diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest index e833d0c7566b..5b5e1d196281 100644 --- a/sci-libs/cifparse-obj/Manifest +++ b/sci-libs/cifparse-obj/Manifest @@ -2,18 +2,20 @@ Hash: SHA512 AUX cifparse-obj-7.025-gcc4.3.patch 3926 RMD160 60729a67ca24e74b4f72bb144cc7b8727828a327 SHA1 950582611d506b53531c44f87c79112807832757 SHA256 784a0f0a08fae029152c4f995740f94ec13cbc37d193d89d137f539dd4d6e789 +AUX cifparse-obj-7.025-gcc4.7.patch 2339 RMD160 3b01f4105a2ae0a1729d69837ec4453929bc0a6c SHA1 1725ab716397a6dba96a3a656035cd52fe377171 SHA256 41f442585c48e85fd08a41a13817f4223ec24044cbb32386e9f6db83e9676c6a AUX cifparse-obj-7.025-makefile.patch 4405 RMD160 5d8bf301a5ad26829c1be70b0174e38765a9707d SHA1 5560bdb1cb3a910b488f47da22081570d8a84553 SHA256 1b70620f492e027f01273f316e6bf543b22c1586555d9df5a589edaa7cdc3a79 AUX respect-flags-and-add-gcc4.patch 10289 RMD160 499064392ba6688096d32d00a4b67fe31907eae8 SHA1 d92860ac4ac13e9f99794b98a4d99037910f4062 SHA256 dd25733544c0c8f78d6c1c26e78404bcecdaa71e5339f74c547f229c427bed9c DIST cifparse-obj-v6.302-prod-src.tar.gz 782727 RMD160 6562c8c9593446a54a3a83d4f1aefbc36a67fdd3 SHA1 33495f47170aaba35fe9081ad2955af3f9c38a8a SHA256 0a0676083594da63811fccfce50bcbe0a0c3623df8773d319120cf2d758f4cd1 DIST cifparse-obj-v7.025-prod-src.tar.gz 928484 RMD160 e87b6a5995966946f7554283d18dec06924cef0e SHA1 bb09169aaa06ba858bdb8741603c1b5284943090 SHA256 f2fd71fc2af0995839d9ee7825403e383209bb45a1bad68c270e5756476a8ef8 EBUILD cifparse-obj-6.302.ebuild 946 RMD160 3ea754352614b9a688483c2d50a78598d1d8dd0b SHA1 c59a27af4f6d1dda7ae91030b1d9827167e4078f SHA256 aa9d3fbe26be47ce2d99c638c7beee46b9e6b1200858a29b0e4249a0a69f4d0d -EBUILD cifparse-obj-7.025.ebuild 1293 RMD160 824e28b5a56d1d98885ddfbe6b60ed40a1296f83 SHA1 de579c246ddba84e944709aad3734364b444cefc SHA256 b168e5d078e198abb730034851daf8b4307fbcde02940c5687ae786b8102609a -MISC ChangeLog 2215 RMD160 e467b66ec52af95be47d6ccb66cdd32cedf4cc32 SHA1 657387e6488db1384f129e53ea1fe7a566cae2a1 SHA256 f538a77ee95c359856d93b5e09f18d26947717830b52ed2453f6c75865b130a9 +EBUILD cifparse-obj-7.025.ebuild 1329 RMD160 f7b4c6cf69a51e2a06b60062bd2b1f06054f5306 SHA1 971795d71305160cbfb16b33468889820d5e490e SHA256 4a4d9103ed186c9be43f3948b0a6db3a14fd4123f1cdbfccacea537baeffc63a +MISC ChangeLog 2350 RMD160 25a61fb47d58a83e62e447d92d45bdd392defd7f SHA1 f32a4718f773d2519a25521c48b5549bcbd9cfbe SHA256 d8979be02bd12673f0c4426c6a4e848a4381104ab02e1b709990f3ce4d7d6d4b MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iEYEAREKAAYFAk7KbN4ACgkQgAnW8HDreRaWfQCfVCPOYLk2nsurtFWpxT6/Gfjs -PIwAn3v9wXSRyQRE2vanQbi4CFw7ZkzL -=1KEw +iEYEAREKAAYFAk/KDaoACgkQgAnW8HDreRbd2gCgpaTNcgTVmIYCIoBycsb8+RDh +yAUAoI5Imbjbt1K5SnFK3hAEQKTRNUVP +=ztpi -----END PGP SIGNATURE----- diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild index 616f8844e045..5aabb24ab961 100644 --- a/sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild +++ b/sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild @@ -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/sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild,v 1.7 2011/11/21 15:23:05 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cifparse-obj/cifparse-obj-7.025.ebuild,v 1.8 2012/06/02 12:57:09 jlec Exp $ inherit eutils toolchain-funcs @@ -28,7 +28,8 @@ src_unpack() { epatch \ "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-gcc4.3.patch + "${FILESDIR}"/${P}-gcc4.3.patch \ + "${FILESDIR}"/${P}-gcc4.7.patch sed -i \ -e "s:^\(CC=\).*:\1$(tc-getCC):g" \ diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch new file mode 100644 index 000000000000..b828ae618caa --- /dev/null +++ b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch @@ -0,0 +1,64 @@ + common-v4.5/src/mapped_ptr_vector.C | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C +index 0ffff35..993d0b9 100644 +--- a/common-v4.5/src/mapped_ptr_vector.C ++++ b/common-v4.5/src/mapped_ptr_vector.C +@@ -256,12 +256,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP, + _vector.push_back(inP); + + typename tIndex::value_type valuePair(inP->GetName(), +- make_pair(_vector.size() - 1, fileIndex)); ++ std::make_pair(_vector.size() - 1, fileIndex)); + + _index.insert(valuePair); + + _currentName = inP->GetName(); +- _currentIndices = make_pair(_vector.size() - 1, fileIndex); ++ _currentIndices = std::make_pair(_vector.size() - 1, fileIndex); + + } + +@@ -274,12 +274,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name, + _vector.push_back(NULL); + + typename tIndex::value_type valuePair(name, +- make_pair(_vector.size() - 1, fileIndex)); ++ std::make_pair(_vector.size() - 1, fileIndex)); + + _index.insert(valuePair); + + _currentName = name; +- _currentIndices = make_pair(_vector.size() - 1, fileIndex); ++ _currentIndices = std::make_pair(_vector.size() - 1, fileIndex); + } + + +@@ -447,7 +447,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name) + if (is_equal(_currentName, name, keyComp)) + { + _currentName.clear(); +- _currentIndices = make_pair(_vector.size(), (unsigned int)0); ++ _currentIndices = std::make_pair(_vector.size(), (unsigned int)0); + } + + } +@@ -532,7 +532,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic + if (_vector.empty()) + { + // Empty container. Return invalid index. +- return(make_pair(_vector.size(), (unsigned int)0)); ++ return(std::make_pair(_vector.size(), (unsigned int)0)); + } + + typename tIndex::key_compare keyComp = _index.key_comp(); +@@ -556,7 +556,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic + else + { + // Not found. Return invalid index. +- return(make_pair(_vector.size(), (unsigned int)0)); ++ return(std::make_pair(_vector.size(), (unsigned int)0)); + } + } + |