| 1 |
grobian 12/05/10 09:21:33 |
| 2 |
|
| 3 |
Modified: valgrind-3.7.0-r4.ebuild valgrind-3.6.1.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Fix OSX support change by actually applying non-exec-darwin.patch, unbreak for Prefix, bug #359993 |
| 7 |
|
| 8 |
(Portage version: 2.2.01.20430-prefix/cvs/SunOS i386) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-util/valgrind/valgrind-3.7.0-r4.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: valgrind-3.7.0-r4.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- valgrind-3.7.0-r4.ebuild 1 May 2012 13:03:29 -0000 1.1 |
| 24 |
+++ valgrind-3.7.0-r4.ebuild 10 May 2012 09:21:33 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v 1.1 2012/05/01 13:03:29 blueness Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v 1.2 2012/05/10 09:21:33 grobian Exp $ |
| 30 |
|
| 31 |
EAPI="4" |
| 32 |
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils |
| 33 |
@@ -35,7 +35,7 @@ |
| 34 |
|
| 35 |
# Don't build in empty assembly files for other platforms or we'll get a QA |
| 36 |
# warning about executable stacks. |
| 37 |
- epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch |
| 38 |
+ epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack-v2.patch |
| 39 |
|
| 40 |
# Fix the regex to get gcc's version |
| 41 |
epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch |
| 42 |
@@ -84,7 +84,7 @@ |
| 43 |
} |
| 44 |
|
| 45 |
src_install() { |
| 46 |
- emake DESTDIR="${ED}" install |
| 47 |
+ emake DESTDIR="${D}" install |
| 48 |
dodoc AUTHORS FAQ.txt NEWS README* |
| 49 |
|
| 50 |
pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.5 dev-util/valgrind/valgrind-3.6.1.ebuild |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild?rev=1.5&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild?rev=1.5&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild?r1=1.4&r2=1.5 |
| 59 |
|
| 60 |
Index: valgrind-3.6.1.ebuild |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v |
| 63 |
retrieving revision 1.4 |
| 64 |
retrieving revision 1.5 |
| 65 |
diff -u -r1.4 -r1.5 |
| 66 |
--- valgrind-3.6.1.ebuild 22 May 2011 23:56:30 -0000 1.4 |
| 67 |
+++ valgrind-3.6.1.ebuild 10 May 2012 09:21:33 -0000 1.5 |
| 68 |
@@ -1,6 +1,6 @@ |
| 69 |
-# Copyright 1999-2011 Gentoo Foundation |
| 70 |
+# Copyright 1999-2012 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.4 2011/05/22 23:56:30 josejx Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.5 2012/05/10 09:21:33 grobian Exp $ |
| 74 |
|
| 75 |
EAPI=2 |
| 76 |
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils |
| 77 |
@@ -26,6 +26,10 @@ |
| 78 |
sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \ |
| 79 |
Makefile.all.am || die |
| 80 |
|
| 81 |
+ # Don't force multiarch stuff on OSX |
| 82 |
+ sed -i -e 's:-arch \(i386\|x86_64\)::g' \ |
| 83 |
+ Makefile.all.am || die |
| 84 |
+ |
| 85 |
# Correct hard coded doc location |
| 86 |
sed -i -e "s:doc/valgrind:doc/${PF}:" \ |
| 87 |
docs/Makefile.am || die |
| 88 |
@@ -35,7 +39,8 @@ |
| 89 |
|
| 90 |
# Don't build in empty assembly files for other platforms or we'll get a QA |
| 91 |
# warning about executable stacks. |
| 92 |
- epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch |
| 93 |
+ # (patch breaks building on Darwin) |
| 94 |
+ [[ ${CHOST} == *-darwin* ]] || epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch |
| 95 |
|
| 96 |
# Fix up some suppressions that were not general enough for glibc versions |
| 97 |
# with more than just a major and minor number. |
| 98 |
@@ -66,6 +71,8 @@ |
| 99 |
if use amd64 || use ppc64; then |
| 100 |
! has_multilib_profile && myconf="${myconf} --enable-only64bit" |
| 101 |
fi |
| 102 |
+ use x86-macos && myconf="${myconf} --enable-only32bit" |
| 103 |
+ use x64-macos && myconf="${myconf} --enable-only64bit" |
| 104 |
|
| 105 |
# Don't use mpicc unless the user asked for it (bug #258832) |
| 106 |
if ! use mpi; then |
| 107 |
@@ -83,7 +90,15 @@ |
| 108 |
emake DESTDIR="${D}" install || die |
| 109 |
dodoc AUTHORS FAQ.txt NEWS README* |
| 110 |
|
| 111 |
- pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux |
| 112 |
+ pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux |
| 113 |
+ |
| 114 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 115 |
+ # fix install_names on mis-named shared modules |
| 116 |
+ local l |
| 117 |
+ for l in "${ED}"/usr/lib/valgrind/*.so ; do |
| 118 |
+ install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}" |
| 119 |
+ done |
| 120 |
+ fi |
| 121 |
} |
| 122 |
|
| 123 |
pkg_postinst() { |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
1.144 dev-util/valgrind/ChangeLog |
| 128 |
|
| 129 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/ChangeLog?rev=1.144&view=markup |
| 130 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/ChangeLog?rev=1.144&content-type=text/plain |
| 131 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/ChangeLog?r1=1.143&r2=1.144 |
| 132 |
|
| 133 |
Index: ChangeLog |
| 134 |
=================================================================== |
| 135 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v |
| 136 |
retrieving revision 1.143 |
| 137 |
retrieving revision 1.144 |
| 138 |
diff -u -r1.143 -r1.144 |
| 139 |
--- ChangeLog 1 May 2012 13:03:29 -0000 1.143 |
| 140 |
+++ ChangeLog 10 May 2012 09:21:33 -0000 1.144 |
| 141 |
@@ -1,6 +1,13 @@ |
| 142 |
# ChangeLog for dev-util/valgrind |
| 143 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 144 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.143 2012/05/01 13:03:29 blueness Exp $ |
| 145 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.144 2012/05/10 09:21:33 grobian Exp $ |
| 146 |
+ |
| 147 |
+ 10 May 2012; Fabian Groffen <grobian@g.o> |
| 148 |
+ +files/valgrind-3.7.0-non-exec-stack-v2.patch, |
| 149 |
+ -files/valgrind-3.7.0-non-exec-darwin.patch, valgrind-3.6.1.ebuild, |
| 150 |
+ valgrind-3.7.0-r4.ebuild: |
| 151 |
+ Fix OSX support change by actually applying non-exec-darwin.patch, unbreak for |
| 152 |
+ Prefix, bug #359993 |
| 153 |
|
| 154 |
*valgrind-3.7.0-r4 (01 May 2012) |
Archives