diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-04-15 13:32:53 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-04-15 13:32:53 +0000 |
| commit | 67bbb32bdc0c13948818d59b3f2bafa41fc14f38 (patch) | |
| tree | 062c55fff67ddcbaf4f228e72478f1b5920a4934 /dev-util | |
| parent | Version bump (bug #507598) (diff) | |
| download | gentoo-2-67bbb32bdc0c13948818d59b3f2bafa41fc14f38.tar.gz gentoo-2-67bbb32bdc0c13948818d59b3f2bafa41fc14f38.tar.bz2 gentoo-2-67bbb32bdc0c13948818d59b3f2bafa41fc14f38.zip | |
Build 3.9.0 against glibc 2.19, bug #506284
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/valgrind/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch | 37 | ||||
| -rw-r--r-- | dev-util/valgrind/valgrind-3.9.0.ebuild | 7 |
3 files changed, 48 insertions, 4 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog index 8a96e323bc8e..689595260f48 100644 --- a/dev-util/valgrind/ChangeLog +++ b/dev-util/valgrind/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/valgrind -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.172 2013/11/02 23:59:17 blueness Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.173 2014/04/15 13:32:53 blueness Exp $ + + 15 Apr 2014; Anthony G. Basile <blueness@gentoo.org> + +files/valgrind-3.9.0-glibc-2.19.patch, valgrind-3.9.0.ebuild: + Build 3.9.0 against glibc 2.19, bug #506284 *valgrind-3.9.0 (02 Nov 2013) diff --git a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch new file mode 100644 index 000000000000..79a3283c9c13 --- /dev/null +++ b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure +--- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 ++++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 +@@ -6689,6 +6689,16 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.19) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5 ++$as_echo "2.19 family" >&6; } ++ ++$as_echo "#define GLIBC_2_19 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 + $as_echo "Darwin" >&6; } +diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac +--- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 ++++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 +@@ -918,6 +918,13 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.19) ++ AC_MSG_RESULT(2.19 family) ++ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/dev-util/valgrind/valgrind-3.9.0.ebuild b/dev-util/valgrind/valgrind-3.9.0.ebuild index 10e4ea482ece..8c3e29815a77 100644 --- a/dev-util/valgrind/valgrind-3.9.0.ebuild +++ b/dev-util/valgrind/valgrind-3.9.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.9.0.ebuild,v 1.1 2013/11/02 23:59:17 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.9.0.ebuild,v 1.2 2014/04/15 13:32:53 blueness Exp $ EAPI="4" inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils @@ -37,6 +37,9 @@ src_prepare() { # warning about executable stacks. epatch "${FILESDIR}"/${PN}-3.9.0-non-exec-stack.patch + # glibc 2.19 fix + epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch + # Regenerate autotools files eautoreconf } |