summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/toolchain.eclass20
2 files changed, 15 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c9f578050779..7040d187cd69 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1391 2014/10/25 19:01:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1392 2014/10/26 17:39:52 ulm Exp $
+
+ 26 Oct 2014; Ulrich Müller <ulm@gentoo.org> toolchain.eclass:
+ [QA] Code from revisions 1.636 and 1.640 commented out. This causes several
+ file collisions, see bug 526144 and related bugs.
25 Oct 2014; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
Add kde-workspace 4.11.13 SRC_URI.
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ddd4e30b3f04..384edd3c155b 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -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/eclass/toolchain.eclass,v 1.643 2014/10/24 05:32:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.644 2014/10/26 17:39:52 ulm Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -910,15 +910,15 @@ toolchain_src_configure() {
confgcc+=( --enable-libstdcxx-time )
fi
- # Turn on the -Wl,--build-id flag by default for ELF targets. #525942
- # This helps with locating debug files.
- case ${CTARGET} in
- *-linux-*|*-elf|*-eabi)
- tc_version_is_at_least 4.5 && confgcc+=(
- --enable-linker-build-id
- )
- ;;
- esac
+ # # Turn on the -Wl,--build-id flag by default for ELF targets. #525942
+ # # This helps with locating debug files.
+ # case ${CTARGET} in
+ # *-linux-*|*-elf|*-eabi)
+ # tc_version_is_at_least 4.5 && confgcc+=(
+ # --enable-linker-build-id
+ # )
+ # ;;
+ # esac
# newer gcc versions like to bootstrap themselves with C++,
# so we need to manually disable it ourselves