diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-17 22:49:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-17 22:49:47 +0100 |
| commit | 30c53e395853f5bfe805a1e429fcf26666eed8f8 (patch) | |
| tree | a0670eaf9babda7b83503f7d36806a944bb49752 /eclass | |
| parent | d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (diff) | |
gentoo resync : 17.05.2018
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39208 -> 39208 bytes | |||
| -rw-r--r-- | eclass/autotools.eclass | 13 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 11 |
3 files changed, 21 insertions, 3 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex b9f5663da5c3..d8d80f9d9ec2 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index ea85e73a8042..2bc70f7b3c00 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -442,10 +442,17 @@ autotools_env_setup() { if [[ ${WANT_AUTOMAKE} == "latest" ]]; then local pv for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do - # has_version respects ROOT, but in this case, we don't want it to, - # thus "ROOT=/" prefix; # Break on first hit to respect _LATEST_AUTOMAKE order. - ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break + local hv_args="" + case ${EAPI:-0} in + 5|6) + hv_args="--host-root" + ;; + 7) + hv_args="-b" + ;; + esac + ROOT=/ has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break done [[ ${WANT_AUTOMAKE} == "latest" ]] && \ die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}" diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 47ee5495739c..68e4ce15b377 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -154,6 +154,8 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then tc_version_is_at_least 4.9 && IUSE+=" +vtv" tc_version_is_at_least 5.0 && IUSE+=" jit mpx" tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch" + # systemtap is a gentoo-specific switch: bug #654748 + tc_version_is_at_least 8.0 && IUSE+=" systemtap" fi IUSE+=" ${IUSE_DEF[*]/#/+}" @@ -220,6 +222,11 @@ if in_iuse gcj ; then DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" fi +if in_iuse systemtap ; then + # gcc needs sys/sdt.h headers on target + DEPEND+=" systemtap? ( dev-util/systemtap )" +fi + PDEPEND=">=sys-devel/gcc-config-1.7" #---->> S + SRC_URI essentials <<---- @@ -1229,6 +1236,10 @@ toolchain_src_configure() { confgcc+=( $(use_enable mpx libmpx) ) fi + if in_iuse systemtap ; then + confgcc+=( $(use_enable systemtap) ) + fi + if in_iuse vtv ; then confgcc+=( $(use_enable vtv vtable-verify) |