Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libdisasm/, dev-embedded/libdisasm/files/
Date: Wed, 16 Sep 2020 18:19:25
Message-Id: 1600280277.4c72b1dce0ed34038d77133cbcdbdc3979c30303.soap@gentoo
1 commit: 4c72b1dce0ed34038d77133cbcdbdc3979c30303
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 18:17:57 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 18:17:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c72b1dc
7
8 dev-embedded/libdisasm: Port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/722606
11 Closes: https://bugs.gentoo.org/726870
12 Closes: https://bugs.gentoo.org/742191
13 Package-Manager: Portage-3.0.7, Repoman-3.0.1
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 .../files/libdisasm-0.23-user-AS-OBJDUMP.patch | 15 ++++++++++++++
17 dev-embedded/libdisasm/libdisasm-0.23.ebuild | 23 +++++++++++++++++++---
18 2 files changed, 35 insertions(+), 3 deletions(-)
19
20 diff --git a/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch b/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch
21 new file mode 100644
22 index 00000000000..93e1131b0c8
23 --- /dev/null
24 +++ b/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch
25 @@ -0,0 +1,15 @@
26 +--- a/test/asmdisasm.pl
27 ++++ b/test/asmdisasm.pl
28 +@@ -22,10 +22,10 @@
29 + # uninitialized stuff
30 + my ($line, $output);
31 +
32 +-system "as --32 -o $obj_file $asm_file";
33 ++system "$ENV{AS} --32 -o $obj_file $asm_file";
34 + exit(1) if ($? != 0);
35 +
36 +-$output = (grep(/\.text/,`objdump -h $obj_file`))[0];
37 ++$output = (grep(/\.text/,`$ENV{OBJDUMP} -h $obj_file`))[0];
38 + $output =~ s/^\s+//g;
39 + my ($idx,$name,$size,$vma,$lma,$offset,$align)=split(/\s+/,$output);
40 + $size = hex($size);
41
42 diff --git a/dev-embedded/libdisasm/libdisasm-0.23.ebuild b/dev-embedded/libdisasm/libdisasm-0.23.ebuild
43 index 311207917f6..732ccd521c0 100644
44 --- a/dev-embedded/libdisasm/libdisasm-0.23.ebuild
45 +++ b/dev-embedded/libdisasm/libdisasm-0.23.ebuild
46 @@ -1,7 +1,9 @@
47 -# Copyright 1999-2017 Gentoo Foundation
48 +# Copyright 1999-2020 Gentoo Authors
49 # Distributed under the terms of the GNU General Public License v2
50
51 -EAPI=4
52 +EAPI=7
53 +
54 +inherit toolchain-funcs
55
56 DESCRIPTION="Provides basic disassembly of Intel x86 instructions from a binary stream"
57 HOMEPAGE="http://bastard.sourceforge.net/libdisasm.html"
58 @@ -10,4 +12,19 @@ SRC_URI="mirror://sourceforge/project/bastard/${PN}/${PV}/${P}.tar.gz"
59 LICENSE="Clarified-Artistic"
60 SLOT="0"
61 KEYWORDS="-* ~amd64 ~x86"
62 -IUSE=""
63 +
64 +PATCHES=( "${FILESDIR}"/${P}-user-AS-OBJDUMP.patch )
65 +
66 +src_configure() {
67 + # bug 722606
68 + tc-export AS OBJDUMP
69 +
70 + econf --disable-static
71 +}
72 +
73 +src_install() {
74 + default
75 +
76 + # no static archives
77 + find "${ED}" -name '*.la' -delete || die
78 +}