diff options
| author |   Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2017-01-05 21:42:53 +0000 |
|---|---|---|
| committer | Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2017-01-05 22:46:47 +0100 |
| commit | 5c95a4a832157104ea5e5307faf0bdf1bb59a1c4 (patch) | |
| tree | c52726795ff54497013af9133f1b887afe087e76 | |
| parent | dev-php/phpdepend: remove unused versions 1.1.1 and 2.2.2. (diff) | |
| download | gentoo-5c95a4a832157104ea5e5307faf0bdf1bb59a1c4.tar.gz gentoo-5c95a4a832157104ea5e5307faf0bdf1bb59a1c4.tar.bz2 gentoo-5c95a4a832157104ea5e5307faf0bdf1bb59a1c4.zip | |
www-client/chromium: fix build with glibc-2.24
This addresses bug #594070 by iGentoo . The issue has already been fixed
upstream for M57, this is a backport.
| -rw-r--r-- | www-client/chromium/chromium-56.0.2924.21.ebuild | 3 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-glibc-2.24.patch | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/www-client/chromium/chromium-56.0.2924.21.ebuild b/www-client/chromium/chromium-56.0.2924.21.ebuild index edaa7764aafd..17cd0d0fc0e6 100644 --- a/www-client/chromium/chromium-56.0.2924.21.ebuild +++ b/www-client/chromium/chromium-56.0.2924.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -163,6 +163,7 @@ PATCHES=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" "${FILESDIR}/${PN}-system-jinja-r14.patch" "${FILESDIR}/${PN}-widevine-r1.patch" + "${FILESDIR}/${PN}-glibc-2.24.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-glibc-2.24.patch b/www-client/chromium/files/chromium-glibc-2.24.patch new file mode 100644 index 000000000000..f7bfd816433f --- /dev/null +++ b/www-client/chromium/files/chromium-glibc-2.24.patch @@ -0,0 +1,15 @@ +--- a/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.orig 2017-01-05 20:50:56.329369189 +0000 ++++ b/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2017-01-05 20:51:32.926099779 +0000 +@@ -242,6 +242,12 @@ + ASSERT(!(len & kSystemPageOffsetMask)); + #if OS(POSIX) + int ret = madvise(addr, len, MADV_FREE); ++ if (ret != 0 && errno == EINVAL) { ++ // MADV_FREE only works on Linux 4.5+ . If request failed, ++ // retry with older MADV_DONTNEED . Note that MADV_FREE ++ // being defined at compile time doesn't imply runtime support. ++ ret = madvise(addr, len, MADV_DONTNEED); ++ } + RELEASE_ASSERT(!ret); + #else + setSystemPagesInaccessible(addr, len); |