[gentoo-commits] repo/gentoo:master commit in: sys-libs/lwp/, sys-libs/lwp/files/

[Sergei Trofimovich]

commit:     426743b8538f84b9d8f14b658283b45806a77f93
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 23:24:59 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 23:25:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426743b8

sys-libs/lwp: tweak build failure on ia64

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-libs/lwp/files/lwp-2.8-ia64.patch | 18 ++++++++++++++++++
 sys-libs/lwp/lwp-2.8.ebuild           |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/sys-libs/lwp/files/lwp-2.8-ia64.patch 
b/sys-libs/lwp/files/lwp-2.8-ia64.patch
new file mode 100644
index 00000000000..bb5abe65cc3
--- /dev/null
+++ b/sys-libs/lwp/files/lwp-2.8-ia64.patch
@@ -0,0 +1,18 @@
+diff --git a/src/lwp_ucontext.h b/src/lwp_ucontext.h
+index dfb5465..adc58e5 100644
+--- a/src/lwp_ucontext.h
++++ b/src/lwp_ucontext.h
+@@ -25,6 +25,13 @@ Coda are listed in the file CREDITS.
+ #include <signal.h>
+ #include "lwp_stacktrace.h"
+ 
++// ia64 defines uc_link define as:
++//    /usr/include/sys/ucontext.h:#define uc_link             _u._uc._link
++// undo namespace pollution
++#undef uc_link
++#undef uc_stack
++#undef uc_mcontext
++
+ #ifdef SAVE_SIGMASK
+ #define JMP_BUF sigjmp_buf
+ #define SETJMP(x,y) sigsetjmp(x, y)

diff --git a/sys-libs/lwp/lwp-2.8.ebuild b/sys-libs/lwp/lwp-2.8.ebuild
index a2a5a51c75c..c1ef7d1d273 100644
--- a/sys-libs/lwp/lwp-2.8.ebuild
+++ b/sys-libs/lwp/lwp-2.8.ebuild
@@ -13,6 +13,10 @@ SLOT="1"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
+PATCHES=(
+       "${FILESDIR}"/${P}-ia64.patch
+)
+
 src_configure() {
        econf --disable-static
 }