summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-06-13 12:10:52 +0000
committerMichał Górny <mgorny@gentoo.org>2015-06-13 12:10:52 +0000
commit5b948ae883d7193a064a5e775e24d11b82d30cc0 (patch)
treefa3d6e826e9cb192909cc3bd990f10e4a394fd39 /sys-devel
parentStable for ppc and ppc64. Bug #551832. (diff)
downloadgentoo-2-5b948ae883d7193a064a5e775e24d11b82d30cc0.tar.gz
gentoo-2-5b948ae883d7193a064a5e775e24d11b82d30cc0.tar.bz2
gentoo-2-5b948ae883d7193a064a5e775e24d11b82d30cc0.zip
Simplify doc CMake code
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/llvm/ChangeLog5
-rw-r--r--sys-devel/llvm/llvm-9999.ebuild7
2 files changed, 7 insertions, 5 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 6a663ef76dfb..e1e3906a7990 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.248 2015/06/13 12:00:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.249 2015/06/13 12:10:52 mgorny Exp $
+
+ 13 Jun 2015; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+ Simplify doc CMake code
13 Jun 2015; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
Rename R600 -> AMDGPU following upstream. Reported by darkbasic.
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 891243271cd2..ef7446674c2b 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.114 2015/06/13 12:00:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.115 2015/06/13 12:10:52 mgorny Exp $
EAPI=5
@@ -243,9 +243,8 @@ multilib_src_configure() {
if multilib_is_native_abi; then
mycmakeargs+=(
- $(cmake-utils_use doc LLVM_BUILD_DOCS)
- $(cmake-utils_use doc LLVM_ENABLE_SPHINX)
- $(cmake-utils_use doc SPHINX_OUTPUT_HTML)
+ -DLLVM_BUILD_DOCS=$(usex doc)
+ -DLLVM_ENABLE_SPHINX=$(usex doc)
-DLLVM_ENABLE_DOXYGEN=OFF
-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
)