From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE646138334 for ; Sun, 1 Jul 2018 04:11:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62D9AE076B; Sun, 1 Jul 2018 04:11:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AD28E076B for ; Sun, 1 Jul 2018 04:11:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55458335C63 for ; Sun, 1 Jul 2018 04:11:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2BED36C for ; Sun, 1 Jul 2018 04:11:45 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1530418291.29741bb4addc99eb6271754698151704cfebbec3.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch sys-libs/libunwind/libunwind-1.2.1-r1.ebuild X-VCS-Directories: sys-libs/libunwind/files/ sys-libs/libunwind/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 29741bb4addc99eb6271754698151704cfebbec3 X-VCS-Branch: master Date: Sun, 1 Jul 2018 04:11:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b1404b6c-7d81-4675-84a7-b5c49b0a4536 X-Archives-Hash: e338f388581a76b5df17a0934006959b commit: 29741bb4addc99eb6271754698151704cfebbec3 Author: Matthias Maier gentoo org> AuthorDate: Sun Jul 1 04:08:36 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sun Jul 1 04:11:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29741bb4 sys-libs/libunwind: fix compilation with musl Package-Manager: Portage-2.3.41, Repoman-2.3.9 ....2.1-only-include-execinfo_h-if-avaliable.patch | 51 ++++++++++++++++++++++ sys-libs/libunwind/libunwind-1.2.1-r1.ebuild | 1 + 2 files changed, 52 insertions(+) diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch b/sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch new file mode 100644 index 00000000000..ee11149771c --- /dev/null +++ b/sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch @@ -0,0 +1,51 @@ +From 0f3f41a86842f2b19aa07af5242cb775ef9b20d3 Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" +Date: Sat, 30 Jun 2018 22:44:22 -0500 +Subject: [PATCH] Only include execinfo.h where avaliable + +Signed-off-by: Jory A. Pratt +--- + tests/test-coredump-unwind.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c +index 5254708..33f92b0 100644 +--- a/tests/test-coredump-unwind.c ++++ b/tests/test-coredump-unwind.c +@@ -57,7 +57,9 @@ + #include + + /* For SIGSEGV handler code */ ++#if HAVE_EXECINFO_H + #include ++#endif + #include + + #include +@@ -202,7 +204,7 @@ void die_out_of_memory(void) + /* End of utility logging functions */ + + +- ++#if HAVE_EXECINFO_H + static + void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) + { +@@ -249,12 +251,14 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) + + _exit(1); + } +- ++#endif + static void install_sigsegv_handler(void) + { + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); ++#if HAVE_EXECINFO_H + sa.sa_sigaction = handle_sigsegv; ++#endif + sa.sa_flags = SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + sigaction(SIGILL, &sa, NULL); +-- +2.18.0 diff --git a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild index 8bdde358d13..a4690fc050e 100644 --- a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild +++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch "${FILESDIR}"/${PN}-1.2-ia64-missing.patch "${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch + "${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch ) src_prepare() {