diff options
| -rw-r--r-- | main/strace/APKBUILD | 4 | ||||
| -rw-r--r-- | main/strace/fix-ppc-pt-regs-collision.patch | 18 |
2 files changed, 1 insertions, 21 deletions
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index ee94bf8143..268a400bb1 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=strace pkgver=5.3 -pkgrel=0 +pkgrel=1 pkgdesc="Diagnostic, debugging and instructional userspace tracer" url="https://strace.io" arch="all" @@ -12,7 +12,6 @@ makedepends="linux-headers autoconf automake gawk" subpackages="$pkgname-doc" source="https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz disable-fortify.patch - fix-ppc-pt-regs-collision.patch nlattr-fix.patch " @@ -46,5 +45,4 @@ package() { sha512sums="02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a strace-5.3.tar.xz 273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch -c5ba64a0e4686aeee5ceef099f1bedfef15fc79636249f168352ee10eb87bd788006d9a361e2b3819381bd1810c8b2bfda73b765c9781386737e19b6a037e93f fix-ppc-pt-regs-collision.patch 44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch" diff --git a/main/strace/fix-ppc-pt-regs-collision.patch b/main/strace/fix-ppc-pt-regs-collision.patch deleted file mode 100644 index 0805864798..0000000000 --- a/main/strace/fix-ppc-pt-regs-collision.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -upr strace-5.2.orig/ptrace.h strace-5.2/ptrace.h ---- strace-5.2.orig/ptrace.h 2019-07-17 00:19:07.262775301 +0200 -+++ strace-5.2/ptrace.h 2019-07-17 00:19:55.422778666 +0200 -@@ -30,7 +30,14 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # endif - -+#if defined(__powerpc__) || defined(__powerpc64__) -+# include <linux/types.h> -+# define __ASSEMBLY__ - # include <linux/ptrace.h> -+# undef __ASSEMBLY__ -+#else -+# include <linux/ptrace.h> -+#endif - - # ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg |