[gentoo-commits] repo/gentoo:master commit in: dev-util/google-perftools/

[Michał Górny]

commit:     d7f5d7096c7ca03d109caafb9cb71a01cc58beb3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 07:47:27 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 07:57:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f5d709

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

 dev-util/google-perftools/google-perftools-2.5.ebuild | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-util/google-perftools/google-perftools-2.5.ebuild 
b/dev-util/google-perftools/google-perftools-2.5.ebuild
index bb3355a..3229577 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
 }