From: Justin Lecher Date: Mon, 9 Feb 2015 07:55:32 +0000 (+0000) Subject: Fix link problems due to fatal warnings, #534096 & #538782 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=540b1444bdf64d58530555435ee2dc9063be0fd2;p=gentoo.git Fix link problems due to fatal warnings, #534096 & #538782 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 49ff78cc3dd0..a2a626141c08 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.124 2015/01/06 09:45:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.125 2015/02/09 07:55:31 jlec Exp $ + + 09 Feb 2015; Justin Lecher +files/vtk-6.1.0-memset.patch, + vtk-6.1.0-r1.ebuild: + Fix link problems due to fatal warnings, #534096 & #538782 06 Jan 2015; Alexis Ballier vtk-6.1.0-r1.ebuild: keyword ~arm diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 9e40011169ba..20825f58fa89 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX vtk-5.10.1-ffmpeg-1.patch 1626 SHA256 312402db11bbc47d1596a5c58ee127af6a5807dda2331df402ebcfe7e999ea7c SHA512 34a59c7229a9dbd63d2c346906536fc1d53965489ecb148b57fd2b4b71e7b428d3bd162aa008cc92d72c006720217bf9c72863f761b7cd9b7e2241be8c52f327 WHIRLPOOL 5319732317a82df89d37914f831bf516e66ff58cd5a4a7d2ae777d732590af6ec5f8dd9d90a59ac8f46c1e228483081ade46e0ee02c2bb6ce713fbfc4ce3c669 AUX vtk-5.10.1-libav-9.patch 3474 SHA256 688b58df16c0fada2ef5ccca8c53a8029bd6b3a6eaaddec3a210ac880cba2120 SHA512 f22d8c215aa23b9e719598b034657a61092d326dd7e2ef0e7e68a1ff0d33e1a6523e0ae85fbc2a1e72c869a295b257563daef0842f67b27716ab2652d03bb447 WHIRLPOOL 2a0cf463926b4e06df02942a0f63aeb0a659da6f1ba85a456485691199de48d418ce2c222f39a3b69876961491bf3bcacb8b1272793e3f7785771cd474e8cb75 @@ -28,6 +28,7 @@ AUX vtk-6.0.0-vtkpython.patch 583 SHA256 93280898c89da7f99962fe5536006ae52bf4881 AUX vtk-6.1.0-freetype.patch 1159 SHA256 ab95039cf8f39d1dcdf97a3ae62c4aa47f6daad4defdb5be842719102036c452 SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0 WHIRLPOOL 95b7d29a790aa095b2ded9becb8cb02f9ca837ab4c18cae62a5f7f8191fd94af6c5e4df5359b4ea1268d01e72fe6f8eff56ec7cef8b2ef823021f8e5395fc911 AUX vtk-6.1.0-glext.patch 609 SHA256 17370b853306658f8421a5c7d6a5435c35a90c2c3bf60e9bf39981b774b92b9d SHA512 a2cfb0801742fded8984dfe849d3c2da9796c6c87a2bbe2eac622f4b91abe1c142fd97d94bbe248ff222fae85a80db8d6ee100de1022049ef6c9a82aaebbb9d5 WHIRLPOOL 08048efbbf745672ae22e20b1ad696f48092ab124b9837acc259ceb53a47b8f45891680affa00d0a99b5175918d1a06874bbbd03d113b663e235d75a513b2405 AUX vtk-6.1.0-install.patch 968 SHA256 8cf7f1e8bf1c6e93da44a0a1ff4ba49405ef5e166e65eece329eab412a9e01db SHA512 e6f7e5436c6efca920bd7f9b724c219b7a34a357f01fb813bf168aefc1727b9c2d4af6cb380b4b6b70e4b091557f866761499a53e7e1c07a665d06aacd2acdb6 WHIRLPOOL 2ec857828e055eb4ff1228ce56b5c080a104f7d18e30b3aa37447af5a027c82c52a0f3a4d45c479ea2b01c4e5b11ce49820c7a53d3198db3025f171d8b945a4e +AUX vtk-6.1.0-memset.patch 5216 SHA256 b6a4f135e37bafec0d4b03bb1f94f4de5d81fb476bc6038119898e3c08c85847 SHA512 8789198bcb9c23af290c6b2b90d7277e546fe34e8aed03d1644d1edbec1c523801f3cc325dbb3bc8606ed6e3c84ea2a45fe1f05208366a0a3260e9b73cd96691 WHIRLPOOL 809cda857680004913e3537262a85c8f4818ec79ff6815451f97aec10d5150af159f945cfb66a347a0127680aacb3b753c9a9f9332f62b6cd39d0f5c2f5dc8c0 AUX vtk-6.1.0-netcdf.patch 994 SHA256 88b432be80b24ea223d4b5eae262dd4f9522f5db7a675ccbaa6c918595e1b738 SHA512 0f0b3493270efbf33a13abb7f38637473d48d15efe793f7148c13f5aeb77ac5534340d42f87451cd81ed2d7cce4ca6da9a71e065a7780e84f30a710d7368b488 WHIRLPOOL 2b56f6444c14326b330e90daa9e788f959d3f937e8055b09136bbd1ca7d17403073c159c018f3b76122b1cd96b671460f449bc4edfb55c588386398e3a3e5140 AUX vtk-6.1.0-system.patch 1307 SHA256 ae8db7e796054546d9169cb9b5fc91b84cc3f13bee6e9e3cb79796165dbc9579 SHA512 1fae8aecaf2344b5517e9b29ea2cb8b834af8a22be88535ec8bf9ec624625ea3f2ca820945a3d3f7c896ca080a7ded59ca7a601c50f970e59c3a8db691f060b3 WHIRLPOOL 4b3c28c15e6cd998092078d6f36a39e32b9177f6072482c07b99c3d6c9fd6ca1f767a13f59c5a93d05cef73f5f4159eb068edbb0e9b20ff43e83970a9bc67506 AUX vtk-6.1.0-web.patch 776 SHA256 e69d4d2d90d556279d241fd9b5c04d6f35e4b40de8e83ce7fb65e4ddb8276886 SHA512 5489096a0a4e5854cd426a75a0713f53a5c0daab7a9069c249b65d4a34cc8ff18737267f16ee8fbb2a07b7e987525b93e1eec5a23f78ac1b3f893c5847761bc5 WHIRLPOOL 9873b27097b812e932cde1633d2618ccfdf25171db983f7cb40e62376aa71bd2f1b2a84da58331f3662da88c2c738fb76759662d81cffc6b00d08a4a62f32622 @@ -38,14 +39,26 @@ DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 WHIRLPOOL bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d EBUILD vtk-6.0.0.ebuild 8961 SHA256 7fd0e2107abe4b83da9f3cab76ad71cc61ac31ae5c7a9ef705639c27bea85fd4 SHA512 08923e5be371a48561e16937b3b095f76a2515bd3003dca0575fa3d1e84121f12795fb72c50b4772d9e4ff005e3555d7fa6b6c6538e303e474762cf47d818ff2 WHIRLPOOL ce26d21fde342ca455a07d83d7b96ca5078794d658874cb4fa9f3ac7eb7194aa5b2ff57b8a1353955a5d91712b8777d4d425dd1427e118db418e0f23fa9c3f2f -EBUILD vtk-6.1.0-r1.ebuild 10450 SHA256 7438b05af2141d612b52d9b59b028467ec7d92b0ec2f853ebc3725bdef70b4d7 SHA512 09c627cf209efff2a5dff569dddab1a4061ad550dffedb8de021ae25fa7186fa87d88ee2aabab7dfcbb5c0424c01cc72d8a0a60f4669decf7d5501ba078b9708 WHIRLPOOL aff9cfe4d2caf547288faed1974b84daaf97b357a948e1a8931a93e31ed4beda724c8a46971f3b7bce51a7d70c77778ae81501e8c4a410a3d7156fd8174c2819 +EBUILD vtk-6.1.0-r1.ebuild 10479 SHA256 8f89accc04fb1e2ea181ff5b71b60fae8ff801735a4c72cc97214151078f0dc1 SHA512 3a77125d7d3e5bcc4404d7d50a7066a5eeb7f0f15e110c17722d521e9d4400e3ccf70d81dc9dcf88464b554392ff30b43c7dd753140bd7e026f0c248f1aa9909 WHIRLPOOL 342d542df2ffd2c623e1c2ebc4695603316cf4af66ffe1291d8e095271aeec338f1a4b74f7e5b413cd94a0a71bcb4a2efee7dd638567c4a92606d1c9966f9c64 EBUILD vtk-6.1.0.ebuild 10300 SHA256 cf4bfed0cb4b00789c5fc732a1f6c20589d85777378981400da4c51fdaec4db5 SHA512 9742ce91ca78ff234f1e8ff2d94cc9afba7f27aeffa56b596d663cfa868574fdd857c76fa6f249fbbde841b9a66875d9cdbc38f82da975b2262f58c3b69da378 WHIRLPOOL 297cf88da322f3f4bb278f4a0518ba663f71004081a1d7b3bdac047481e6cdb144320ca595a6f186203ded7882ff2aaa87cc7045093d260756883251e152ba96 -MISC ChangeLog 20382 SHA256 6952ab1af4ba8933cd4bab668d924e7b1b60ca773c83551bc8a66c67262efd97 SHA512 3b30f533b4c225f58292ff42f0b93560a66c0cd0db0a335ae6f7745ce76fe0c8049737ac6301877d8c7c65a57c5e7a16e0d156b55f71d4a475d92a35b956cb82 WHIRLPOOL 07e24b2a2d43aa6edfad82359672d42efbfa433e1b6e092f20ad3ff8666381808589dbd78d860a7cc27c7da456a930d550ec63d0bcdb07808766f8bf88e2bcf6 +MISC ChangeLog 20541 SHA256 17790c0ae1e2cb09cc9552d5c2ed3e00eb5f4c9015c04edd21b1954c03ebd243 SHA512 57217a13a42d614343d1c326745261fda18ce2a63a906d169437ccd06c0d7c334b83e25e8419b496d2a8b54f2492c1f4cfb58ea419dc60fb4c4a0addfbdbdc9f WHIRLPOOL 54d9b59f466d9dcab99ccc06c1f210ba930ea8c5cca2aef308fd87002290a859359661a98872fee5b1ef1649cc3072fc0863ba3e220a5d33cf7f95e660e3c0a1 MISC metadata.xml 1135 SHA256 4ded3033a3776deccd061166fbbe5cc43dc2c2a4a2d6b6cb34e850f7cdcc8c63 SHA512 f673c721db73ad0d7e7453d9344d1daf5558ba9cb00ffd3ccbd22d2bb512f80c9259b837834f30991443eaf44fb33f5cf39f790f84b8cd3b62aec9b5d467dab0 WHIRLPOOL f8d98412e37a0e86697c8752da55c2588f92730d7f5d3dd59d7c2503af68ad0694b754f98f87a1e7239a2537807e0ee8eceb23ea089cb5f704bdcc7642e1e90b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlSrrq0ACgkQvFcC4BYPU0pz7ACgoSNjJvC8xPPUZZqi3sz8vJEK -/eUAn3m0OxKi2FuQn16AKUwChP2wp8GV -=SWRu +iQJ8BAEBCgBmBQJU2GfyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirqk4QAJr6DbDm9uuxwP0XuxaxeCaD +4J06SrZ+CNhe/NOumHS7kKojp0Hz5wqDrba2K9cjHVhtZc+PNC7FgQiGLLDazZVC +pa6KJdkU6uSaSRm3kLALhKTtrMUS+X8sK8fmIqo6qPl5jhnOJ8WstDhW4SPVYdz0 +PECJlCzE9Mp9QYpvdIm1xuZcBsLr8eF1BiirWdozHoDRdOp1B4I0b7XM6g2A/Mf5 +syaAmq8Kn1vW8ii05zs+yrbmnH9F/jmvdh2Hy3X4k/T478EPoeqD+NeXSq2y8RN6 +WnGjL1u14o8DC6mgwZQg2eJKQjYjeTGpO4AhI9wFkx4+GOI7fw6/wfEQjna+rm63 +FBwlfvJyawjWr80s+aNe/NJcilVzNBPn7lYvEhM987exFykT6dXP6VAW3EK8P5Cg +EhfVQyw94K6LOSpl9nz+yEXbc1gcQETKbfhzkDr6DX2GkyT6k0Y5LpagNWgbOXBh +GawEehF/N1LUgLDOsqyHf1iF9f41snAtC8mlqPyGaU0h4mqMPM/Sjcg2Gj5tqzst +ifHObEckD/bTPEdPmN3OSeICVLIfd2BeG0Hytotwy2haddlZXRWw3hZqABomQa+q +TVv9Rzh0+h9zLgz1hxg3XI16u7tLAP3lFS1reF0I4WY3e9Tp7qL0fbUABNPZrtMS +Tat5f0SeSffIW/WcTOCz +=liO3 -----END PGP SIGNATURE----- diff --git a/sci-libs/vtk/files/vtk-6.1.0-memset.patch b/sci-libs/vtk/files/vtk-6.1.0-memset.patch new file mode 100644 index 000000000000..362022edf16d --- /dev/null +++ b/sci-libs/vtk/files/vtk-6.1.0-memset.patch @@ -0,0 +1,147 @@ +From ef22d3d69421581b33bc0cd94b647da73b61ba96 Mon Sep 17 00:00:00 2001 +From: Anton Gladky +Date: Fri, 30 May 2014 23:16:26 +0200 +Subject: [PATCH] Fix compilation by gcc-4.9 + +VTK fails to build during compilation by gcc-4.9 with the +following message: + +CMakeFiles/vtkFiltersParallelMPI.dir/vtkDistributedDataFilter.cxx.o: In +function `memset': +/usr/include/x86_64-linux-gnu/bits/string3.h:81: warning: memset used +with constant zero length parameter; this could be due to transposed +parameters +collect2: error: ld returned 1 exit status + +This patch sets if-condition before all "memsets" in +vtkDistributedDataFilter and checkes, whether the number +of bytes to be set by memset is more than 0 to escape this +error. +--- + Filters/ParallelMPI/vtkDistributedDataFilter.cxx | 48 ++++++++++++++++++------ + 1 file changed, 37 insertions(+), 11 deletions(-) + +diff --git a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx +index 3c1ff30..df4b5d3 100644 +--- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx ++++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx +@@ -1091,7 +1091,10 @@ vtkDataSet *vtkDistributedDataFilter::TestFixTooFewInputFiles(vtkDataSet *input) + vtkIdType cellsPerNode = numTotalCells / nprocs; + + vtkIdList **sendCells = new vtkIdList * [ nprocs ]; +- memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); ++ ++ if (sizeof(vtkIdList *) * nprocs > 0) { ++ memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); ++ } + + if (numConsumers == nprocs - 1) + { +@@ -1582,7 +1585,9 @@ vtkFloatArray ** + // Exchange int arrays + + float **recvArrays = new float * [nprocs]; +- memset(recvArrays, 0, sizeof(float *) * nprocs); ++ if (sizeof(float *) * nprocs > 0) { ++ memset(recvArrays, 0, sizeof(float *) * nprocs); ++ } + + if (sendSize[me] > 0) // sent myself an array + { +@@ -1703,7 +1708,9 @@ vtkIdTypeArray ** + // Exchange int arrays + + vtkIdType **recvArrays = new vtkIdType * [nprocs]; +- memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); ++ if (sizeof(vtkIdType *) * nprocs > 0) { ++ memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); ++ } + + if (sendSize[me] > 0) // sent myself an array + { +@@ -2807,7 +2814,9 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharPointArray( + + unsigned char *vals = new unsigned char [npoints]; + +- memset(vals, val, npoints); ++ if (npoints > 0) { ++ memset(vals, val, npoints); ++ } + + vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New(); + Array->SetName(arrayName); +@@ -2827,7 +2836,9 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharCellArray( + + unsigned char *vals = new unsigned char [ncells]; + +- memset(vals, val, ncells); ++ if (ncells > 0) { ++ memset(vals, val, ncells); ++ } + + vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New(); + Array->SetName(arrayName); +@@ -3026,7 +3037,9 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid) + vtkIdType nGridPoints = grid->GetNumberOfPoints(); + + vtkIdType *numPointsOutside = new vtkIdType [nprocs]; +- memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); ++ if (sizeof(vtkIdType) * nprocs > 0) { ++ memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); ++ } + + vtkIdTypeArray *globalIds = vtkIdTypeArray::New(); + globalIds->SetNumberOfValues(nGridPoints); +@@ -3108,10 +3121,16 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid) + // global ID back? + + vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs]; +- memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); ++ ++ if (sizeof(vtkFloatArray *) * nprocs > 0) { ++ memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); ++ } + + vtkIdTypeArray **localIds = new vtkIdTypeArray * [nprocs]; +- memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); ++ ++ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { ++ memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); ++ } + + vtkIdType *next = new vtkIdType [nprocs]; + vtkIdType *next3 = new vtkIdType [nprocs]; +@@ -3286,7 +3305,9 @@ vtkIdTypeArray **vtkDistributedDataFilter::FindGlobalPointIds( + { + // There are no cells in my assigned region + +- memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); ++ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { ++ memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); ++ } + + return gids; + } +@@ -3491,7 +3512,10 @@ vtkIdTypeArray **vtkDistributedDataFilter::MakeProcessLists( + std::multimap::iterator mapIt; + + vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs]; +- memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); ++ ++ if (sizeof (vtkIdTypeArray *) * nprocs > 0) { ++ memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); ++ } + + for (int i=0; iGetNumberOfPoints(); + + vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs]; +- memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); ++ if (sizeof(vtkIdTypeArray *) * nprocs) { ++ memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); ++ } + + if (numPoints < 1) + { diff --git a/sci-libs/vtk/vtk-6.1.0-r1.ebuild b/sci-libs/vtk/vtk-6.1.0-r1.ebuild index eb31d769b97b..3c10f7d385a3 100644 --- a/sci-libs/vtk/vtk-6.1.0-r1.ebuild +++ b/sci-libs/vtk/vtk-6.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.2 2015/01/06 09:45:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.3 2015/02/09 07:55:31 jlec Exp $ EAPI=5 @@ -123,6 +123,7 @@ PATCHES=( "${FILESDIR}"/${P}-netcdf.patch "${FILESDIR}"/${P}-web.patch "${FILESDIR}"/${P}-glext.patch + "${FILESDIR}"/${P}-memset.patch ) RESTRICT=test