From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1665987-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 124211581FB
for <garchives@archives.gentoo.org>; Sat, 31 Aug 2024 02:49:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4689FE29AD;
Sat, 31 Aug 2024 02:49:53 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 24769E29AD
for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2024 02:49:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 32E22342FA2
for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2024 02:49:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C264ADA2
for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2024 02:49:50 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1725072547.fb1e5b03c92bf64617787852b03a5848fca844cb.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/glib/glib-2.76.4.ebuild dev-libs/glib/glib-2.78.3.ebuild dev-libs/glib/glib-2.78.4-r1.ebuild dev-libs/glib/glib-2.78.6.ebuild dev-libs/glib/glib-2.80.4.ebuild
X-VCS-Directories: dev-libs/glib/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: fb1e5b03c92bf64617787852b03a5848fca844cb
X-VCS-Branch: master
Date: Sat, 31 Aug 2024 02:49:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b4c13b3f-beaa-42fe-8ba3-e276134734b3
X-Archives-Hash: 038a08fbe714965e68335e673c4a393d
commit: fb1e5b03c92bf64617787852b03a5848fca844cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 02:35:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 02:49:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1e5b03
dev-libs/glib: handle dev-debug/systemtap[-dtrace-symlink]
See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a.
Bug: https://bugs.gentoo.org/938302
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/glib/glib-2.76.4.ebuild | 10 ++++++++++
dev-libs/glib/glib-2.78.3.ebuild | 10 ++++++++++
dev-libs/glib/glib-2.78.4-r1.ebuild | 10 ++++++++++
dev-libs/glib/glib-2.78.6.ebuild | 10 ++++++++++
dev-libs/glib/glib-2.80.4.ebuild | 11 +++++++++++
5 files changed, 51 insertions(+)
diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild
index 356bd10b8796..f296a348fdf3 100644
--- a/dev-libs/glib/glib-2.76.4.ebuild
+++ b/dev-libs/glib/glib-2.76.4.ebuild
@@ -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
diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild
index 356bd10b8796..f296a348fdf3 100644
--- a/dev-libs/glib/glib-2.78.3.ebuild
+++ b/dev-libs/glib/glib-2.78.3.ebuild
@@ -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
diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild
index f3dbbeb1f18b..07caf94eb0dc 100644
--- a/dev-libs/glib/glib-2.78.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.78.4-r1.ebuild
@@ -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
diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild
index 4cb3fb6b75e4..19ae0fc69d73 100644
--- a/dev-libs/glib/glib-2.78.6.ebuild
+++ b/dev-libs/glib/glib-2.78.6.ebuild
@@ -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
diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild
index 1a20959666c2..2d87ba9d7a69 100644
--- a/dev-libs/glib/glib-2.80.4.ebuild
+++ b/dev-libs/glib/glib-2.80.4.ebuild
@@ -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)