[gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/, dev-util/valgrind/files/

[Austin English]

commit:     727a3c7b1f8094d1a66314e64077fe93dbe5dd2d
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Dec 20 07:10:04 2017 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 17:54:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727a3c7b

dev-util/valgrind: fix for --xml-socket option

Fix for Qt Creator working.

Closes: https://bugs.gentoo.org/641790
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../files/valgrind-3.13.0-xml-socket.patch         | 27 ++++++++++++++++++++++
 ...grind-9999.ebuild => valgrind-3.13.0-r2.ebuild} | 26 +++++++++++++--------
 dev-util/valgrind/valgrind-9999.ebuild             | 20 ++++++++--------
 3 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch b/dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch
new file mode 100644
index 00000000000..56039c48bc2
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch
@@ -0,0 +1,27 @@
+From: Ivo Raisr <ivosh@×××××.net>
+Date: Thu, 3 Aug 2017 05:22:01 +0000 (+0000)
+Subject: Fix handling command line option --xml-socket.
+X-Git-Url: https://sourceware.org/git/?p=valgrind.git;a=commitdiff_plain;h=34dd8493de39314033509bb7ad62673f33dcf3db
+
+Fix handling command line option --xml-socket.
+Fixes BZ#382998
+Patch by: Orgad Shaneh <orgads@×××××.com>
+
+
+
+git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16467
+---
+
+diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
+index d66c67d..f6ba202 100644
+--- a/coregrind/m_libcprint.c
++++ b/coregrind/m_libcprint.c
+@@ -526,7 +526,7 @@ void VG_(init_log_xml_sinks)(VgLogTo log_to, VgLogTo xml_to,
+          break;
+ 
+       case VgLogTo_Socket:
+-         log_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded),
++         xml_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded),
+                                       &VG_(xml_output_sink), True);
+          break;
+    }

diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild
similarity index 85%
copy from dev-util/valgrind/valgrind-9999.ebuild
copy to dev-util/valgrind/valgrind-3.13.0-r2.ebuild
index 855bd8a16c2..f509e509703 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -31,6 +31,12 @@ src_prepare() {
 	# Respect CFLAGS, LDFLAGS
 	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 
+	# Fix test failures on glibc-2.26
+	eapply "${FILESDIR}"/${P}-test-fixes.patch
+
+	# Fix --xml-socket command line option (qt-creator), bug #641790
+	eapply "${FILESDIR}"/${P}-xml-socket.patch
+
 	# Allow users to test their own patches
 	eapply_user
 
@@ -39,7 +45,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
 
 	# Respect ar, bug #468114
 	tc-export AR
@@ -61,23 +67,23 @@ src_configure() {
 	replace-flags -ggdb3 -ggdb2
 
 	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+		! has_multilib_profile && myconf+=("--enable-only64bit")
 	fi
 
 	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
 
 	# Don't use mpicc unless the user asked for it (bug #258832)
 	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
+		myconf+=("--without-mpicc")
 	fi
 
-	econf ${myconf}
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if [[ ${PV} == "9999" ]]; then
 		# Otherwise FAQ.txt won't exist:
@@ -85,7 +91,7 @@ src_install() {
 		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
 	fi
 
-	dodoc AUTHORS FAQ.txt NEWS README*
+	dodoc FAQ.txt
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 

diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 855bd8a16c2..2b96d5f5150 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
 
 	# Respect ar, bug #468114
 	tc-export AR
@@ -61,23 +61,23 @@ src_configure() {
 	replace-flags -ggdb3 -ggdb2
 
 	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+		! has_multilib_profile && myconf+=("--enable-only64bit")
 	fi
 
 	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
 
 	# Don't use mpicc unless the user asked for it (bug #258832)
 	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
+		myconf+=("--without-mpicc")
 	fi
 
-	econf ${myconf}
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if [[ ${PV} == "9999" ]]; then
 		# Otherwise FAQ.txt won't exist:
@@ -85,7 +85,7 @@ src_install() {
 		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
 	fi
 
-	dodoc AUTHORS FAQ.txt NEWS README*
+	dodoc FAQ.txt
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux