diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-05-12 14:13:01 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-05-12 14:13:01 +0000 |
| commit | 01b8037e92f91339b195592773a5cf43ee5e4744 (patch) | |
| tree | 82990c93bf3db1633d42a1479d79929446b68e24 /dev-libs/udis86 | |
| parent | new snapshot (diff) | |
| download | gentoo-2-01b8037e92f91339b195592773a5cf43ee5e4744.tar.gz gentoo-2-01b8037e92f91339b195592773a5cf43ee5e4744.tar.bz2 gentoo-2-01b8037e92f91339b195592773a5cf43ee5e4744.zip | |
Don't fail tests if dev-lang/yasm is not installed, bug #318805
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/udis86')
| -rw-r--r-- | dev-libs/udis86/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/udis86/files/udis86-1.7-yasm.patch | 35 | ||||
| -rw-r--r-- | dev-libs/udis86/udis86-1.7.ebuild | 16 |
3 files changed, 54 insertions, 4 deletions
diff --git a/dev-libs/udis86/ChangeLog b/dev-libs/udis86/ChangeLog index d4efe7b6c8cf..7aee24073dee 100644 --- a/dev-libs/udis86/ChangeLog +++ b/dev-libs/udis86/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/udis86 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/ChangeLog,v 1.6 2010/05/11 21:02:36 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/ChangeLog,v 1.7 2010/05/12 14:13:00 chithanh Exp $ + + 12 May 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + udis86-1.7.ebuild, +files/udis86-1.7-yasm.patch: + Don't fail tests if dev-lang/yasm is not installed, bug #318805, patch + from jer 11 May 2010; Brent Baude <ranger@gentoo.org> udis86-1.7.ebuild: keyworded ~arch for ppc64, bug 317149 diff --git a/dev-libs/udis86/files/udis86-1.7-yasm.patch b/dev-libs/udis86/files/udis86-1.7-yasm.patch new file mode 100644 index 000000000000..3d3eecdf8283 --- /dev/null +++ b/dev-libs/udis86/files/udis86-1.7-yasm.patch @@ -0,0 +1,35 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,9 @@ + AC_DISABLE_SHARED + AC_PROG_LIBTOOL + ++AC_PATH_PROG([YASM], yasm,) ++AC_SUBST(YASM) ++ + # If this is a gnu compiler, pass -Wall + if test "$ac_cv_c_compiler_gnu" = "yes"; then + CFLAGS="$CFLAGS -Wall" +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -10,7 +10,7 @@ + ovrrun_LDADD = ../libudis86/libudis86.la + ovrrun_CFLAGS = -I$(top_srcdir)/libudis86 -I$(top_srcdir) + +-YASM = yasm ++YASM = @YASM@ + + dist_check_DATA = test16.asm test32.asm test64.asm testjmp.asm testobscure.asm \ + testjmp.ref testobscure.ref randtest.raw randtest16.ref \ +@@ -18,7 +18,10 @@ + + check-local: tests + +-tests: test16 test32 test64 testjmp bufovrrun randraw ++yasm_tests: test16 test32 test64 testjmp ++no_yasm_tests: bufovrrun randraw ++ ++tests: $(if $(YASM), yasm_tests) no_yasm_tests + + test16: gen + $(YASM) -f bin -o test16.bin $(top_srcdir)/tests/test16.asm diff --git a/dev-libs/udis86/udis86-1.7.ebuild b/dev-libs/udis86/udis86-1.7.ebuild index 1dce723b6c99..86ba546a4b1a 100644 --- a/dev-libs/udis86/udis86-1.7.ebuild +++ b/dev-libs/udis86/udis86-1.7.ebuild @@ -1,6 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7.ebuild,v 1.6 2010/05/11 21:02:36 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7.ebuild,v 1.7 2010/05/12 14:13:00 chithanh Exp $ + +EAPI=3 +inherit autotools DESCRIPTION="Disassembler library for the x86/-64 architecture sets." HOMEPAGE="http://udis86.sourceforge.net/" @@ -12,11 +15,18 @@ KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd" IUSE="" DEPEND="test? ( - x86? ( dev-lang/yasm ) - amd64? ( dev-lang/yasm ) + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) + x86-fbsd? ( dev-lang/yasm ) )" RDEPEND="" +src_prepare() { + # Don't fail tests if dev-lang/yasm is not installed, bug #318805 + epatch "${FILESDIR}"/${P}-yasm.patch + eautoreconf +} + src_install() { emake docdir="/usr/share/doc/${PF}/" DESTDIR="${D}" install || die "emake install failed" } |