summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-07-30 15:53:07 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-07-30 15:53:07 +0000
commitb375bb6d7f35efbe1a6235680c279076e269d9a5 (patch)
tree5956cbb0a5ec62dbda2fe6288350297d80b2f45b /dev-libs
parentStable for amd64 wrt bug #518216 (diff)
downloadgentoo-2-b375bb6d7f35efbe1a6235680c279076e269d9a5.tar.gz
gentoo-2-b375bb6d7f35efbe1a6235680c279076e269d9a5.tar.bz2
gentoo-2-b375bb6d7f35efbe1a6235680c279076e269d9a5.zip
backport glibc-2.18 patch to stable candidate wrt #518544
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/boost/ChangeLog5
-rw-r--r--dev-libs/boost/boost-1.52.0-r7.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 51ae27c3a34c..9d40537a8a24 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.320 2014/07/29 20:06:14 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.321 2014/07/30 15:53:07 hasufell Exp $
+
+ 30 Jul 2014; Julian Ospald <hasufell@gentoo.org> boost-1.52.0-r7.ebuild:
+ backport glibc-2.18 patch to stable candidate wrt #518544
29 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> boost-1.52.0-r7.ebuild:
amd64 stable wrt bug #518488
diff --git a/dev-libs/boost/boost-1.52.0-r7.ebuild b/dev-libs/boost/boost-1.52.0-r7.ebuild
index a44316db376a..6546fbed3d27 100644
--- a/dev-libs/boost/boost-1.52.0-r7.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r7.ebuild,v 1.2 2014/07/29 20:06:14 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r7.ebuild,v 1.3 2014/07/30 15:53:07 hasufell Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -85,7 +85,9 @@ src_prepare() {
"${FILESDIR}/remove-toolset-1.48.0.patch" \
"${FILESDIR}/${PN}-1.52.0-tuple.patch" \
"${FILESDIR}/${P}-locale-utf.patch" \
- "${FILESDIR}/${PN}-1.52.0-threads.patch"
+ "${FILESDIR}/${PN}-1.52.0-threads.patch" \
+ "${FILESDIR}/${PN}-1.53.0-glibc-2.18-compat.patch" # bug 482372
+
# Avoid a patch for now
for file in libs/context/src/asm/*.S; do