mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 20:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "main/strace: add musl fix"

Browse Source 
This reverts commit 870ecaf7a71176d759f0aede06572bd59a6f1627.

It broke armhf build.
This commit is contained in:
Natanael Copa 2016-04-27 16:07:28 +00:00
parent 0c5665aae0
commit 079aaf323d
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/strace/APKBUILD
View File

@ -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"

17
main/strace/musl-fix-ptrace-include.patch
View File

@ -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