From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Apr 2018 21:52:00 +0100 Subject: gentoo resync : 05.04.2018 --- dev-util/valgrind/Manifest | 4 ++-- dev-util/valgrind/valgrind-3.13.0-r2.ebuild | 11 ++++++++++- dev-util/valgrind/valgrind-9999.ebuild | 9 +++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) (limited to 'dev-util/valgrind') diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 54c72501add1..cb00ec01168d 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -6,7 +6,7 @@ DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4ed DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e -EBUILD valgrind-3.13.0-r2.ebuild 3475 BLAKE2B da04e4c84813d8775ae853024231b92ce3bb79db45118d32fb9e343fa32dcebf42d50f024faf938bdf8c0ff239e66aa2003fb8f72b0a60307fbc8db2ea1a46d8 SHA512 1ea3b52700f077c2eef7d5d5f79ea47c8f6cc7d41b6a3ec803cb0034dabb0beea77cf5c601c3eccf65e30838febe9feec271504dc2152c1c7452f73f0746811e +EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc -EBUILD valgrind-9999.ebuild 3284 BLAKE2B c033cc3d26adfdb05375ca7713ad2487a5db84153649e85d2ad445e0c884ecb44952d9c3a36810403f9293936a8307221033b938d02ac706a156b923b6e5969b SHA512 5b8f4e022237703cf9f93c2c9e2e6af366890ac4ccf737af6b1dc9bd1a4949392c7e25b37dfbe41e8dabf04efe9a80bd90114cc90138662042247780e773e705 +EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846 diff --git a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild index f509e509703b..0ef938d860fd 100644 --- a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild +++ b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" fi DEPEND="mpi? ( virtual/mpi )" @@ -37,6 +37,15 @@ src_prepare() { # Fix --xml-socket command line option (qt-creator), bug #641790 eapply "${FILESDIR}"/${P}-xml-socket.patch + if [[ ${CHOST} == *-solaris* ]] ; then + # upstream doesn't support this, but we don't build with + # Sun/Oracle ld, we have a GNU toolchain, so get some things + # working the Linux/GNU way + find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ + sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die + cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in + fi + # Allow users to test their own patches eapply_user diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild index 2b96d5f5150c..b7152e95dc5e 100644 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ b/dev-util/valgrind/valgrind-9999.ebuild @@ -31,6 +31,15 @@ src_prepare() { # Respect CFLAGS, LDFLAGS eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch + if [[ ${CHOST} == *-solaris* ]] ; then + # upstream doesn't support this, but we don't build with + # Sun/Oracle ld, we have a GNU toolchain, so get some things + # working the Linux/GNU way + find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ + sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die + cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in + fi + # Allow users to test their own patches eapply_user -- cgit v1.2.3