From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F0521381F3 for ; Wed, 24 Jul 2013 01:41:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0163CE09B2; Wed, 24 Jul 2013 01:41:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 728B6E09B2 for ; Wed, 24 Jul 2013 01:41:54 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6159533E753 for ; Wed, 24 Jul 2013 01:41:53 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 26BFC2171C; Wed, 24 Jul 2013 01:41:52 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog libcxx-9999.ebuild X-VCS-Directories: sys-libs/libcxx X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130724014152.26BFC2171C@flycatcher.gentoo.org> Date: Wed, 24 Jul 2013 01:41:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3dc75ddf-062a-4b7e-a53c-64e215a5807c X-Archives-Hash: 110979c39be029760ad7866b1f51c5d0 aballier 13/07/24 01:41:52 Modified: ChangeLog libcxx-9999.ebuild Log: provide cxxabi.h with libsupc++ too (Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A) Revision Changes Path 1.28 sys-libs/libcxx/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.28&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.28&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.27&r2=1.28 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ChangeLog 24 Jul 2013 01:05:39 -0000 1.27 +++ ChangeLog 24 Jul 2013 01:41:52 -0000 1.28 @@ -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.27 2013/07/24 01:05:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.28 2013/07/24 01:41:52 aballier Exp $ + + 24 Jul 2013; Alexis Ballier libcxx-9999.ebuild: + provide cxxabi.h with libsupc++ too 24 Jul 2013; Alexis Ballier libcxx-9999.ebuild: expose libcxxrt headers in the libcxx tree as upstream does 1.20 sys-libs/libcxx/libcxx-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.19&r2=1.20 Index: libcxx-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libcxx-9999.ebuild 24 Jul 2013 01:05:39 -0000 1.19 +++ libcxx-9999.ebuild 24 Jul 2013 01:41:52 -0000 1.20 @@ -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.19 2013/07/24 01:05:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.20 2013/07/24 01:41:52 aballier Exp $ EAPI=5 @@ -28,7 +28,7 @@ IUSE="elibc_glibc +libcxxrt static-libs test" RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?,${MULTILIB_USEDEP}] ) - !libcxxrt? ( sys-devel/gcc[cxx] )" + !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )" DEPEND="${RDEPEND} test? ( sys-devel/clang ) app-arch/xz-utils" @@ -49,9 +49,23 @@ else # Very hackish, see $HOMEPAGE # If someone has a clever idea, please share it! - local includes="$(echo | "$(tc-getCXX)" -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')" + 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' ' ')" append-cppflags -D__GLIBCXX__ ${includes} - LIBS="-lsupc++ ${LIBS}" + LIBS="${libdirs} -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="" + [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})" + for j in ${libcxx_gcc_dirs} ; do + if [ -f "${j}/${i}" ] ; then + cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die + found=yes + fi + done + [ -n "${found}" ] || die "Header not found: ${i}" + done fi tc-export AR CC CXX