commit: adaca90bc8e6bcf0df7e14452d8292487ab6aa1e
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 22:52:11 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 22:52:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adaca90b
app-emulation/ski: tweak for binutils-2.34
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../ski/files/ski-1.3.2-binutils-2.34.patch | 22 ++++++++++++++++++++++
app-emulation/ski/ski-1.3.2-r3.ebuild | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
new file mode 100644
index 00000000000..dcb3f6793fb
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
@@ -0,0 +1,22 @@
+diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
+index 73be0e6..c4051a3 100644
+--- a/src/linux/dwarf-linux.c
++++ b/src/linux/dwarf-linux.c
+@@ -116,14 +116,14 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
+ /*
+ * we're looking at loadable code only
+ */
+- if ((bfd_get_section_flags (bfd, sect) & (SEC_CODE | SEC_ALLOC)) == 0)
++ if ((bfd_section_flags (sect) & (SEC_CODE | SEC_ALLOC)) == 0)
+ return;
+
+ /*
+ * check if address belongs to this section
+ */
+- vma = bfd_get_section_vma (bfd, sect);
+- size = bfd_section_size (bfd, sect);
++ vma = bfd_section_vma (sect);
++ size = bfd_section_size (sect);
+
+ offset = info->address - vma;
+ if (offset >= size)
diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild
b/app-emulation/ski/ski-1.3.2-r3.ebuild
index e64df45c125..7fa7d9227e0 100644
--- a/app-emulation/ski/ski-1.3.2-r3.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
@@ -44,6 +44,10 @@ PATCHES=(
src_prepare() {
default
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.3.2-binutils-2.34.patch
+ fi
+
rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
AT_M4DIR="macros" eautoreconf
