diff options
Diffstat (limited to 'dev-util/valgrind/valgrind-3.6.1.ebuild')
| -rw-r--r-- | dev-util/valgrind/valgrind-3.6.1.ebuild | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/dev-util/valgrind/valgrind-3.6.1.ebuild b/dev-util/valgrind/valgrind-3.6.1.ebuild index de973499e1f8..e780cd238594 100644 --- a/dev-util/valgrind/valgrind-3.6.1.ebuild +++ b/dev-util/valgrind/valgrind-3.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.5 2012/05/10 09:21:33 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.6 2012/05/10 09:28:16 grobian Exp $ EAPI=2 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils @@ -26,10 +26,6 @@ src_prepare() { sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \ Makefile.all.am || die - # Don't force multiarch stuff on OSX - sed -i -e 's:-arch \(i386\|x86_64\)::g' \ - Makefile.all.am || die - # Correct hard coded doc location sed -i -e "s:doc/valgrind:doc/${PF}:" \ docs/Makefile.am || die @@ -39,8 +35,7 @@ src_prepare() { # Don't build in empty assembly files for other platforms or we'll get a QA # warning about executable stacks. - # (patch breaks building on Darwin) - [[ ${CHOST} == *-darwin* ]] || epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch + epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch # Fix up some suppressions that were not general enough for glibc versions # with more than just a major and minor number. @@ -71,8 +66,6 @@ src_configure() { if use amd64 || use ppc64; then ! has_multilib_profile && myconf="${myconf} --enable-only64bit" fi - use x86-macos && myconf="${myconf} --enable-only32bit" - use x64-macos && myconf="${myconf} --enable-only64bit" # Don't use mpicc unless the user asked for it (bug #258832) if ! use mpi; then @@ -90,15 +83,7 @@ src_install() { emake DESTDIR="${D}" install || die dodoc AUTHORS FAQ.txt NEWS README* - pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux - - if [[ ${CHOST} == *-darwin* ]] ; then - # fix install_names on mis-named shared modules - local l - for l in "${ED}"/usr/lib/valgrind/*.so ; do - install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}" - done - fi + pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux } pkg_postinst() { |