diff options
| author | Florian Franzmann | 2020-02-05 19:38:36 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2020-02-05 19:38:36 +0100 |
| commit | bee0b48717ea8c601b96b1eeb3e3ab1a762dfe98 (patch) | |
| tree | b4c29638b7707b828ddeb5b98f3119aedb75e9c4 /x11-libs | |
| parent | c44711a94b06b8dfc023dcb4d69438edc1c7bc58 (diff) | |
x11-libs/cairo: fix build against binutils 2.34
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch | 53 | ||||
| -rw-r--r-- | x11-libs/cairo/HISTORY | 4 | ||||
| -rwxr-xr-x | x11-libs/cairo/PRE_BUILD | 2 |
3 files changed, 59 insertions, 0 deletions
diff --git a/x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch b/x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch new file mode 100644 index 0000000000..c89bce21fd --- /dev/null +++ b/x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch @@ -0,0 +1,53 @@ +From 8754b40ce3dcec160b6bdddb323a09fdb8967ffd Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Wed, 5 Feb 2020 19:36:48 +0100 +Subject: [PATCH] Fix build against binutils 2.34 + +--- + util/backtrace-symbols.c | 4 ++-- + util/cairo-trace/lookup-symbol.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/util/backtrace-symbols.c b/util/backtrace-symbols.c +index 9931413..58bed54 100644 +--- a/util/backtrace-symbols.c ++++ b/util/backtrace-symbols.c +@@ -130,11 +130,11 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data __a + if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) + return; + +- vma = bfd_get_section_vma(abfd, section); ++ vma = bfd_section_vma(section); + if (pc < vma) + return; + +- size = bfd_section_size(abfd, section); ++ size = bfd_section_size(section); + if (pc >= vma + size) + return; + +diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c +index f9665b3..14abd8f 100644 +--- 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; + +-- +2.25.0 + diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index de75dabdbf..10d28d4151 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,7 @@ +2020-02-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, 0001-Fix-build-against-binutils-2.34.patch: fix build + against binutils 2.34 + 2020-01-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * BUILD: disable gc sections diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD index a4bc183723..18e4d7f01c 100755 --- a/x11-libs/cairo/PRE_BUILD +++ b/x11-libs/cairo/PRE_BUILD @@ -1,5 +1,7 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && + +patch -p1 < "$SPELL_DIRECTORY/0001-Fix-build-against-binutils-2.34.patch" && if [[ "$CAIRO_BRANCH" == "scm" ]]; then CAIRO_AUTOGEN=y |