| 1 |
commit: 123f0d077921cf488309e0213ff979453cf2a981 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 5 08:08:10 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 5 08:08:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123f0d07 |
| 7 |
|
| 8 |
dev-util/valgrind: fix linking on Solaris |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-util/valgrind/valgrind-3.13.0-r2.ebuild | 11 ++++++++++- |
| 13 |
dev-util/valgrind/valgrind-9999.ebuild | 9 +++++++++ |
| 14 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild |
| 17 |
index f509e509703..0ef938d860f 100644 |
| 18 |
--- a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild |
| 19 |
+++ b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild |
| 20 |
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then |
| 21 |
inherit git-r3 |
| 22 |
else |
| 23 |
SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2" |
| 24 |
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
| 25 |
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" |
| 26 |
fi |
| 27 |
|
| 28 |
DEPEND="mpi? ( virtual/mpi )" |
| 29 |
@@ -37,6 +37,15 @@ src_prepare() { |
| 30 |
# Fix --xml-socket command line option (qt-creator), bug #641790 |
| 31 |
eapply "${FILESDIR}"/${P}-xml-socket.patch |
| 32 |
|
| 33 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 34 |
+ # upstream doesn't support this, but we don't build with |
| 35 |
+ # Sun/Oracle ld, we have a GNU toolchain, so get some things |
| 36 |
+ # working the Linux/GNU way |
| 37 |
+ find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ |
| 38 |
+ sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die |
| 39 |
+ cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in |
| 40 |
+ fi |
| 41 |
+ |
| 42 |
# Allow users to test their own patches |
| 43 |
eapply_user |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild |
| 47 |
index 2b96d5f5150..b7152e95dc5 100644 |
| 48 |
--- a/dev-util/valgrind/valgrind-9999.ebuild |
| 49 |
+++ b/dev-util/valgrind/valgrind-9999.ebuild |
| 50 |
@@ -31,6 +31,15 @@ src_prepare() { |
| 51 |
# Respect CFLAGS, LDFLAGS |
| 52 |
eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch |
| 53 |
|
| 54 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 55 |
+ # upstream doesn't support this, but we don't build with |
| 56 |
+ # Sun/Oracle ld, we have a GNU toolchain, so get some things |
| 57 |
+ # working the Linux/GNU way |
| 58 |
+ find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ |
| 59 |
+ sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die |
| 60 |
+ cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in |
| 61 |
+ fi |
| 62 |
+ |
| 63 |
# Allow users to test their own patches |
| 64 |
eapply_user |
Archives