gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 14:49:30 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/glib: only pass --native-file when we actually use it.

Browse Source 
Closes: https://bugs.gentoo.org/938822
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Paul Zander
2024-08-31 15:20:13 +02:00
committed by Joonas Niilola
parent 6e4dadc754
commit e0d489eeab
5 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dev-libs/glib/glib-2.76.4.ebuild
View File

@@ -178,17 +178,7 @@ 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
@@ -207,6 +197,17 @@ multilib_src_configure() {
$(meson_native_use_feature elf libelf)
-Dmultiarch=false
)
# Workaround for bug #938302
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
local native_file="${T}"/meson.${CHOST}.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
dtrace='stap-dtrace'
EOF
emesonargs+=( --native-file "${native_file}" )
fi
meson_src_configure
}

21
dev-libs/glib/glib-2.78.3.ebuild
View File

@@ -178,17 +178,7 @@ 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
@@ -207,6 +197,17 @@ multilib_src_configure() {
$(meson_native_use_feature elf libelf)
-Dmultiarch=false
)
# Workaround for bug #938302
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
local native_file="${T}"/meson.${CHOST}.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
dtrace='stap-dtrace'
EOF
emesonargs+=( --native-file "${native_file}" )
fi
meson_src_configure
}

21
dev-libs/glib/glib-2.78.4-r1.ebuild
View File

@@ -187,17 +187,7 @@ 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
@@ -216,6 +206,17 @@ multilib_src_configure() {
$(meson_native_use_feature elf libelf)
-Dmultiarch=false
)
# Workaround for bug #938302
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
local native_file="${T}"/meson.${CHOST}.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
dtrace='stap-dtrace'
EOF
emesonargs+=( --native-file "${native_file}" )
fi
meson_src_configure
}

25
dev-libs/glib/glib-2.78.6.ebuild
View File

@@ -168,10 +168,6 @@ src_prepare() {
-e '/AvailabilityMacros.h/d' \
gio/giomodule.c || die
# Add meson.${CHOST}.ini.local file that the build system expects to find,
# #938822
touch "${T}/meson.${CHOST}.ini.local" || die
default
gnome2_environment_reset
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
@@ -190,17 +186,7 @@ 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
@@ -219,6 +205,17 @@ multilib_src_configure() {
$(meson_native_use_feature elf libelf)
-Dmultiarch=false
)
# Workaround for bug #938302
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
local native_file="${T}"/meson.${CHOST}.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
dtrace='stap-dtrace'
EOF
emesonargs+=( --native-file "${native_file}" )
fi
meson_src_configure
}

21
dev-libs/glib/glib-2.80.4.ebuild
View File

@@ -187,17 +187,7 @@ multilib_src_configure() {
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)
@@ -216,6 +206,17 @@ multilib_src_configure() {
-Dmultiarch=false
$(meson_native_use_feature introspection)
)
# Workaround for bug #938302
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
local native_file="${T}"/meson.${CHOST}.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
dtrace='stap-dtrace'
EOF
emesonargs+=( --native-file "${native_file}" )
fi
meson_src_configure
}