diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2012-01-26 00:42:51 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-01-26 00:42:51 +0000 |
| commit | 48f26540aeaf817841ecd184a6ca548ab6d86f4e (patch) | |
| tree | 74dc26f53ea47ebf5d3fabd20e3e31d800cb2fe1 /sys-devel/clang | |
| parent | Restore patch with keyword substitution disabled. (diff) | |
| download | gentoo-2-48f26540aeaf817841ecd184a6ca548ab6d86f4e.tar.gz gentoo-2-48f26540aeaf817841ecd184a6ca548ab6d86f4e.tar.bz2 gentoo-2-48f26540aeaf817841ecd184a6ca548ab6d86f4e.zip | |
Update live ebuild
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/clang')
| -rw-r--r-- | sys-devel/clang/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/clang/clang-9999.ebuild | 6 | ||||
| -rw-r--r-- | sys-devel/clang/files/clang-3.1-fix_cxx_include_root.patch | 21 |
3 files changed, 29 insertions, 4 deletions
diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog index 00b7f3c5b062..314160e7a0b3 100644 --- a/sys-devel/clang/ChangeLog +++ b/sys-devel/clang/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/clang # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.50 2012/01/13 22:25:18 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.51 2012/01/26 00:42:51 lu_zero Exp $ + + 25 Jan 2012; Luca Barbato <lu_zero@gentoo.org> + +files/clang-3.1-fix_cxx_include_root.patch, clang-9999.ebuild: + Update live ebuild *clang-3.0-r1 (13 Jan 2012) diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 32c95d035461..49770bc70e4e 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.21 2012/01/13 22:25:18 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.22 2012/01/26 00:42:51 lu_zero Exp $ EAPI=3 @@ -32,14 +32,14 @@ src_unpack() { src_prepare() { # Same as llvm doc patches - epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch +# epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch # multilib-strict sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ -i tools/clang/lib/Headers/Makefile \ || die "clang Makefile failed" # Fix cxx_include_root path for Gentoo - epatch "${FILESDIR}"/${PN}-3.0-fix_cxx_include_root.patch + epatch "${FILESDIR}"/${PN}-3.1-fix_cxx_include_root.patch # fix the static analyzer for in-tree install sed -e 's/import ScanView/from clang \0/' \ -i tools/clang/tools/scan-view/scan-view \ diff --git a/sys-devel/clang/files/clang-3.1-fix_cxx_include_root.patch b/sys-devel/clang/files/clang-3.1-fix_cxx_include_root.patch new file mode 100644 index 000000000000..e7c52515c834 --- /dev/null +++ b/sys-devel/clang/files/clang-3.1-fix_cxx_include_root.patch @@ -0,0 +1,21 @@ +Bug #387309 + +--- llvm/tools/clang/lib/Driver/ToolChains.cpp.orig 2011-11-09 23:10:04.000000000 +0100 ++++ llvm/tools/clang/lib/Driver/ToolChains.cpp 2011-11-09 23:11:04.000000000 +0100 +@@ -1586,12 +1586,13 @@ + // This is of the form /foo/bar/include/c++/4.5.2/ + if (CxxIncludeRoot.back() == '/') + llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the / ++ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the g++-v4 ++ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include + StringRef Version = llvm::sys::path::filename(CxxIncludeRoot); + llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the version +- llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the c++ +- llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include ++ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the ARCH + GCCInstallPath = CxxIncludeRoot.str(); +- GCCInstallPath.append("/lib/gcc/"); ++ GCCInstallPath.append("/"); + GCCInstallPath.append(CXX_INCLUDE_ARCH); + GCCInstallPath.append("/"); + GCCInstallPath.append(Version); |