mgorny 14/04/28 17:51:17
Modified: llvm-3.4-r1.ebuild llvm-9999.ebuild
llvm-3.3-r3.ebuild llvm-3.4.ebuild
llvm-3.4-r2.ebuild ChangeLog
Log:
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!)
Revision Changes Path
1.2 sys-devel/llvm/llvm-3.4-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild?r1=1.1&r2=1.2
Index: llvm-3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- llvm-3.4-r1.ebuild 2 Apr 2014 23:24:29 -0000 1.1
+++ llvm-3.4-r1.ebuild 28 Apr 2014 17:51:17 -0000 1.2
@@ -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 @@
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 @@
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 @@
ECONF_SOURCE=${S} \
econf "${conf_flags[@]}"
- multilib_build_binaries && cmake_configure
+ multilib_is_native_abi && cmake_configure
}
cmake_configure() {
@@ -289,7 +289,7 @@
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 @@
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 @@
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
1.86 sys-devel/llvm/llvm-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.86&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.86&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.85&r2=1.86
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- llvm-9999.ebuild 14 Apr 2014 21:01:56 -0000 1.85
+++ llvm-9999.ebuild 28 Apr 2014 17:51:17 -0000 1.86
@@ -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 @@
)
# 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 @@
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 @@
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 @@
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 @@
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
1.9 sys-devel/llvm/llvm-3.3-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild?r1=1.8&r2=1.9
Index: llvm-3.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- llvm-3.3-r3.ebuild 31 Mar 2014 21:21:24 -0000 1.8
+++ llvm-3.3-r3.ebuild 28 Apr 2014 17:51:17 -0000 1.9
@@ -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 @@
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 @@
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 @@
ECONF_SOURCE=${S} \
econf "${conf_flags[@]}"
- multilib_build_binaries && cmake_configure
+ multilib_is_native_abi && cmake_configure
}
cmake_configure() {
@@ -292,7 +292,7 @@
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 @@
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 @@
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
1.11 sys-devel/llvm/llvm-3.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild?r1=1.10&r2=1.11
Index: llvm-3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- llvm-3.4.ebuild 1 Apr 2014 17:24:02 -0000 1.10
+++ llvm-3.4.ebuild 28 Apr 2014 17:51:17 -0000 1.11
@@ -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 @@
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 @@
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 @@
ECONF_SOURCE=${S} \
econf "${conf_flags[@]}"
- multilib_build_binaries && cmake_configure
+ multilib_is_native_abi && cmake_configure
}
cmake_configure() {
@@ -293,7 +293,7 @@
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 @@
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 @@
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
1.3 sys-devel/llvm/llvm-3.4-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild?r1=1.2&r2=1.3
Index: llvm-3.4-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- llvm-3.4-r2.ebuild 14 Apr 2014 21:01:56 -0000 1.2
+++ llvm-3.4-r2.ebuild 28 Apr 2014 17:51:17 -0000 1.3
@@ -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 @@
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 @@
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 @@
ECONF_SOURCE=${S} \
econf "${conf_flags[@]}"
- multilib_build_binaries && cmake_configure
+ multilib_is_native_abi && cmake_configure
}
cmake_configure() {
@@ -298,7 +298,7 @@
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 @@
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 @@
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
1.191 sys-devel/llvm/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.191&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.191&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.190&r2=1.191
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog 14 Apr 2014 21:01:56 -0000 1.190
+++ ChangeLog 28 Apr 2014 17:51:17 -0000 1.191
@@ -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 <[email protected]> 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 <[email protected]> llvm-3.4-r2.ebuild,
llvm-9999.ebuild:
