diff options
author | 2014-04-28 17:51:17 +0000 | |
---|---|---|
committer | 2014-04-28 17:51:17 +0000 | |
commit | a7a5aa76958904104fe4b869788b3db73c3d2b3c (patch) | |
tree | 2dce21c04d1ce3ea1511bb44e820da266e99bd10 /sys-devel | |
parent | Replace multilib_build_binaries with multilib_is_native_abi, in order to put ... (diff) | |
download | gentoo-2-a7a5aa76958904104fe4b869788b3db73c3d2b3c.tar.gz gentoo-2-a7a5aa76958904104fe4b869788b3db73c3d2b3c.tar.bz2 gentoo-2-a7a5aa76958904104fe4b869788b3db73c3d2b3c.zip |
Replace multilib_build_binaries with multilib_is_native_abi, in order to put an end to the confusion introduced by having two functions, the proper one suggesting it is just for binaries.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/llvm/ChangeLog | 8 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-3.3-r3.ebuild | 14 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-3.4-r1.ebuild | 14 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-3.4-r2.ebuild | 14 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-3.4.ebuild | 14 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 12 |
6 files changed, 41 insertions, 35 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 2c34e366a255..ed66a2012266 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.190 2014/04/14 21:01:56 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.191 2014/04/28 17:51:17 mgorny Exp $ + + 28 Apr 2014; Michał Górny <mgorny@gentoo.org> llvm-3.3-r3.ebuild, + llvm-3.4-r1.ebuild, llvm-3.4-r2.ebuild, llvm-3.4.ebuild, llvm-9999.ebuild: + Replace multilib_build_binaries with multilib_is_native_abi, in order to put + an end to the confusion introduced by having two functions, the proper one + suggesting it is just for binaries. 14 Apr 2014; Christoph Junghans <ottxor@gentoo.org> llvm-3.4-r2.ebuild, llvm-9999.ebuild: diff --git a/sys-devel/llvm/llvm-3.3-r3.ebuild b/sys-devel/llvm/llvm-3.3-r3.ebuild index f9b99fdc86bd..2cd4acf3288a 100644 --- a/sys-devel/llvm/llvm-3.3-r3.ebuild +++ b/sys-devel/llvm/llvm-3.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v 1.8 2014/03/31 21:21:24 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v 1.9 2014/04/28 17:51:17 mgorny Exp $ EAPI=5 @@ -213,7 +213,7 @@ multilib_src_configure() { conf_flags+=( --with-clang-resource-dir=../lib/clang/${PV} ) fi # well, it's used only by clang executable c-index-test - if multilib_build_binaries && use clang && use xml; then + if multilib_is_native_abi && use clang && use xml; then conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" ) else conf_flags+=( ac_cv_prog_XML2CONFIG="" ) @@ -231,7 +231,7 @@ multilib_src_configure() { conf_flags+=( --enable-experimental-targets=R600 ) fi - if multilib_build_binaries; then + if multilib_is_native_abi; then use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ ) # extra commas don't hurt use ocaml && bindings+=',ocaml' @@ -258,7 +258,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf "${conf_flags[@]}" - multilib_build_binaries && cmake_configure + multilib_is_native_abi && cmake_configure } cmake_configure() { @@ -292,7 +292,7 @@ set_makeargs() { local tools=( llvm-config ) use clang && tools+=( clang ) - if multilib_build_binaries; then + if multilib_is_native_abi; then tools+=( opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump @@ -323,7 +323,7 @@ multilib_src_compile() { set_makeargs -1 emake "${MAKEARGS[@]}" - if multilib_build_binaries; then + if multilib_is_native_abi; then set_makeargs emake -C tools "${MAKEARGS[@]}" @@ -385,7 +385,7 @@ multilib_src_install() { dodir /tmp mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then # Drop all the executables since LLVM doesn't like to # clobber when installing. rm -r "${ED}"/usr/bin || die diff --git a/sys-devel/llvm/llvm-3.4-r1.ebuild b/sys-devel/llvm/llvm-3.4-r1.ebuild index 0c86e8001301..de4f8fe49214 100644 --- a/sys-devel/llvm/llvm-3.4-r1.ebuild +++ b/sys-devel/llvm/llvm-3.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild,v 1.1 2014/04/02 23:24:29 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild,v 1.2 2014/04/28 17:51:17 mgorny Exp $ EAPI=5 @@ -214,7 +214,7 @@ multilib_src_configure() { conf_flags+=( --with-clang-resource-dir=../lib/clang/${PV} ) fi # well, it's used only by clang executable c-index-test - if multilib_build_binaries && use clang && use xml; then + if multilib_is_native_abi && use clang && use xml; then conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" ) else conf_flags+=( ac_cv_prog_XML2CONFIG="" ) @@ -229,7 +229,7 @@ multilib_src_configure() { fi conf_flags+=( --enable-targets=${targets} ) - if multilib_build_binaries; then + if multilib_is_native_abi; then use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ ) # extra commas don't hurt use ocaml && bindings+=',ocaml' @@ -256,7 +256,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf "${conf_flags[@]}" - multilib_build_binaries && cmake_configure + multilib_is_native_abi && cmake_configure } cmake_configure() { @@ -289,7 +289,7 @@ set_makeargs() { local tools=( llvm-config ) use clang && tools+=( clang ) - if multilib_build_binaries; then + if multilib_is_native_abi; then tools+=( opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump @@ -329,7 +329,7 @@ multilib_src_compile() { set_makeargs -1 emake "${MAKEARGS[@]}" - if multilib_build_binaries; then + if multilib_is_native_abi; then set_makeargs emake -C tools "${MAKEARGS[@]}" @@ -393,7 +393,7 @@ multilib_src_install() { dodir /tmp mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then # Drop all the executables since LLVM doesn't like to # clobber when installing. rm -r "${ED}"/usr/bin || die diff --git a/sys-devel/llvm/llvm-3.4-r2.ebuild b/sys-devel/llvm/llvm-3.4-r2.ebuild index b33ea40f82a4..ac1a71d74deb 100644 --- a/sys-devel/llvm/llvm-3.4-r2.ebuild +++ b/sys-devel/llvm/llvm-3.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v 1.2 2014/04/14 21:01:56 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v 1.3 2014/04/28 17:51:17 mgorny Exp $ EAPI=5 @@ -223,7 +223,7 @@ multilib_src_configure() { conf_flags+=( --with-clang-resource-dir=../lib/clang/${PV} ) fi # well, it's used only by clang executable c-index-test - if multilib_build_binaries && use clang && use xml; then + if multilib_is_native_abi && use clang && use xml; then conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" ) else conf_flags+=( ac_cv_prog_XML2CONFIG="" ) @@ -238,7 +238,7 @@ multilib_src_configure() { fi conf_flags+=( --enable-targets=${targets} ) - if multilib_build_binaries; then + if multilib_is_native_abi; then use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ ) # extra commas don't hurt use ocaml && bindings+=',ocaml' @@ -265,7 +265,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf "${conf_flags[@]}" - multilib_build_binaries && cmake_configure + multilib_is_native_abi && cmake_configure } cmake_configure() { @@ -298,7 +298,7 @@ set_makeargs() { local tools=( llvm-config ) use clang && tools+=( clang ) - if multilib_build_binaries; then + if multilib_is_native_abi; then tools+=( opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump @@ -338,7 +338,7 @@ multilib_src_compile() { set_makeargs -1 emake "${MAKEARGS[@]}" - if multilib_build_binaries; then + if multilib_is_native_abi; then set_makeargs emake -C tools "${MAKEARGS[@]}" @@ -401,7 +401,7 @@ multilib_src_install() { emake "${MAKEARGS[@]}" DESTDIR="${root}" install multibuild_merge_root "${root}" "${D}" - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then # Backwards compat, will be happily removed someday. dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI} else diff --git a/sys-devel/llvm/llvm-3.4.ebuild b/sys-devel/llvm/llvm-3.4.ebuild index 025285615d0c..709b79a4ba05 100644 --- a/sys-devel/llvm/llvm-3.4.ebuild +++ b/sys-devel/llvm/llvm-3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.10 2014/04/01 17:24:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.11 2014/04/28 17:51:17 mgorny Exp $ EAPI=5 @@ -218,7 +218,7 @@ multilib_src_configure() { conf_flags+=( --with-clang-resource-dir=../lib/clang/${PV} ) fi # well, it's used only by clang executable c-index-test - if multilib_build_binaries && use clang && use xml; then + if multilib_is_native_abi && use clang && use xml; then conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" ) else conf_flags+=( ac_cv_prog_XML2CONFIG="" ) @@ -233,7 +233,7 @@ multilib_src_configure() { fi conf_flags+=( --enable-targets=${targets} ) - if multilib_build_binaries; then + if multilib_is_native_abi; then use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ ) # extra commas don't hurt use ocaml && bindings+=',ocaml' @@ -260,7 +260,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf "${conf_flags[@]}" - multilib_build_binaries && cmake_configure + multilib_is_native_abi && cmake_configure } cmake_configure() { @@ -293,7 +293,7 @@ set_makeargs() { local tools=( llvm-config ) use clang && tools+=( clang ) - if multilib_build_binaries; then + if multilib_is_native_abi; then tools+=( opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump @@ -333,7 +333,7 @@ multilib_src_compile() { set_makeargs -1 emake "${MAKEARGS[@]}" - if multilib_build_binaries; then + if multilib_is_native_abi; then set_makeargs emake -C tools "${MAKEARGS[@]}" @@ -396,7 +396,7 @@ multilib_src_install() { emake "${MAKEARGS[@]}" DESTDIR="${root}" install multibuild_merge_root "${root}" "${D}" - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then # Backwards compat, will be happily removed someday. dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI} else diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 8a1b05bf50f2..1bd1c811cf40 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.85 2014/04/14 21:01:56 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.86 2014/04/28 17:51:17 mgorny Exp $ EAPI=5 @@ -212,7 +212,7 @@ multilib_src_configure() { ) # well, it's used only by clang executable c-index-test - if multilib_build_binaries && use clang && use xml; then + if multilib_is_native_abi && use clang && use xml; then conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" ) else conf_flags+=( ac_cv_prog_XML2CONFIG="" ) @@ -227,7 +227,7 @@ multilib_src_configure() { fi conf_flags+=( --enable-targets=${targets} ) - if multilib_build_binaries; then + if multilib_is_native_abi; then use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ ) # extra commas don't hurt use ocaml && bindings+=',ocaml' @@ -268,7 +268,7 @@ set_makeargs() { local tools=( llvm-config ) use clang && tools+=( clang ) - if multilib_build_binaries; then + if multilib_is_native_abi; then tools+=( opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump @@ -308,7 +308,7 @@ multilib_src_compile() { set_makeargs -1 emake "${MAKEARGS[@]}" - if multilib_build_binaries; then + if multilib_is_native_abi; then set_makeargs emake -C tools "${MAKEARGS[@]}" @@ -366,7 +366,7 @@ multilib_src_install() { emake "${MAKEARGS[@]}" DESTDIR="${root}" install multibuild_merge_root "${root}" "${D}" - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then # Backwards compat, will be happily removed someday. dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI} else |