diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-04-12 19:54:14 +0000 |
|---|---|---|
| committer | Breno Leitao <breno.leitao@gmail.com> | 2017-04-12 20:00:52 +0000 |
| commit | 0c36e883cfacaecdb74adc09af6ab7a0af2e44b9 (patch) | |
| tree | 7b69519a917aa8beff3577f95b02a399d15b1ff6 /community/psmisc | |
| parent | 6bc4e643f3d673f0f0503fb9ad128c593795c6a5 (diff) | |
| download | aports-0c36e883cfacaecdb74adc09af6ab7a0af2e44b9.tar.bz2 aports-0c36e883cfacaecdb74adc09af6ab7a0af2e44b9.tar.xz | |
community/psmisc: Fix FTBFS on ppc64le
There is an issue with psmisc that fails to build due to names clash.
This is the type of the problem this patch is resolving:
In file included from /usr/include/sys/user.h:11:0,
from peekfd.c:33:
/usr/include/bits/user.h:1:8: error: redefinition of 'struct pt_regs'
struct pt_regs {
^~~~~~~
In file included from peekfd.c:30:0:
/usr/include/asm/ptrace.h:31:8: note: originally defined here
struct pt_regs {
^~~~~~~
Diffstat (limited to 'community/psmisc')
| -rw-r--r-- | community/psmisc/APKBUILD | 2 | ||||
| -rw-r--r-- | community/psmisc/musl_ptregs.patch | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/community/psmisc/APKBUILD b/community/psmisc/APKBUILD index 2bd302c7df..2deb2a57e3 100644 --- a/community/psmisc/APKBUILD +++ b/community/psmisc/APKBUILD @@ -11,6 +11,7 @@ makedepends="gettext-dev libintl ncurses-dev" subpackages="$pkgname-doc $pkgname-lang" source="http://downloads.sourceforge.net/psmisc/$pkgname-$pkgver.tar.gz include_limits.patch + musl_ptregs.patch peekfd_lintl.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -42,4 +43,5 @@ check() { sha512sums="766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae psmisc-22.21.tar.gz 63dea6a65c4cabcfa06d225950bc78fd6ac42f7445b8d10bde5e86dd8d96eb89823e486d7635b78562da058642f87289356c416225563a8e1ccfc2e32d81e884 include_limits.patch +73dec9791e8cdb85cd3d9ef9be4d16e0fef481c6edc334ed9e954829444b1a92b87f7a3a2e6c1d09ac207bed828f214f5f2a95caa66540a7f2a6c58a6b8f6f2c musl_ptregs.patch ec84b84a02e48aed9f47a9efdd7ee4a4d409373751e9872e32c06912b506d9102a0526f244dcaff172598cd77e61344d38449a60181c2bbb010a674662e8f439 peekfd_lintl.patch" diff --git a/community/psmisc/musl_ptregs.patch b/community/psmisc/musl_ptregs.patch new file mode 100644 index 0000000000..29fee6a2a1 --- /dev/null +++ b/community/psmisc/musl_ptregs.patch @@ -0,0 +1,20 @@ +Author: Breno Leitao <brenohl@br.ibm.com> +Date: Thu Apr 6 14:03:00 2017 -0300 + + peekfd: Avoid pt_regs clash + +Index: psmisc-22.21/src/peekfd.c +=================================================================== +--- a/src/peekfd.c.old ++++ b/src/peekfd.c +@@ -27,7 +27,9 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <sys/syscall.h> ++#define pt_regs uapi_pt_regs + #include <asm/ptrace.h> ++#undef pt_regs + #include <byteswap.h> + #include <endian.h> + #include <sys/user.h> + |