1 |
commit: adaca90bc8e6bcf0df7e14452d8292487ab6aa1e |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 1 22:52:11 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 1 22:52:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adaca90b |
7 |
|
8 |
app-emulation/ski: tweak for binutils-2.34 |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
.../ski/files/ski-1.3.2-binutils-2.34.patch | 22 ++++++++++++++++++++++ |
14 |
app-emulation/ski/ski-1.3.2-r3.ebuild | 4 ++++ |
15 |
2 files changed, 26 insertions(+) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..dcb3f6793fb |
20 |
--- /dev/null |
21 |
+++ b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch |
22 |
@@ -0,0 +1,22 @@ |
23 |
+diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c |
24 |
+index 73be0e6..c4051a3 100644 |
25 |
+--- a/src/linux/dwarf-linux.c |
26 |
++++ b/src/linux/dwarf-linux.c |
27 |
+@@ -116,14 +116,14 @@ find_in_section (bfd * bfd, asection * sect, PTR obj) |
28 |
+ /* |
29 |
+ * we're looking at loadable code only |
30 |
+ */ |
31 |
+- if ((bfd_get_section_flags (bfd, sect) & (SEC_CODE | SEC_ALLOC)) == 0) |
32 |
++ if ((bfd_section_flags (sect) & (SEC_CODE | SEC_ALLOC)) == 0) |
33 |
+ return; |
34 |
+ |
35 |
+ /* |
36 |
+ * check if address belongs to this section |
37 |
+ */ |
38 |
+- vma = bfd_get_section_vma (bfd, sect); |
39 |
+- size = bfd_section_size (bfd, sect); |
40 |
++ vma = bfd_section_vma (sect); |
41 |
++ size = bfd_section_size (sect); |
42 |
+ |
43 |
+ offset = info->address - vma; |
44 |
+ if (offset >= size) |
45 |
|
46 |
diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild |
47 |
index e64df45c125..7fa7d9227e0 100644 |
48 |
--- a/app-emulation/ski/ski-1.3.2-r3.ebuild |
49 |
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild |
50 |
@@ -44,6 +44,10 @@ PATCHES=( |
51 |
src_prepare() { |
52 |
default |
53 |
|
54 |
+ if has_version ">=sys-libs/binutils-libs-2.34"; then |
55 |
+ eapply "${FILESDIR}"/${PN}-1.3.2-binutils-2.34.patch |
56 |
+ fi |
57 |
+ |
58 |
rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4 |
59 |
|
60 |
AT_M4DIR="macros" eautoreconf |