Add patch to check for a few more GCC versions; thanks to Amir Aupov, Richard and...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index c0ab89588e74396ba319a4ae4b312412bc6b9f33..9170d8608db04c01c8e0e4a41582228a59cf105b 100644 (file)
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.40 2011/07/08 10:10:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.41 2011/08/16 09:33:41 flameeyes Exp $
+
+*clang-2.9-r1 (16 Aug 2011)
+
+  16 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> +clang-2.9-r1.ebuild,
+  +files/clang-2.9-gccversions.patch:
+  Add patch to check for a few more GCC versions; thanks to Amir Aupov, Richard
+  and Josh in bug #377949.
 
   08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> clang-2.8-r3.ebuild,
   clang-2.9.ebuild, clang-9999.ebuild:

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 022db71b36ed39155b228826e72cc960d9f7567c..248e972cdc473a6d9948f922669b08ed82de0ede 100644 (file)
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6 SHA1 351c1d2cf86b6da75a6ed19083d7a857333f007c SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a
 AUX clang-2.8-alignof.patch 11984 RMD160 3ddf038274481a325ced3a736a5109302d0c50b5 SHA1 7d040a7d2d54e64b85cd2ac188d151d8b89fc62a SHA256 2c1d648c64cc6582a00b0adbc5c65e3ac89a1bb1816e0691902866730a332fa2
 AUX clang-2.8-darwin-prefix.patch 4989 RMD160 e2c863f62b6f9ef3b26b9b2a41cfd9950fb174b4 SHA1 dfda0f3d1f9bac791ed7fb0c06d8c91e931a8fd5 SHA256 808d6d47b7eb133a4e1091bf24b64690fe14d3f5b66fec7a9ed3d91aeb1f03d7
 AUX clang-2.8-gcc-4.4.4.patch 710 RMD160 3d7246d1af95ab0a45035c9caede4844da33ef9e SHA1 72c9d2c1433623c3f6c7f5720b3dff46b190feea SHA256 ce722ffd0b2dfb8d1a36db3927238ebacd19469823fa84ca3e415ca7cfcb454d
 AUX clang-2.9-darwin-prefix.patch 5023 RMD160 eb394810701c92404312eb9366c4f6fb5c9a1e20 SHA1 a0c58d19df0eacb9bf915573973dae5771de8afd SHA256 12b49f753dbc22054906c8a4ab8ccb98b175a636226272bbcd49c298905836c7
+AUX clang-2.9-gccversions.patch 661 RMD160 7cdc194ccc202f84a62fea56e8d5de4aded793a5 SHA1 79ff1f652d4ded66c509676a6b35eab0a41db761 SHA256 cdfd4202f50fd4edad694269ee1af64db3452cb14a5926539eb93a4cfb3fad08
 DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1 94977c84ce136307dbbeade95e67bfe3c25161ff SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1
 DIST clang-2.9.tgz 6243772 RMD160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 SHA1 5fd3b5cec050ec12858c1602b23cf096282ad4a4 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 EBUILD clang-2.8-r3.ebuild 6703 RMD160 5d15d6b792f8c5207c2446c099be385686dca28d SHA1 8ffc1dabd746714c500aa0f429c9ed209a6b77ab SHA256 68a2bfedecadd38498631a5e4be8f5e098e7e518aec09f06af7f40cf26198d76
+EBUILD clang-2.9-r1.ebuild 6605 RMD160 79195fad712c066d8b3b803e8baa1f2b239df67c SHA1 46f9e2d9198995e18470b5f0da6eb7a1b355393c SHA256 af09147097e159b0238fdfc9521eed9e7641dcdc5c1f04c99b05e4f6cfec6b27
 EBUILD clang-2.9.ebuild 6509 RMD160 48b2ac1acbbd15be1eef910cfdc4becc62b0e031 SHA1 21d95c0451bb77fc01cd08f3a6c836b00dc59ac0 SHA256 2159a11c7a8deeb0bd75a7b768fed18fc2735627a00a7b191d2ba7b3454b5079
 EBUILD clang-9999.ebuild 6171 RMD160 9df8e1f13cf1c2d1e59ce41cfa6ac57bc33e7c11 SHA1 807cdb2fe181c46d22464acb0bf20ca32d9f54fd SHA256 ed8dbbbaa8af1fb0f09917a744ec7ed6b75d3c0b72fa7da1cbf374a9eb11d60d
-MISC ChangeLog 7273 RMD160 80580c1c096faf6e6eb1dcbde8f57e5b17256810 SHA1 82a3efccea486f4d0405206b7f37dc299cd7970b SHA256 be3774de34e84c312c5c8ee7593b81a85aef45c5713051c73a1dc35f4c2cdc95
+MISC ChangeLog 7526 RMD160 1479fd8ffbfb5cf1fa6e935bb468f490b04af2dd SHA1 deb1b73434f6ed8d6feaf95fd40dc343d07abc83 SHA256 d54d0da98f0592da1a5b5f27aafd1fdf725c8d15a940750f906ea64b7fc24fbc
 MISC metadata.xml 1360 RMD160 73b894c5108dd5d2d3b49f82353920da7f2adc4c SHA1 6808434002d0109de4ef8f52ad4a9cc4f4a2fbfc SHA256 14c80bf0afbebde4ec5bc2332865762d3dcd98db842cf52fc78617b4889dae38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4W12QACgkQXkR9YqOcLPETiwEApFcEKh+JTFBn7q2Kakd9hrPM
-uPn3v1cL/LEGJhQ3LjkBAIBnqauWLz3gCR0lBt4opJesdPlaYpLrKZV+jFuHv0Ho
-=hdte
+iEYEARECAAYFAk5KOXAACgkQAiZjviIA2XijGgCgoo8tK878nCX7aM1ihDWaGOJI
+ur8An3SIBBgtYcTGD4hWABpULQTjgMXb
+=Wywn
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/clang/clang-2.9-r1.ebuild b/sys-devel/clang/clang-2.9-r1.ebuild
new file mode 100644 (file)
index 0000000..01e877e
--- /dev/null
+++ b/sys-devel/clang/clang-2.9-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.9-r1.ebuild,v 1.1 2011/08/16 09:33:41 flameeyes Exp $
+
+EAPI=3
+
+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 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alltargets 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 )"
+RDEPEND="~sys-devel/llvm-${PV}[alltargets=]"
+
+S="${WORKDIR}/llvm-${PV}"
+
+src_prepare() {
+       mv "${WORKDIR}"/clang-${PV} "${S}"/tools/clang || die "clang source directory not found"
+
+       # Workaround GCC versions' list (bug #377949)
+       epatch "${FILESDIR}"/${P}-gccversions.patch
+
+       # Same as llvm doc patches
+       epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
+
+       # Fix toolchain lookup for Darwin/Prefix.
+       epatch "${FILESDIR}"/${PN}-2.9-darwin-prefix.patch
+       sed -e "s|@GENTOO_PORTAGE_CHOST_ARCH@|${CHOST%%-darwin*}-darwin|g" \
+               -e "s|@GENTOO_PORTAGE_CHOST@|${CHOST}|g" \
+               -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}|g" \
+               -i tools/clang/lib/Driver/ToolChains.cpp \
+               || die "fixing toolchain lookup"
+
+       # 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#${EPREFIX}/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 := '"${EPREFIX}"'/etc/llvm,' \
+               -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
+               -i Makefile.config.in || die "Makefile.config sed failed"
+
+       einfo "Fixing rpath"
+       sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+               -i Makefile.rules || die "rpath sed failed"
+}
+
+src_configure() {
+       local CONF_FLAGS="--enable-shared"
+
+       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
+
+       # Setup the search path to include the Prefix includes
+       if use prefix ; then
+               CONF_FLAGS="${CONF_FLAGS} \
+                       --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
+       fi
+
+       if use alltargets; then
+               CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+       else
+               CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+       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 gcc headers path
+               local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+               CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
+               CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/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
+               has test $FEATURES && die "Make test failed. See above for details."
+               has 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 "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+               }
+               python_execute_function install-scan-view
+       fi
+
+       # Fix install_names on Darwin.  The build system is too complicated
+       # to just fix this, so we correct it post-install
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               for lib in libclang.dylib ; do
+                       ebegin "fixing install_name of $lib"
+                       install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
+                               "${ED}"/usr/lib/llvm/${lib}
+                       eend $?
+               done
+               for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
+                       ebegin "fixing references in ${f##*/}"
+                       install_name_tool \
+                               -change "@rpath/libclang.dylib" \
+                                       "${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+                               -change "@executable_path/../lib/libLLVM-${PV}.dylib" \
+                                       "${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
+                               -change "${S}"/Release/lib/libclang.dylib \
+                                       "${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+                               "${ED}"/$f
+                       eend $?
+               done
+       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
+}

diff --git a/sys-devel/clang/files/clang-2.9-gccversions.patch b/sys-devel/clang/files/clang-2.9-gccversions.patch
new file mode 100644 (file)
index 0000000..775a9e6
--- /dev/null
+++ b/sys-devel/clang/files/clang-2.9-gccversions.patch
@@ -0,0 +1,12 @@
+--- a/llvm-2.9/tools/clang/lib/Driver/ToolChains.cpp   2011-08-10 15:05:32.969155113 -0400
++++ a/llvm-2.9/tools/clang/lib/Driver/ToolChains.cpp   2011-08-10 15:06:45.449159147 -0400
+@@ -1449,7 +1449,8 @@ 
+       GccTriple = "i586-suse-linux";
+   }
+ 
+-  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
++  const char* GccVersions[] = {"4.6.2", "4.6.1", "4.6", "4.5.3", "4.5.2",
++                               "4.5.1", "4.5", "4.4.6", "4.4.5", "4.4.4",
+                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
+                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
+                                "4.2"};