diff options
| -rw-r--r-- | sys-devel/clang/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/clang/clang-3.3_rc3.ebuild | 16 | ||||
| -rw-r--r-- | sys-devel/clang/clang-9999.ebuild | 17 |
3 files changed, 26 insertions, 13 deletions
diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog index dc2af7a47184..591ddbd40187 100644 --- a/sys-devel/clang/ChangeLog +++ b/sys-devel/clang/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/clang # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.88 2013/06/13 21:23:28 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.89 2013/06/17 14:04:31 voyageur Exp $ + + 17 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org> clang-3.3_rc3.ebuild, + clang-9999.ebuild: + Use clang resource dir configuration option, fixes #417595 13 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org> clang-3.3_rc3.ebuild, clang-9999.ebuild: diff --git a/sys-devel/clang/clang-3.3_rc3.ebuild b/sys-devel/clang/clang-3.3_rc3.ebuild index c08b9aae137e..32abc77f15e3 100644 --- a/sys-devel/clang/clang-3.3_rc3.ebuild +++ b/sys-devel/clang/clang-3.3_rc3.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-devel/clang/clang-3.3_rc3.ebuild,v 1.2 2013/06/13 21:23:28 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.3_rc3.ebuild,v 1.3 2013/06/17 14:04:31 voyageur Exp $ EAPI=5 @@ -39,12 +39,15 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch # multilib-strict - sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ + sed -e "/PROJ_headers\|HeaderDir/s#lib/clang#$(get_libdir)/clang#" \ -i tools/clang/lib/Headers/Makefile \ - || die "clang Makefile failed" - sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \ + || die "clang Makefile sed failed" + sed -e "/PROJ_resources\|ResourceDir/s#lib/clang#$(get_libdir)/clang#" \ -i tools/clang/runtime/compiler-rt/Makefile \ - || die "compiler-rt Makefile failed" + || die "compiler-rt Makefile sed failed" + sed -e "s#/lib/#/lib{{(32|64)?}}/#" \ + -i tools/clang/test/Preprocessor/iwithprefix.c \ + || die "clang test sed failed" # fix the static analyzer for in-tree install sed -e 's/import ScanView/from clang \0/' \ -i tools/clang/tools/scan-view/scan-view \ @@ -93,7 +96,8 @@ src_configure() { --with-optimize-option= $(use_enable !debug optimized) $(use_enable debug assertions) - $(use_enable debug expensive-checks)" + $(use_enable debug expensive-checks) + --with-clang-resource-dir=../$(get_libdir)/clang/${PV/_rc*}" # Setup the search path to include the Prefix includes if use prefix ; then diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 2a7fc56be102..218793708667 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-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-devel/clang/clang-9999.ebuild,v 1.36 2013/06/13 21:23:28 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.37 2013/06/17 14:04:31 voyageur Exp $ EAPI=5 @@ -37,12 +37,15 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch # multilib-strict - sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ + sed -e "/PROJ_headers\|HeaderDir/s#lib/clang#$(get_libdir)/clang#" \ -i tools/clang/lib/Headers/Makefile \ - || die "clang Makefile failed" - sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \ + || die "clang Makefile sed failed" + sed -e "/PROJ_resources\|ResourceDir/s#lib/clang#$(get_libdir)/clang#" \ -i tools/clang/runtime/compiler-rt/Makefile \ - || die "compiler-rt Makefile failed" + || die "compiler-rt Makefile sed failed" + sed -e "s#/lib/#/lib{{(32|64)?}}/#" \ + -i tools/clang/test/Preprocessor/iwithprefix.c \ + || die "clang test sed failed" # fix the static analyzer for in-tree install sed -e 's/import ScanView/from clang \0/' \ -i tools/clang/tools/scan-view/scan-view \ @@ -77,11 +80,13 @@ src_prepare() { } src_configure() { + # Update resource dir version after first RC local CONF_FLAGS="--enable-shared --with-optimize-option= $(use_enable !debug optimized) $(use_enable debug assertions) - $(use_enable debug expensive-checks)" + $(use_enable debug expensive-checks) + --with-clang-resource-dir=../$(get_libdir)/clang/3.4" # Setup the search path to include the Prefix includes if use prefix ; then |