diff options
| -rw-r--r-- | user/psmisc/APKBUILD | 4 | ||||
| -rw-r--r-- | user/psmisc/musl_ptregs.patch | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/user/psmisc/APKBUILD b/user/psmisc/APKBUILD index c896a5882..42ef3e51d 100644 --- a/user/psmisc/APKBUILD +++ b/user/psmisc/APKBUILD @@ -14,6 +14,7 @@ subpackages="$pkgname-doc $pkgname-lang" source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver dont-underlink-peekfd.patch fix-peekfd-on-ppc.patch + musl_ptregs.patch " options="!strip" builddir="$srcdir/$pkgname-$pkgver" @@ -54,4 +55,5 @@ package() { sha512sums="d4f1d90fb92f83b7583cd82a3c1027de0e53fbee85253d796878878d03a52fc220bd25beaec34c651a1ed547fc13919c5c014a522124308a7421d3f64238a70f psmisc-23.0.tar.bz2 a68c75eb3c66a9df0d4e574a9439eeed0cd2dc97b3cad3fcd8b945619c2ec238b73bf479d1b55ddd4821471cd8934ee1fbc7871c92de7ef72c3d3f989ab62c9f dont-underlink-peekfd.patch -b16139606e1ccaebd94b7b7a14f49f530b180f1fd24338008e4c4d48761b57953458c46e57b0f7ec191353514f68126f79c281875c4cd56ed2f1220ace131ce1 fix-peekfd-on-ppc.patch" +b16139606e1ccaebd94b7b7a14f49f530b180f1fd24338008e4c4d48761b57953458c46e57b0f7ec191353514f68126f79c281875c4cd56ed2f1220ace131ce1 fix-peekfd-on-ppc.patch +73dec9791e8cdb85cd3d9ef9be4d16e0fef481c6edc334ed9e954829444b1a92b87f7a3a2e6c1d09ac207bed828f214f5f2a95caa66540a7f2a6c58a6b8f6f2c musl_ptregs.patch" diff --git a/user/psmisc/musl_ptregs.patch b/user/psmisc/musl_ptregs.patch new file mode 100644 index 000000000..29fee6a2a --- /dev/null +++ b/user/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> + |