diff options
author | Victor Ostorga <vostorga@gentoo.org> | 2009-07-22 23:26:52 +0000 |
---|---|---|
committer | Victor Ostorga <vostorga@gentoo.org> | 2009-07-22 23:26:52 +0000 |
commit | d533d4168ce5af8089d2df64ea3d95acd2fb686d (patch) | |
tree | 87c099ede9f24e85b872437dad4ff425b629c7a1 /dev-util/elfsh | |
parent | Stable on amd64 (bug #277749) (diff) | |
download | gentoo-2-d533d4168ce5af8089d2df64ea3d95acd2fb686d.tar.gz gentoo-2-d533d4168ce5af8089d2df64ea3d95acd2fb686d.tar.bz2 gentoo-2-d533d4168ce5af8089d2df64ea3d95acd2fb686d.zip |
Fix compilation with glibc-2.10, wrt bug #276065
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-util/elfsh')
-rw-r--r-- | dev-util/elfsh/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/elfsh/elfsh-0.51_beta3.ebuild | 4 | ||||
-rw-r--r-- | dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch | 16 |
3 files changed, 24 insertions, 2 deletions
diff --git a/dev-util/elfsh/ChangeLog b/dev-util/elfsh/ChangeLog index 461f73233923..6ff0be117ded 100644 --- a/dev-util/elfsh/ChangeLog +++ b/dev-util/elfsh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/elfsh # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/ChangeLog,v 1.10 2009/05/02 20:29:16 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/ChangeLog,v 1.11 2009/07/22 23:26:52 vostorga Exp $ + + 22 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> + elfsh-0.51_beta3.ebuild, +files/elfsh-0.51_beta3-glibc210.patch: + Fix compilation with glibc-2.10, wrt bug #276065 02 May 2009; Mark Loeser <halcy0n@gentoo.org> elfsh-0.51_beta3.ebuild, elfsh-0.65_rc1.ebuild: diff --git a/dev-util/elfsh/elfsh-0.51_beta3.ebuild b/dev-util/elfsh/elfsh-0.51_beta3.ebuild index 2051f15b84dd..f01becb4df3b 100644 --- a/dev-util/elfsh/elfsh-0.51_beta3.ebuild +++ b/dev-util/elfsh/elfsh-0.51_beta3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/elfsh-0.51_beta3.ebuild,v 1.6 2009/05/02 20:29:16 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/elfsh-0.51_beta3.ebuild,v 1.7 2009/07/22 23:26:52 vostorga Exp $ inherit eutils @@ -17,11 +17,13 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="" DEPEND=">=dev-libs/expat-1.95" +RDEPEND="${DEPEND}" src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PV}-gentoo.patch + epatch "${FILESDIR}"/${P}-glibc210.patch sed -i \ -e "s:-g3 -O2:${CFLAGS}:" \ `find -name Makefile` \ diff --git a/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch new file mode 100644 index 000000000000..8866db7ed31b --- /dev/null +++ b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch @@ -0,0 +1,16 @@ +diff -NrU5 elfsh-0.51b3.original/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h +--- elfsh-0.51b3.original/vm/include/elfsh.h 2009-07-22 23:17:51.000000000 -0600 ++++ elfsh-0.51b3/vm/include/elfsh.h 2009-07-22 23:22:30.000000000 -0600 +@@ -469,11 +469,11 @@ + int vm_getsort(u_int index, u_int argc, char **argv); + int vm_getdisasm(u_int index, u_int argc, char **argv); + int vm_gethexa(u_int index, u_int argc, char **argv); + int vm_getvarparams(u_int index, u_int argc, char **argv); + +-int dprintf(int fd, char *format, ...); ++int d_printf(int fd, char *format, ...); + + /* Libasm resolve handler */ + void do_resolve(void *data, u_int vaddr, char *, u_int); + u_int display_instr(int, u_int, u_int, u_int, u_int, + char *, u_int, char *); |