mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Merge updates from master
This commit is contained in:
@@ -60,7 +60,7 @@ PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.2-backport-pr30.patch
|
||||
"${FILESDIR}"/${PN}-2.2-make-4.4.patch
|
||||
"${FILESDIR}"/${PN}-2.2-backport-pr66.patch
|
||||
"${FILESDIR}"/${PN}-2.2-remote-const-cast.patch
|
||||
"${FILESDIR}"/${PN}-2.2-remove-const-cast.patch
|
||||
)
|
||||
|
||||
get_audio() {
|
||||
|
||||
@@ -68,7 +68,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -68,7 +68,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
|
||||
lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) )
|
||||
!system-llvm? (
|
||||
>=dev-build/cmake-3.13.4
|
||||
app-alternatives/ninja
|
||||
|
||||
@@ -24,7 +24,7 @@ inherit toolchain-funcs
|
||||
# @DESCRIPTION:
|
||||
# Return all the flag variables that our high level functions operate on.
|
||||
all-flag-vars() {
|
||||
echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
|
||||
echo {ADA,C,CPP,CXX,CCAS,F,FC,GDC,LD}FLAGS
|
||||
}
|
||||
|
||||
# @FUNCTION: setup-allowed-flags
|
||||
|
||||
Reference in New Issue
Block a user