voyageur 15/06/11 17:05:20 Modified: ChangeLog llvm-9999.ebuild Log: Documentation build can be made optional again, add back pax markings (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)
Revision Changes Path 1.247 sys-devel/llvm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.247&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.247&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.246&r2=1.247 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- ChangeLog 9 Jun 2015 21:17:33 -0000 1.246 +++ ChangeLog 11 Jun 2015 17:05:20 -0000 1.247 @@ -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.246 2015/06/09 21:17:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.247 2015/06/11 17:05:20 voyageur Exp $ + + 11 Jun 2015; Bernard Cafarelli <[email protected]> llvm-9999.ebuild: + Documentation build can be made optional again, add back pax markings 09 Jun 2015; Michał Górny <[email protected]> llvm-9999.ebuild: Enable EH & RTTI for better compatibility 1.113 sys-devel/llvm/llvm-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.113&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.113&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.112&r2=1.113 Index: llvm-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- llvm-9999.ebuild 9 Jun 2015 21:17:33 -0000 1.112 +++ llvm-9999.ebuild 11 Jun 2015 17:05:20 -0000 1.113 @@ -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.112 2015/06/09 21:17:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.113 2015/06/11 17:05:20 voyageur Exp $ EAPI=5 @@ -43,7 +43,6 @@ # configparser-3.2 breaks the build (3.3 or none at all are fine) DEPEND="${COMMON_DEPEND} dev-lang/perl - dev-python/sphinx >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d @@ -53,6 +52,7 @@ || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) + doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 ${PYTHON_DEPS}" @@ -243,11 +243,10 @@ if multilib_is_native_abi; then mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON + $(cmake-utils_use doc LLVM_BUILD_DOCS) + $(cmake-utils_use doc LLVM_ENABLE_SPHINX) + $(cmake-utils_use doc SPHINX_OUTPUT_HTML) -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_ENABLE_SPHINX=ON - -DSPHINX_OUTPUT_HTML=$(usex doc) - -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html" ) @@ -296,6 +295,10 @@ multilib_src_compile() { cmake-utils_src_compile + pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld + pax-mark m "${BUILD_DIR}"/bin/lli + pax-mark m "${BUILD_DIR}"/bin/lli-child-target + if use test; then pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests @@ -340,7 +343,6 @@ ) fi - multilib-minimal_src_install }
