aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2015-06-12 16:05:07 -0400
committerAnthony G. Basile <blueness@gentoo.org>2015-06-12 16:05:07 -0400
commit066675b947b4cc68f590706fafda6ba69bd44095 (patch)
treeed156ee748f0804bfd3ae309744ffc2c6a483cfc /dev-util
parentdev-scheme/guile: tree version works (diff)
downloadmusl-066675b947b4cc68f590706fafda6ba69bd44095.tar.gz
musl-066675b947b4cc68f590706fafda6ba69bd44095.tar.bz2
musl-066675b947b4cc68f590706fafda6ba69bd44095.zip
dev-util/strace: in tree version 4.9 works.
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/strace/Manifest4
-rw-r--r--dev-util/strace/files/strace-4.8-musl.patch168
-rw-r--r--dev-util/strace/metadata.xml10
-rw-r--r--dev-util/strace/strace-4.8-r99.ebuild49
4 files changed, 0 insertions, 231 deletions
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
deleted file mode 100644
index 8a02f404..00000000
--- a/dev-util/strace/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX strace-4.8-musl.patch 5023 SHA256 f9b03b807681841b7fa0062235b597628af0e9b7ddad8582f08ab660b0e492bc SHA512 cf539cd9fa51c58b23e65a3c299f25efbe5d3c0475c758858b700138323c876a881f137c448f3a3e3a70acc5373374a4a1f8ad1372a6be73ae336c98f7ff1608 WHIRLPOOL 73261a65a9fb1054f66e4f4f1ac9cdac831f97c338c3cc8a1d8d16ac1f7a642e6ec7c982500ad75543344c4624dcde3b59203e86376d7370bcfad49274f82653
-DIST strace-4.8.tar.xz 441712 SHA256 f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8 SHA512 c3316382f60cd4d02eec1eef46a0ef2d000afbccf2c176a6fec652e1b3391685f0e33f184497cb3ccf54d72d460471a4945d3a864fb5bce1f45f32fdf132cfe3 WHIRLPOOL 0ca28920b73d3b70a87bffff77c9af6bb9179f0918589f90613e68a499f84cc399e306b4f1832e1dd9e825c94671fcb69a5f08f6c64e6000411553e0b911e6d2
-EBUILD strace-4.8-r99.ebuild 1226 SHA256 3943f34c983aa262c147bc64eeafb84d952486f8ee1eef9fcb66554cdb87efa7 SHA512 5ddd3c86e43d552843d1c5348e25c296e2c2406e3c609b33d193aca635b9e7b099399a122dbd3c4f8637f8bd3e71b9cb4d01c26834f55ae2005273fa3395a36f WHIRLPOOL 155f210d0402bca92d5017547eb7fead1f8f3c507d4e67cdce84ba2cf6185f47af854be279266c7067968ce0f53f7016abfc1f955f9e0d7da56ff6a79608e081
-MISC metadata.xml 305 SHA256 bd45e0108da45e19fd1d940ab451b2195fb9dc21d4c397435e2ca9c1848845ce SHA512 fb6e6f53e8754da30643d9fb07a30c2a11d0cdd91fe1b62498396d040242e5f164477715d84a2a89a1fb757a861a8cc8fa3a2ca67e85dc71ac436a5b4b07a56e WHIRLPOOL 0d316f0a6985a4c4b2b83a5a495e206d9a6b2cc53d5f4924cb9111bd9fab5d993cb550dc60e2fbadefff30bb386a786b78831745725f1bbed77f490f9c1dc87e
diff --git a/dev-util/strace/files/strace-4.8-musl.patch b/dev-util/strace/files/strace-4.8-musl.patch
deleted file mode 100644
index ac9cf562..00000000
--- a/dev-util/strace/files/strace-4.8-musl.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-taken from sabotage linux
-diff -ru strace-4.8.orig/defs.h strace-4.8/defs.h
---- strace-4.8.orig/defs.h 2013-05-14 14:10:42.000000000 +0000
-+++ strace-4.8/defs.h 2013-09-20 14:30:38.785856744 +0000
-@@ -155,7 +155,7 @@
- || defined(METAG) \
- || defined(TILE) \
- || defined(XTENSA) \
-- ) && defined(__GLIBC__)
-+ ) && defined(__linux__)
- # include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
-@@ -222,7 +222,7 @@
- # define PTRACE_EVENT_EXIT 6
- #endif
-
--#if !defined(__GLIBC__)
-+#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER)
- # define PTRACE_PEEKUSER PTRACE_PEEKUSR
- # define PTRACE_POKEUSER PTRACE_POKEUSR
- #endif
-diff -ru strace-4.8.orig/desc.c strace-4.8/desc.c
---- strace-4.8.orig/desc.c 2013-05-01 22:39:10.000000000 +0000
-+++ strace-4.8/desc.c 2013-09-20 14:30:38.795856744 +0000
-@@ -299,7 +299,7 @@
- #ifdef X32
- tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len);
- #else
-- tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
-+ tprintf(", start=%ld, len=%ld", (long) fl.l_start, (long) fl.l_len);
- #endif
- if (getlk)
- tprintf(", pid=%lu}", (unsigned long) fl.l_pid);
-diff -ru strace-4.8.orig/file.c strace-4.8/file.c
---- strace-4.8.orig/file.c 2013-05-06 18:23:01.000000000 +0000
-+++ strace-4.8/file.c 2013-09-20 14:30:38.795856744 +0000
-@@ -632,7 +632,7 @@
- return 0;
- }
-
--#if _LFS64_LARGEFILE
-+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T
- int
- sys_truncate64(struct tcb *tcp)
- {
-@@ -654,7 +654,7 @@
- return 0;
- }
-
--#if _LFS64_LARGEFILE
-+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T
- int
- sys_ftruncate64(struct tcb *tcp)
- {
-@@ -2322,7 +2322,7 @@
- return 0;
- }
-
--#if _LFS64_LARGEFILE
-+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T
- int
- sys_getdents64(struct tcb *tcp)
- {
-diff -ru strace-4.8.orig/net.c strace-4.8/net.c
---- strace-4.8.orig/net.c 2013-05-17 22:20:02.000000000 +0000
-+++ strace-4.8/net.c 2013-09-20 14:30:38.805856744 +0000
-@@ -95,12 +95,14 @@
- #endif
-
- /* Under Linux these are enums so we can't test for them with ifdef. */
-+#if !defined(IPPROTO_MAX)
- #define IPPROTO_EGP IPPROTO_EGP
- #define IPPROTO_PUP IPPROTO_PUP
- #define IPPROTO_IDP IPPROTO_IDP
- #define IPPROTO_IGMP IPPROTO_IGMP
- #define IPPROTO_RAW IPPROTO_RAW
- #define IPPROTO_MAX IPPROTO_MAX
-+#endif
-
- static const struct xlat domains[] = {
- #ifdef PF_UNSPEC
-diff -ru strace-4.8.orig/process.c strace-4.8/process.c
---- strace-4.8.orig/process.c 2013-05-17 22:22:19.000000000 +0000
-+++ strace-4.8/process.c 2013-09-20 14:30:38.805856744 +0000
-@@ -2857,7 +2857,7 @@
- if (umove(tcp, tcp->u_arg[2], &p) < 0)
- tprintf(", %#lx", tcp->u_arg[2]);
- else
-- tprintf(", { %d }", p.__sched_priority);
-+ tprintf(", { %d }", p.sched_priority);
- }
- return 0;
- }
-@@ -2872,7 +2872,7 @@
- if (umove(tcp, tcp->u_arg[1], &p) < 0)
- tprintf("%#lx", tcp->u_arg[1]);
- else
-- tprintf("{ %d }", p.__sched_priority);
-+ tprintf("{ %d }", p.sched_priority);
- }
- return 0;
- }
-@@ -2885,7 +2885,7 @@
- if (umove(tcp, tcp->u_arg[1], &p) < 0)
- tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
- else
-- tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
-+ tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
- }
- return 0;
- }
-diff -ru strace-4.8.orig/signal.c strace-4.8/signal.c
---- strace-4.8.orig/signal.c 2013-05-23 13:41:23.000000000 +0000
-+++ strace-4.8/signal.c 2013-09-20 14:30:38.815856744 +0000
-@@ -59,6 +59,7 @@
- #ifdef IA64
- # include <asm/ptrace_offsets.h>
- #endif
-+#include <asm/ptrace.h>
-
- #if defined(SPARC) || defined(SPARC64) || defined(MIPS)
- typedef struct {
-diff -ru strace-4.8.orig/strace.c strace-4.8/strace.c
---- strace-4.8.orig/strace.c 2013-05-28 21:49:16.000000000 +0000
-+++ strace-4.8/strace.c 2013-09-20 14:30:38.815856744 +0000
-@@ -506,7 +506,7 @@
- perror_msg_and_die("dup2");
- close(fds[0]);
- }
-- execl(_PATH_BSHELL, "sh", "-c", command, NULL);
-+ execl(_PATH_BSHELL, "sh", "-c", command, (void*) 0);
- perror_msg_and_die("Can't execute '%s'", _PATH_BSHELL);
- }
-
-diff -ru strace-4.8.orig/syscall.c strace-4.8/syscall.c
---- strace-4.8.orig/syscall.c 2013-05-14 14:10:42.000000000 +0000
-+++ strace-4.8/syscall.c 2013-09-20 14:30:38.825856744 +0000
-@@ -72,13 +72,7 @@
- # include <elf.h>
- #endif
-
--#if defined(AARCH64)
--# include <asm/ptrace.h>
--#endif
--
--#if defined(XTENSA)
--# include <asm/ptrace.h>
--#endif
-+#include <asm/ptrace.h>
-
- #ifndef ERESTARTSYS
- # define ERESTARTSYS 512
-diff -ru strace-4.8.orig/time.c strace-4.8/time.c
---- strace-4.8.orig/time.c 2012-05-01 21:17:51.000000000 +0000
-+++ strace-4.8/time.c 2013-09-20 14:32:49.165856719 +0000
-@@ -774,7 +774,11 @@
- /* _pad[0] is the _tid field which might not be
- present in the userlevel definition of the
- struct. */
-+#if defined(__GLIBC__)
- tprintf("{%d}", sev._sigev_un._pad[0]);
-+#else
-+ tprintf("{%d}", (int) sev.__pad[0]);
-+#endif
- else if (sev.sigev_notify == SIGEV_THREAD)
- tprintf("{%p, %p}", sev.sigev_notify_function,
- sev.sigev_notify_attributes);
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
deleted file mode 100644
index 3134acb4..00000000
--- a/dev-util/strace/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <use>
- <flag name="aio">
- Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
- </flag>
- </use>
-</pkgmetadata>
diff --git a/dev-util/strace/strace-4.8-r99.ebuild b/dev-util/strace/strace-4.8-r99.ebuild
deleted file mode 100644
index 2d1c7455..00000000
--- a/dev-util/strace/strace-4.8-r99.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.8.ebuild,v 1.5 2014/02/20 13:36:59 jer Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
- inherit git-2 autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="http://sourceforge.net/projects/strace/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio +perl static"
-
-# strace only uses the header from libaio to decode structs
-DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
- sys-kernel/linux-headers"
-RDEPEND=""
-
-src_prepare() {
- if epatch_user || [[ ! -e configure ]] ; then
- # git generation
- eautoreconf
- [[ ! -e CREDITS ]] && cp CREDITS{.in,}
- fi
-
- epatch ${FILESDIR}/${P}-musl.patch
- export ac_cv_have_long_long_off_t=yes
-
- filter-lfs-flags # configure handles this sanely
- use static && append-ldflags -static
-
- export ac_cv_header_libaio_h=$(usex aio)
-}
-
-src_install() {
- default
- use perl || rm "${ED}"/usr/bin/strace-graph
- dodoc CREDITS
-}