diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-27 16:07:28 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-27 16:08:11 +0000 |
| commit | 079aaf323dcb93c9aa60902a189eb40f429bfaba (patch) | |
| tree | 600e25da9ebc05309d325d0639b06df534513ec2 /main/strace | |
| parent | 0c5665aae0d660f6a0d712ec5f3558e7b2f402a6 (diff) | |
| download | aports-079aaf323dcb93c9aa60902a189eb40f429bfaba.tar.bz2 aports-079aaf323dcb93c9aa60902a189eb40f429bfaba.tar.xz | |
Revert "main/strace: add musl fix"
This reverts commit 870ecaf7a71176d759f0aede06572bd59a6f1627.
It broke armhf build.
Diffstat (limited to 'main/strace')
| -rw-r--r-- | main/strace/APKBUILD | 15 | ||||
| -rw-r--r-- | main/strace/musl-fix-ptrace-include.patch | 17 |
2 files changed, 5 insertions, 27 deletions
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index 43b2f2501e..76075c7090 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=strace pkgver=4.11 -pkgrel=1 +pkgrel=2 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 - musl-fix-ptrace-include.patch - " +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" _builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -43,9 +41,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir" install } -md5sums="a15d2555a7febb56d00c6e1a51c655dc strace-4.11.tar.xz -3c916643e1458ddd983ab68b74f4827d musl-fix-ptrace-include.patch" -sha256sums="e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152 strace-4.11.tar.xz -d60ff81f3d5d517ce779478260234490e984f5a1fad96337727ee0ba7da0f2c3 musl-fix-ptrace-include.patch" -sha512sums="e1e07ed427f504f53bcd117b61bb96a780b0f531010856ed157e4d8c2090371bf320ab59a02b88e67bf2afd443fba67e12f90e53afeab795188c89c6496daecd strace-4.11.tar.xz -001672f4ab4a97151434720abdef606e69f7baa6ce4e243b43082b1989aa0611ef93cd7039e8144b401475361216404a08c050cdde31d5ab45008db906eb1f8e musl-fix-ptrace-include.patch" +md5sums="a15d2555a7febb56d00c6e1a51c655dc strace-4.11.tar.xz" +sha256sums="e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152 strace-4.11.tar.xz" +sha512sums="e1e07ed427f504f53bcd117b61bb96a780b0f531010856ed157e4d8c2090371bf320ab59a02b88e67bf2afd443fba67e12f90e53afeab795188c89c6496daecd strace-4.11.tar.xz" diff --git a/main/strace/musl-fix-ptrace-include.patch b/main/strace/musl-fix-ptrace-include.patch deleted file mode 100644 index 6453851df9..0000000000 --- a/main/strace/musl-fix-ptrace-include.patch +++ /dev/null @@ -1,17 +0,0 @@ -<@dalias> basically linux/ptrace.h conflicts with sys/user.h on some archs -<@dalias> and linux/ptrace.h is utterly useless because sys/ptrace.h defines everything needed - -diff --git a/ptrace.h b/ptrace.h -index d8af976..425b1e0 100644 ---- a/ptrace.h -+++ b/ptrace.h -@@ -52,8 +52,6 @@ extern long ptrace(int, int, char *, long); - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - #endif - --#include <linux/ptrace.h> -- - #ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg - #endif - |