From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 27 Sep 2016 07:47:27 +0000 (+0200)
Subject: dev-util/google-perftools: Wrap headers for x32 correctly
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7f5d7096c7ca03d109caafb9cb71a01cc58beb3;p=gentoo.git

dev-util/google-perftools: Wrap headers for x32 correctly
---

diff --git a/dev-util/google-perftools/google-perftools-2.5.ebuild b/dev-util/google-perftools/google-perftools-2.5.ebuild
index bb3355a61db7..3229577d2389 100644
--- a/dev-util/google-perftools/google-perftools-2.5.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.5.ebuild
@@ -72,8 +72,15 @@ src_test() {
 	autotools-multilib_src_test
 }
 
-# abi_x86_x32 forces minimal, which installs fewer headers
-# so override the header check with a no-op
-multilib_check_headers() {
-	:
+src_install() {
+	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/gperftools/heap-checker.h
+			/usr/include/gperftools/heap-profiler.h
+			/usr/include/gperftools/stacktrace.h
+			/usr/include/gperftools/profiler.h
+		)
+	fi
+
+	autotools-multilib_src_install
 }