gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

x11-libs/cairo: tweak for binutils-2.34, bug #707960

Browse Source 
Reported-by: Hugo Ribeiro
Closes: https://bugs.gentoo.org/707960
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich
2020-02-04 09:02:14 +00:00
parent 7e6fc94c7e
commit 66be6eece6
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
x11-libs/cairo/cairo-1.16.0-r3.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -67,6 +67,10 @@ PATCHES=(
src_prepare() {
default
if has_version ">=sys-libs/binutils-libs-2.34"; then
eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
fi
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die

6
x11-libs/cairo/cairo-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -65,6 +65,10 @@ PATCHES=(
src_prepare() {
default
if has_version ">=sys-libs/binutils-libs-2.34"; then
eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
fi
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die

20
x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/util/cairo-trace/lookup-symbol.c
+++ b/util/cairo-trace/lookup-symbol.c
@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
if (symbol->found)
return;
- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
+ if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
return;
- vma = bfd_get_section_vma (symtab->bfd, section);
+ vma = bfd_section_vma (section);
if (symbol->pc < vma)
return;
- size = bfd_section_size (symtab->bfd, section);
+ size = bfd_section_size (section);
if (symbol->pc >= vma + size)
return;