From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- dev-embedded/libdisasm/Manifest | 3 ++- .../files/libdisasm-0.23-user-AS-OBJDUMP.patch | 15 ++++++++++++++ dev-embedded/libdisasm/libdisasm-0.23.ebuild | 23 +++++++++++++++++++--- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch (limited to 'dev-embedded/libdisasm') diff --git a/dev-embedded/libdisasm/Manifest b/dev-embedded/libdisasm/Manifest index 6b1ed633c1c7..8573ef448dda 100644 --- a/dev-embedded/libdisasm/Manifest +++ b/dev-embedded/libdisasm/Manifest @@ -1,3 +1,4 @@ +AUX libdisasm-0.23-user-AS-OBJDUMP.patch 460 BLAKE2B e498ece9c38f8f2e7575787c5fdbc7095f4a06079c7f66e1656e26855f5d9746d174c99e0b513d91a4bb8074edc9fc2bdd8b765c8cad15191547302ee1282bf6 SHA512 588d0a4ef6cd56a3ba1f1d5025659f7c2523f79dd01e32911ba98ca1be4e12b18eebb884fcb852cbf0f4ea0e476de4fb122dcd3594614b74680eebd58fc543ef DIST libdisasm-0.23.tar.gz 454721 BLAKE2B d695b9e102e361c0f005fa8f04163d54fbdcc5254f6e203eee967c58733a2bfdb4ffd9ebfedac3d6e2f06364df03a5c961514f3db6897707402e342c4777e806 SHA512 29eecfbfd8168188242278a1a38f0c90770d0581a52d4600ae6343829dd0d6607b98329f12a3d7409d43dd56dca6a7d1eb25d58a001c2bfd3eb8474c0e7879e7 -EBUILD libdisasm-0.23.ebuild 405 BLAKE2B b2182f5f014f02db429154ba20f8bab43aa262bbb31ed69ad15cee0b1c3c19f20f39987293d9b50db15a4760e21dce4102c2e469c0230a16694d4e27e59c1091 SHA512 7c0283fce40e2aa3e6dd3196481485910f043dc472af3da8ba39168105c64b79550d3f079cb799c1e4d13d846549556179ef20749c9a92addb953fd03e891834 +EBUILD libdisasm-0.23.ebuild 648 BLAKE2B c59ff4607c86be7d2833cd33d1cb903d678b32f8e38048a5685e5ee4afd20da0c811f039747b80c34ad4cf0b5665c7cc287059685c9f1cb2a74b61bb20cd69fe SHA512 8f288179a3c70cf57d560d1d9adc874f912109fa1c3f64a7a5a359ee198b6719dc2be4f05309978cfe5985488a3abf0eda8b5d9c1c49db55e8d65a9f90d7260e MISC metadata.xml 328 BLAKE2B 7aaab0ac2233431c5ea2685525e85cc80c59cfa349213cefa40c4b876de7a657b58758d8cda8778585e95eed0d3972b3b4a63b04819baea32b52a87b4fc5d35e SHA512 5de816ee833c35c55ae77c2b3413e439a649ee819b850122bd28eafb1ccd1027f1f5fd911ce99419d57af4758251f7196d629d28a4f724a975f4b38213b3737c 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 new file mode 100644 index 000000000000..93e1131b0c81 --- /dev/null +++ b/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch @@ -0,0 +1,15 @@ +--- a/test/asmdisasm.pl ++++ b/test/asmdisasm.pl +@@ -22,10 +22,10 @@ + # uninitialized stuff + my ($line, $output); + +-system "as --32 -o $obj_file $asm_file"; ++system "$ENV{AS} --32 -o $obj_file $asm_file"; + exit(1) if ($? != 0); + +-$output = (grep(/\.text/,`objdump -h $obj_file`))[0]; ++$output = (grep(/\.text/,`$ENV{OBJDUMP} -h $obj_file`))[0]; + $output =~ s/^\s+//g; + my ($idx,$name,$size,$vma,$lma,$offset,$align)=split(/\s+/,$output); + $size = hex($size); diff --git a/dev-embedded/libdisasm/libdisasm-0.23.ebuild b/dev-embedded/libdisasm/libdisasm-0.23.ebuild index 311207917f62..732ccd521c0a 100644 --- a/dev-embedded/libdisasm/libdisasm-0.23.ebuild +++ b/dev-embedded/libdisasm/libdisasm-0.23.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Provides basic disassembly of Intel x86 instructions from a binary stream" HOMEPAGE="http://bastard.sourceforge.net/libdisasm.html" @@ -10,4 +12,19 @@ SRC_URI="mirror://sourceforge/project/bastard/${PN}/${PV}/${P}.tar.gz" LICENSE="Clarified-Artistic" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" + +PATCHES=( "${FILESDIR}"/${P}-user-AS-OBJDUMP.patch ) + +src_configure() { + # bug 722606 + tc-export AS OBJDUMP + + econf --disable-static +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3