mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
Merge updates from master
This commit is contained in:
@@ -163,6 +163,11 @@ src_configure() {
|
||||
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Work around stack alignment issue, bug #647954.
|
||||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
|
||||
@@ -177,6 +177,11 @@ src_configure() {
|
||||
export JDK_HOME
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Work around stack alignment issue, bug #647954. in case we ever have x86
|
||||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
|
||||
@@ -175,6 +175,11 @@ src_configure() {
|
||||
export JDK_HOME
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Work around stack alignment issue, bug #647954. in case we ever have x86
|
||||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
|
||||
@@ -140,6 +140,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -149,6 +149,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -159,6 +159,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -160,6 +160,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -165,6 +165,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -161,6 +161,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -165,6 +165,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -162,6 +162,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -168,6 +168,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -167,6 +167,11 @@ src_configure() {
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
|
||||
@@ -178,7 +178,17 @@ multilib_src_configure() {
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
EOF
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
--native-file "${native_file}"
|
||||
-Dbuildtype=$(usex debug debug plain)
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
-Druntime_dir="${EPREFIX}"/run
|
||||
|
||||
@@ -178,7 +178,17 @@ multilib_src_configure() {
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
EOF
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
--native-file "${native_file}"
|
||||
-Dbuildtype=$(usex debug debug plain)
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
-Druntime_dir="${EPREFIX}"/run
|
||||
|
||||
@@ -187,7 +187,17 @@ multilib_src_configure() {
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
EOF
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
--native-file "${native_file}"
|
||||
$(meson_feature debug glib_debug)
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
-Druntime_dir="${EPREFIX}"/run
|
||||
|
||||
@@ -186,7 +186,17 @@ multilib_src_configure() {
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
EOF
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
--native-file "${native_file}"
|
||||
$(meson_feature debug glib_debug)
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
-Druntime_dir="${EPREFIX}"/run
|
||||
|
||||
@@ -186,7 +186,18 @@ multilib_src_configure() {
|
||||
#fi
|
||||
|
||||
use debug && EMESON_BUILD_TYPE=debug
|
||||
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
EOF
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
--native-file "${native_file}"
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
-Druntime_dir="${EPREFIX}"/run
|
||||
$(meson_feature selinux)
|
||||
|
||||
Reference in New Issue
Block a user