diff options
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 37609 -> 37605 bytes | |||
-rw-r--r-- | eclass/java-utils-2.eclass | 6 | ||||
-rw-r--r-- | eclass/java-vm-2.eclass | 34 | ||||
-rw-r--r-- | eclass/toolchain-glibc.eclass | 3 | ||||
-rw-r--r-- | eclass/toolchain.eclass | 17 |
5 files changed, 21 insertions, 39 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 8259f09a1e1a..b019a551e7fe 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 25e35c33dd21..1ba8bc5c5b5a 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1480,7 +1480,7 @@ java-pkg_ensure-vm-version-sufficient() { if ! java-pkg_is-vm-version-sufficient; then debug-print "VM is not suffient" eerror "Current Java VM cannot build this package" - einfo "Please use java-config -S to set the correct one" + einfo "Please use \"eselect java-vm set system\" to set the correct one" die "Active Java VM cannot build this package" fi } @@ -1508,7 +1508,7 @@ java-pkg_ensure-vm-version-eq() { if ! java-pkg_is-vm-version-eq $@ ; then debug-print "VM is not suffient" eerror "This package requires a Java VM version = $@" - einfo "Please use java-config -S to set the correct one" + einfo "Please use \"eselect java-vm set system\" to set the correct one" die "Active Java VM too old" fi } @@ -1555,7 +1555,7 @@ java-pkg_ensure-vm-version-ge() { if ! java-pkg_is-vm-version-ge "$@" ; then debug-print "vm is not suffient" eerror "This package requires a Java VM version >= $@" - einfo "Please use java-config -S to set the correct one" + einfo "Please use \"eselect java-vm set system\" to set the correct one" die "Active Java VM too old" fi } diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index f6b50cfbd01a..2ce5bce0e71b 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -74,17 +74,9 @@ java-vm-2_pkg_setup() { # invalid. Also update mime database. java-vm-2_pkg_postinst() { - # Note that we cannot rely on java-config here, as it will silently recognize - # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due - # to the migration to icedtea-6) - if [[ ! -L "${EROOT}${JAVA_VM_SYSTEM}" ]]; then - java_set_default_vm_ - else - local current_vm_path=$(readlink "${EROOT}${JAVA_VM_SYSTEM}") - local current_vm=$(basename "${ROOT}${current_vm_path}") - if [[ ! -L "${EROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then - java_set_default_vm_ - fi + if [[ ! -d ${EROOT}${JAVA_VM_SYSTEM} ]]; then + eselect java-vm set system "${VMHANDLE}" + einfo "${P} set as the default system-vm." fi xdg_desktop_database_update @@ -98,10 +90,10 @@ java-vm-2_pkg_postinst() { # Warn user if removing system-vm. java-vm-2_pkg_prerm() { - if [[ "$(GENTOO_VM="" java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then - ewarn "It appears you are removing your system-vm!" - ewarn "Please run java-config -L to list available VMs," - ewarn "then use java-config -S to set a new system-vm!" + if [[ $(GENTOO_VM= java-config -f 2>/dev/null) == ${VMHANDLE} && -z ${REPLACED_BY_VERSION} ]]; then + ewarn "It appears you are removing your system-vm! Please run" + ewarn "\"eselect java-vm list\" to list available VMs, then use" + ewarn "\"eselect java-vm set system\" to set a new system-vm!" fi } @@ -117,18 +109,6 @@ java-vm-2_pkg_postrm() { } -# @FUNCTION: java_set_default_vm_ -# @INTERNAL -# @DESCRIPTION: -# Set system-vm. - -java_set_default_vm_() { - java-config-2 --set-system-vm="${VMHANDLE}" - - einfo " ${P} set as the default system-vm." -} - - # @FUNCTION: get_system_arch # @DESCRIPTION: # Get Java specific arch name. diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass index 13d99ee1d942..0d252cc0ff4b 100644 --- a/eclass/toolchain-glibc.eclass +++ b/eclass/toolchain-glibc.eclass @@ -557,9 +557,6 @@ toolchain-glibc_pkg_pretend() { ewarn "hypervisor, which is probably not what you want." fi - use hardened && ! tc-enables-pie && \ - ewarn "PIE hardening not applied, as your compiler doesn't default to PIE" - # Make sure host system is up to date #394453 if has_version '<sys-libs/glibc-2.13' && \ [[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib*/l*-*.so) ]] diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0e44d922ebe6..47620e5ae5da 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1815,12 +1815,17 @@ toolchain_src_install() { ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} fi done - # Rename the main go binaries as we don't want to clobber dev-lang/go - # when gcc-config runs. #567806 - if tc_version_is_at_least 5 && is_go ; then - for x in go gofmt; do - mv ${x} ${x}-${GCCMAJOR} || die - done + + # When gcc builds a crosscompiler it does not install unprefixed tools. + # When cross-building gcc does install native tools. + if ! is_crosscompile; then + # Rename the main go binaries as we don't want to clobber dev-lang/go + # when gcc-config runs. #567806 + if tc_version_is_at_least 5 && is_go ; then + for x in go gofmt; do + mv ${x} ${x}-${GCCMAJOR} || die + done + fi fi # Now do the fun stripping stuff |