[gentoo-commits] gentoo-x86 commit in sys-devel/clang: metadata.xml ChangeLog clang-2.7-r2.ebuild clang-9999.ebuild clang-2.7-r1.ebuild

[Bernard Cafarelli (voyageur)]

voyageur    10/07/27 13:06:47

  Modified:             metadata.xml ChangeLog clang-9999.ebuild
  Added:                clang-2.7-r2.ebuild
  Removed:              clang-2.7-r1.ebuild
  Log:
  Add a USE-flag for system CXX headers, fix for x86. llvm-gcc users should leave the flag off
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-devel/clang/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	5 Oct 2009 13:19:28 -0000	1.1
+++ metadata.xml	27 Jul 2010 13:06:47 -0000	1.2
@@ -30,5 +30,6 @@
 Conformance with C/C++/ObjC and their variants</longdescription>
 	<use>
 		<flag name='static-analyzer'>Install the Clang static analyzer</flag>
+		<flag name='system-cxx-headers'>By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones</flag>
 	</use>
 </pkgmetadata>



1.18                 sys-devel/clang/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	20 Jul 2010 09:35:43 -0000	1.17
+++ ChangeLog	27 Jul 2010 13:06:47 -0000	1.18
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.17 2010/07/20 09:35:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.18 2010/07/27 13:06:47 voyageur Exp $
+
+*clang-2.7-r2 (27 Jul 2010)
+
+  27 Jul 2010; Bernard Cafarelli <voyageur@g.o> -clang-2.7-r1.ebuild,
+  +clang-2.7-r2.ebuild, clang-9999.ebuild, metadata.xml:
+  Add a USE-flag for system CXX headers, fix for x86. llvm-gcc users should
+  leave the flag off
 
 *clang-2.7-r1 (20 Jul 2010)
 



1.4                  sys-devel/clang/clang-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?r1=1.3&r2=1.4

Index: clang-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clang-9999.ebuild	20 Jul 2010 09:35:43 -0000	1.3
+++ clang-9999.ebuild	27 Jul 2010 13:06:47 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.3 2010/07/20 09:35:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.4 2010/07/27 13:06:47 voyageur Exp $
 
 EAPI=2
 
@@ -83,12 +83,15 @@
 	# Skip llvm-gcc parts even if installed
 	CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"
 
-	# Try to get current C++ headers path
-	CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=$(gcc-config -X| cut -d: -f1)/include/g++-v4"
-	CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"
-	if has_multilib_profile; then
-		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
+	if use system-cxx-headers; then
+		# Try to get current C++ headers path
+		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=$(gcc-config -X| cut -d: -f1 | sed '/-v4$/! s,$,/include/g++-v4,')"
+		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"
+		if has_multilib_profile; then
+			CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
+		fi
 	fi
+
 	econf ${CONF_FLAGS} || die "econf failed"
 }
 
@@ -135,9 +138,15 @@
 
 pkg_postinst() {
 	python_mod_optimize clang
-	elog "C++ headers search path is hardcoded to the active gcc profile one"
-	elog "If you change the active gcc profile, or update gcc to a new version,"
-	elog "you will have to remerge this package to update the search path"
+	if use system-cxx-headers; then
+		elog "C++ headers search path is hardcoded to the active gcc profile one"
+		elog "If you change the active gcc profile, or update gcc to a new version,"
+		elog "you will have to remerge this package to update the search path"
+	else
+		elog "If clang++ fails to find C++ headers on your system,"
+		elog "you can remerge clang with USE=system-cxx-headers to use C++ headers"
+		elog "from the active gcc profile"
+	fi
 }
 
 pkg_postrm() {



1.1                  sys-devel/clang/clang-2.7-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild?rev=1.1&content-type=text/plain

Index: clang-2.7-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild,v 1.1 2010/07/27 13:06:47 voyageur Exp $

EAPI=2

RESTRICT_PYTHON_ABIS="3.*"
SUPPORT_PYTHON_ABIS="1"

inherit eutils multilib python

DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="http://clang.llvm.org/"
# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tgz
	http://llvm.org/releases/${PV}/${P}.tgz"

LICENSE="UoI-NCSA"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug +static-analyzer system-cxx-headers test"

# Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html
DEPEND="static-analyzer? ( dev-lang/perl )
	test? ( dev-util/dejagnu )"
RDEPEND="~sys-devel/llvm-${PV}"

S="${WORKDIR}/llvm-2.7"

src_prepare() {
	mv "${WORKDIR}"/clang-2.7 "${S}"/tools/clang || die "clang source directory not found"

	# Same as llvm doc patches
	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 the static analyzer for in-tree install
	sed -e 's/import ScanView/from clang \0/'  \
		-i tools/clang/tools/scan-view/scan-view \
		|| die "scan-view sed failed"
	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#/usr/share/${PN}#" \
		-i tools/clang/tools/scan-build/scan-build \
		|| die "scan-build sed failed"
	# Specify python version
	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view

	# From llvm src_prepare
	einfo "Fixing install dirs"
	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
		-e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \
		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \
		-i Makefile.config.in || die "Makefile.config sed failed"

	einfo "Fixing rpath"
	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules \
		|| die "rpath sed failed"
}

src_configure() {
	local CONF_FLAGS=""

	if use debug; then
		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
	else
		CONF_FLAGS="${CONF_FLAGS} \
			--enable-optimized \
			--disable-assertions \
			--disable-expensive-checks"
	fi

	if use amd64; then
		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
	fi

	# Skip llvm-gcc parts even if installed
	CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"

	if use system-cxx-headers; then
		# Try to get current C++ headers path
		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=$(gcc-config -X| cut -d: -f1 | sed '/-v4$/! s,$,/include/g++-v4,')"
		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"
		if has_multilib_profile; then
			CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
		fi
	fi

	econf ${CONF_FLAGS} || die "econf failed"
}

src_compile() {
	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed"
}

src_test() {
	cd "${S}"/test || die "cd failed"
	emake site.exp || die "updating llvm site.exp failed"

	cd "${S}"/tools/clang || die "cd clang failed"

	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
	if ! emake -j1 VERBOSE=1 test; then
		hasq test $FEATURES && die "Make test failed. See above for details."
		hasq test $FEATURES || eerror "Make test failed. See above for details."
	fi
}

src_install() {
	cd "${S}"/tools/clang || die "cd clang failed"
	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"

	if use static-analyzer ; then
		dobin tools/scan-build/ccc-analyzer
		dosym ccc-analyzer /usr/bin/c++-analyzer
		dobin tools/scan-build/scan-build

		insinto /usr/share/${PN}
		doins tools/scan-build/scanview.css
		doins tools/scan-build/sorttable.js

		cd tools/scan-view || die "cd scan-view failed"
		dobin scan-view
		install-scan-view() {
			insinto "$(python_get_sitedir)"/clang
			doins Reporter.py Resources ScanView.py startfile.py
			touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py
		}
		python_execute_function install-scan-view
	fi
}

pkg_postinst() {
	python_mod_optimize clang
	if use system-cxx-headers; then
		elog "C++ headers search path is hardcoded to the active gcc profile one"
		elog "If you change the active gcc profile, or update gcc to a new version,"
		elog "you will have to remerge this package to update the search path"
	else
		elog "If clang++ fails to find C++ headers on your system,"
		elog "you can remerge clang with USE=system-cxx-headers to use C++ headers"
		elog "from the active gcc profile"
	fi
}

pkg_postrm() {
	python_mod_cleanup clang
}