summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-24 01:44:58 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-24 01:44:58 +0000
commite2534241887805436f636fa8fbbcede9e13ae14c (patch)
tree85820ca65d5967b66bce4ef8a07c133dbfa95931 /sys-libs
parentFix building against sys-libs/ncurses[tinfo] (bug #461240). (diff)
downloadgentoo-2-e2534241887805436f636fa8fbbcede9e13ae14c.tar.gz
gentoo-2-e2534241887805436f636fa8fbbcede9e13ae14c.tar.bz2
gentoo-2-e2534241887805436f636fa8fbbcede9e13ae14c.zip
remove useless code from previous commit
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libcxx/ChangeLog5
-rw-r--r--sys-libs/libcxx/libcxx-9999.ebuild7
2 files changed, 7 insertions, 5 deletions
diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog
index b6a7c3169e35..3fae573a660f 100644
--- a/sys-libs/libcxx/ChangeLog
+++ b/sys-libs/libcxx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.28 2013/07/24 01:41:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.29 2013/07/24 01:44:58 aballier Exp $
+
+ 24 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ remove useless code from previous commit
24 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
provide cxxabi.h with libsupc++ too
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index b9deec8d8083..7f261c9a687b 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.20 2013/07/24 01:41:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.21 2013/07/24 01:44:58 aballier Exp $
EAPI=5
@@ -50,10 +50,9 @@ src_configure() {
# Very hackish, see $HOMEPAGE
# If someone has a clever idea, please share it!
local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
- local libdirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-L/' | tr '\n' ' ')"
- export libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
+ local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="${libdirs} -lsupc++ ${LIBS}"
+ LIBS="-lsupc++ ${LIBS}"
local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
for i in ${libsupcxx_includes} ; do
local found=""