| 1 |
commit: e9188ba72be3130b5a15fde1996e07c3bac4d7f7 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 5 09:22:39 2020 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 5 09:22:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9188ba7 |
| 7 |
|
| 8 |
dev-ada/gnatmem: build with newer binutils-libs |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/735676 |
| 11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ada/gnatmem/files/gnatmem-2019-bfd.patch | 29 ++++++++++++++++++++++++++++ |
| 15 |
dev-ada/gnatmem/gnatmem-2019-r1.ebuild | 13 +++++++++---- |
| 16 |
2 files changed, 38 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch b/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..007d217cf24 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch |
| 23 |
@@ -0,0 +1,29 @@ |
| 24 |
+--- a/src/libaddr2line.c 2020-08-04 22:41:04.670046491 +0200 |
| 25 |
++++ b/src/libaddr2line.c 2020-08-04 22:44:55.560802332 +0200 |
| 26 |
+@@ -55,14 +55,26 @@ |
| 27 |
+ if (found) |
| 28 |
+ return; |
| 29 |
+ |
| 30 |
++#if defined(bfd_get_section_flags) |
| 31 |
+ if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0) |
| 32 |
++#else |
| 33 |
++ if ((bfd_section_flags (section) & SEC_ALLOC) == 0) |
| 34 |
++#endif |
| 35 |
+ return; |
| 36 |
+ |
| 37 |
++#if defined(bfd_get_section_vma) |
| 38 |
+ vma = bfd_get_section_vma (abfd, section); |
| 39 |
++#else |
| 40 |
++ vma = bfd_section_vma (section); |
| 41 |
++#endif |
| 42 |
+ if (pc < vma) |
| 43 |
+ return; |
| 44 |
+ |
| 45 |
++#if defined(bfd_get_section_size) |
| 46 |
+ size = bfd_get_section_size (section); |
| 47 |
++#else |
| 48 |
++ size = bfd_section_size (section); |
| 49 |
++#endif |
| 50 |
+ if (pc >= vma + size) |
| 51 |
+ return; |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild |
| 55 |
index 44e18966d1e..67e5964f46a 100644 |
| 56 |
--- a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild |
| 57 |
+++ b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-# Copyright 1999-2019 Gentoo Authors |
| 60 |
+# Copyright 1999-2020 Gentoo Authors |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
EAPI=7 |
| 64 |
@@ -21,13 +21,16 @@ IUSE="" |
| 65 |
RDEPEND="${ADA_DEPS}" |
| 66 |
DEPEND="${RDEPEND} |
| 67 |
dev-ada/gprbuild[${ADA_USEDEP}] |
| 68 |
- sys-libs/binutils-libs" |
| 69 |
+ sys-libs/binutils-libs:=" |
| 70 |
|
| 71 |
REQUIRED_USE="${ADA_REQUIRED_USE}" |
| 72 |
|
| 73 |
S="${WORKDIR}"/${MYP} |
| 74 |
|
| 75 |
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch ) |
| 76 |
+PATCHES=( |
| 77 |
+ "${FILESDIR}"/${PN}-2018-gentoo.patch |
| 78 |
+ "${FILESDIR}"/${P}-bfd.patch |
| 79 |
+) |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
default |
| 83 |
@@ -37,7 +40,9 @@ src_prepare() { |
| 84 |
|
| 85 |
src_compile() { |
| 86 |
gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \ |
| 87 |
- -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} |
| 88 |
+ -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \ |
| 89 |
+ -largs ${LDFLAGS} \ |
| 90 |
+ || die |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
Archives