diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-03-28 10:05:57 +0100 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2016-03-31 12:48:02 +0100 |
| commit | 53944da3fa972dafbcf2a29d29fcbecf6d2dfb82 (patch) | |
| tree | aacd56f6bc6301935fd04292f3f6e6fcfb00d77f /network | |
| parent | 53c9726df8bfc12764a72abfaf7326aa0e263cff (diff) | |
| download | slackbuilds-53944da3fa972dafbcf2a29d29fcbecf6d2dfb82.tar.gz | |
network/icecat: Patched to fix build fail.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'network')
| -rw-r--r-- | network/icecat/changeset280875.patch | 49 | ||||
| -rw-r--r-- | network/icecat/icecat.SlackBuild | 3 |
2 files changed, 52 insertions, 0 deletions
diff --git a/network/icecat/changeset280875.patch b/network/icecat/changeset280875.patch new file mode 100644 index 0000000000..1e7fa1cd1e --- /dev/null +++ b/network/icecat/changeset280875.patch @@ -0,0 +1,49 @@ +From 4d0fe8f40364c170226f1ef3bc98975630463e87 Mon Sep 17 00:00:00 2001 +From: Mike Hommey <mh+mozilla@glandium.org> +Date: Tue, 19 Jan 2016 14:31:04 +0900 +Subject: [PATCH] Bug 1233963 - Work around recent GNU gold behavior with + segments starting before the first section they contain + +--- + build/unix/elfhack/elf.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp +index 666b535..743afde 100644 +--- a/build/unix/elfhack/elf.cpp ++++ b/build/unix/elfhack/elf.cpp +@@ -253,26 +253,29 @@ Elf::Elf(std::ifstream &file) + } + if (phdr.p_type == PT_PHDR) + segment->addSection(phdr_section); + for (int j = 1; j < ehdr->e_shnum; j++) + if (phdr.contains(sections[j])) + segment->addSection(sections[j]); + // Make sure that our view of segments corresponds to the original + // ELF file. +- assert(segment->getFileSize() == phdr.p_filesz); ++ // GNU gold likes to start some segments before the first section ++ // they contain. https://sourceware.org/bugzilla/show_bug.cgi?id=19392 ++ unsigned int gold_adjustment = segment->getAddr() - phdr.p_vaddr; ++ assert(segment->getFileSize() == phdr.p_filesz - gold_adjustment); + // gold makes TLS segments end on an aligned virtual address, even + // when the underlying section ends before that, while bfd ld + // doesn't. It's fine if we don't keep that alignment. + unsigned int memsize = segment->getMemSize(); + if (phdr.p_type == PT_TLS && memsize != phdr.p_memsz) { + unsigned int align = segment->getAlign(); + memsize = (memsize + align - 1) & ~(align - 1); + } +- assert(memsize == phdr.p_memsz); ++ assert(memsize == phdr.p_memsz - gold_adjustment); + segments.push_back(segment); + } + + new (&eh_entry) ElfLocation(ehdr->e_entry, this); + } + + Elf::~Elf() + { +-- +2.7.0 + diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild index 775aee6e46..7268c7f7c4 100644 --- a/network/icecat/icecat.SlackBuild +++ b/network/icecat/icecat.SlackBuild @@ -91,6 +91,9 @@ sed -e '/^ftglyph.h/i ftfntfmt.h' \ -e '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' \ -i config/system-headers +# https://bugzilla.mozilla.org/show_bug.cgi?id=1233963 +patch -p1 < $CWD/changeset280875.patch + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ |