diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-01-26 09:25:26 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-01-26 09:25:26 +0200 |
| commit | 357e1a191504a974b5edc841e782ea7d7b231eb9 (patch) | |
| tree | 41cfd10d7a6714dbdff34228a7d8856f43042fc5 /main | |
| parent | 9aec2222223520b82cf0831c610f87c60caf0399 (diff) | |
| download | aports-357e1a191504a974b5edc841e782ea7d7b231eb9.tar.bz2 aports-357e1a191504a974b5edc841e782ea7d7b231eb9.tar.xz | |
Revert "main/strace: fix pt_regs collision on ppc64le"
This reverts commit 56605661d6dadc843d08041e18b608f99b427d58.
Breaks arm and aarch64 builds.
Diffstat (limited to 'main')
| -rw-r--r-- | main/strace/APKBUILD | 15 | ||||
| -rw-r--r-- | main/strace/fix-pt_regs-collisions-ppc64le.patch | 13 |
2 files changed, 5 insertions, 23 deletions
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index a5790481a8..7d34ae5a00 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=strace pkgver=4.15 -pkgrel=1 +pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="http://sourceforge.net/projects/strace/" arch="all" @@ -9,9 +9,7 @@ license="BSD" depends= makedepends="linux-headers" subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz - fix-pt_regs-collisions-ppc64le.patch - " +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -43,9 +41,6 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="1ff96209fec19914c920608ed0791864 strace-4.15.tar.xz -c30591d11e884e6b00315e3ef0dbf813 fix-pt_regs-collisions-ppc64le.patch" -sha256sums="c0cdc094d6141fd9dbf6aaad605142d651ae10998b660fda57fc61f7ad583ca9 strace-4.15.tar.xz -a939a24ef6b8e942632a5f5d652ceab7bf66740da7118149e174995e7f03b7b6 fix-pt_regs-collisions-ppc64le.patch" -sha512sums="15e96c31d901c94dc40de67a65365c6cc9a7b7b2bf96a735f5d20cbd54dc75d941e0c1da206aa76f6e98d1013bfeecb42800b23c9e146eaf756775d525fe1b66 strace-4.15.tar.xz -7f27479d9556e41d188659978576db242b638792639e821b77bcbb78e5a19dbc5b35cb3966146180712056f745bfa77f6ecfbcaedf9a650e5b7d9c25b13650a3 fix-pt_regs-collisions-ppc64le.patch" +md5sums="1ff96209fec19914c920608ed0791864 strace-4.15.tar.xz" +sha256sums="c0cdc094d6141fd9dbf6aaad605142d651ae10998b660fda57fc61f7ad583ca9 strace-4.15.tar.xz" +sha512sums="15e96c31d901c94dc40de67a65365c6cc9a7b7b2bf96a735f5d20cbd54dc75d941e0c1da206aa76f6e98d1013bfeecb42800b23c9e146eaf756775d525fe1b66 strace-4.15.tar.xz" diff --git a/main/strace/fix-pt_regs-collisions-ppc64le.patch b/main/strace/fix-pt_regs-collisions-ppc64le.patch deleted file mode 100644 index 4e6f768c97..0000000000 --- a/main/strace/fix-pt_regs-collisions-ppc64le.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/ptrace.h -+++ b/ptrace.h -@@ -55,7 +55,10 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - #endif - -+#include <linux/types.h> -+#define __ASSEMBLY__ - #include <linux/ptrace.h> -+#undef __ASSEMBLY__ - - #ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg |