summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-07-29 11:48:31 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-07-29 11:48:31 +0000
commit1556c6dd4881c03b7f3a1bf35d3e91ecd25c7215 (patch)
tree623ea9384a527396a0a94d9964865923d13441ae /sci-misc/boinc
parentremove old versions (diff)
downloadgentoo-2-1556c6dd4881c03b7f3a1bf35d3e91ecd25c7215.tar.gz
gentoo-2-1556c6dd4881c03b7f3a1bf35d3e91ecd25c7215.tar.bz2
gentoo-2-1556c6dd4881c03b7f3a1bf35d3e91ecd25c7215.zip
Fix glibc-2.10 compilation issues. Per bug #276868. Thx to Joost Ruis for the patch.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'sci-misc/boinc')
-rw-r--r--sci-misc/boinc/ChangeLog7
-rw-r--r--sci-misc/boinc/boinc-6.4.5-r2.ebuild6
-rw-r--r--sci-misc/boinc/files/6.4.5-glibc210.patch13
3 files changed, 23 insertions, 3 deletions
diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 14f3c0cd38e6..ad4c3f8d54be 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-misc/boinc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.67 2009/07/24 10:58:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.68 2009/07/29 11:48:31 scarabeus Exp $
+
+ 29 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/6.4.5-glibc210.patch, boinc-6.4.5-r2.ebuild:
+ Fix glibc-2.10 compilation issues. Per bug #276868. Thx to Joost Ruis for
+ the patch.
24 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/boinc.init:
Remove bashism in initscript. Per bug #278811. Thanks to Michał Górny
diff --git a/sci-misc/boinc/boinc-6.4.5-r2.ebuild b/sci-misc/boinc/boinc-6.4.5-r2.ebuild
index 6222df1eb21a..275ed685aeb0 100644
--- a/sci-misc/boinc/boinc-6.4.5-r2.ebuild
+++ b/sci-misc/boinc/boinc-6.4.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.3 2009/05/29 16:42:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.4 2009/07/29 11:48:31 scarabeus Exp $
#
# Don't forget to keep things in sync with binary boinc package!
@@ -55,10 +55,12 @@ src_prepare() {
# RSA Security bug fix. Per bug #258011
# GCC 4.4 Compilation issue. Per bug #269618
# Fix stripping. Per bug #257297
+ # Fix glibc 2.10 compilation issues. Per bug #276868
epatch \
"${FILESDIR}"/${PV}-RSA_security.patch \
"${FILESDIR}"/${PV}-gcc44.patch \
- "${FILESDIR}"/${PV}-nostrip.patch
+ "${FILESDIR}"/${PV}-nostrip.patch \
+ "${FILESDIR}"/${PV}-glibc210.patch
}
src_configure() {
diff --git a/sci-misc/boinc/files/6.4.5-glibc210.patch b/sci-misc/boinc/files/6.4.5-glibc210.patch
new file mode 100644
index 000000000000..c1f11f653fc9
--- /dev/null
+++ b/sci-misc/boinc/files/6.4.5-glibc210.patch
@@ -0,0 +1,13 @@
+Index: lib/str_util.h
+===================================================================
+--- lib/str_util.h (revision 18304)
++++ lib/str_util.h (working copy)
+@@ -18,6 +18,8 @@
+ #ifndef STR_UTIL_H
+ #define STR_UTIL_H
+
++#include "config.h"
++
+ #include <cstdlib>
+ #include <ctime>
+ #include <cctype>