diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-24 02:11:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-24 02:11:15 +0000 |
| commit | 4b0b4b93de041680bbe42d20fce6579d0b4e0d7a (patch) | |
| tree | 27d87590898f3518796220d2bcc83c78b2e2d814 /dev-util/strace | |
| parent | mask USE=aio (diff) | |
| download | gentoo-2-4b0b4b93de041680bbe42d20fce6579d0b4e0d7a.tar.gz gentoo-2-4b0b4b93de041680bbe42d20fce6579d0b4e0d7a.tar.bz2 gentoo-2-4b0b4b93de041680bbe42d20fce6579d0b4e0d7a.zip | |
Fix up libaio support #103427 by Mathieu Seigneurin.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-util/strace')
| -rw-r--r-- | dev-util/strace/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/strace/files/strace-4.5.12-libaio.patch | 20 | ||||
| -rw-r--r-- | dev-util/strace/strace-4.5.12.ebuild | 16 |
3 files changed, 34 insertions, 8 deletions
diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog index 613708dcb07d..7b7cb400a6c8 100644 --- a/dev-util/strace/ChangeLog +++ b/dev-util/strace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/strace # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.66 2005/08/18 00:24:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.67 2005/08/24 02:11:15 vapier Exp $ + + 24 Aug 2005; Mike Frysinger <vapier@gentoo.org> + +files/strace-4.5.12-libaio.patch, strace-4.5.12.ebuild: + Fix up libaio support #103427 by Mathieu Seigneurin. 18 Aug 2005; Mike Frysinger <vapier@gentoo.org> +files/strace-4.5.12-quota.patch, strace-4.5.12.ebuild: diff --git a/dev-util/strace/files/strace-4.5.12-libaio.patch b/dev-util/strace/files/strace-4.5.12-libaio.patch new file mode 100644 index 000000000000..bc4ab335f799 --- /dev/null +++ b/dev-util/strace/files/strace-4.5.12-libaio.patch @@ -0,0 +1,20 @@ +--- desc.c ++++ desc.c +@@ -767,7 +767,7 @@ struct tcb *tcp; + continue; + } + tprintf("{%p, %u, %hu, %hu, %d}", +- iocb.data, iocb.key, ++ iocb.aio_data, iocb.aio_key, + iocb.aio_lio_opcode, + iocb.aio_reqprio, iocb.aio_fildes); + } +@@ -793,7 +793,7 @@ struct tcb *tcp; + #ifdef HAVE_LIBAIO_H + if (umove(tcp, tcp->u_arg[1], &iocb) == 0) { + tprintf("{%p, %u, %hu, %hu, %d}, ", +- iocb.data, iocb.key, ++ iocb.aio_data, iocb.aio_key, + iocb.aio_lio_opcode, + iocb.aio_reqprio, iocb.aio_fildes); + } else diff --git a/dev-util/strace/strace-4.5.12.ebuild b/dev-util/strace/strace-4.5.12.ebuild index 119b16a6302e..42023b7eef0a 100644 --- a/dev-util/strace/strace-4.5.12.ebuild +++ b/dev-util/strace/strace-4.5.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.2 2005/08/18 00:24:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.3 2005/08/24 02:11:15 vapier Exp $ inherit flag-o-matic @@ -11,17 +11,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="as-is" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~s390 ~sparc ~x86" -IUSE="static" +IUSE="static aio" -DEPEND="" +DEPEND="aio? ( dev-libs/libaio )" src_unpack() { unpack ${A} cd "${S}" - if [[ ${CTARGET:-${CHOST}} == *-freebsd* ]] ; then - epatch ${FILESDIR}/${P}-fbsd.patch - fi + [[ ${CHOST} == *-freebsd* ]] && epatch "${FILESDIR}"/${P}-fbsd.patch # Fix support for newer glibc snapshots #102080 epatch "${FILESDIR}"/${P}-quota.patch aclocal && autoheader && autoconf && automake || die "autotools failed" @@ -33,9 +31,12 @@ src_unpack() { # Fix building on older ARM machines epatch "${FILESDIR}"/strace-undef-syscall.patch + # Fix libaio support #103427 + epatch "${FILESDIR}"/${P}-libaio.patch + # Remove some obsolete ia64-related hacks from the strace source # (08 Feb 2005 agriffis) - epatch ${FILESDIR}/strace-4.5.8-ia64.patch + epatch "${FILESDIR}"/strace-4.5.8-ia64.patch # This is ugly but linux26-headers-2.6.8.1-r2 (and other versions) has some # issues with definition of s64 and friends. This seems to solve @@ -47,6 +48,7 @@ src_unpack() { filter-lfs-flags use static && append-ldflags -static + use libaio || export ac_cv_header_libaio_h=no } src_install() { |