From 0ed2a0e968a4b0606106b74a701a9b13a183e71b830c883cac6c5677fc8f2bc5 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 7 Nov 2019 10:53:51 +0000
Subject: [PATCH] Accepting request 746057 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/746057
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=409
---
 glib2.changes | 10 ++++++++++
 glib2.spec    | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/glib2.changes b/glib2.changes
index 1877c9a..be2b96a 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov  5 20:12:37 UTC 2019 - Michael Gorse <mgorse@suse.com>
+
+- Re-enable systemtap, and require systemtap-headers and
+  systemtap-dtrace, rather than systemtap-sdt-devel, to avoid build
+  cycle (boo#1145438).
+- Own /usr/share/systemtap{|tapset} directories, since we no
+  longer have systemtap-sdt-devel in BuildRequires.
+- Disable lto if systemtap is enabled: build fails otherwise.
+
 -------------------------------------------------------------------
 Mon Oct 21 17:28:20 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/glib2.spec b/glib2.spec
index e10f5d6..becef0c 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -16,8 +16,7 @@
 #
 
 
-# systemtap is only offered as build-option, but not enabled, as it causes a build cycle
-%bcond_with     systemtap
+%bcond_without     systemtap
 Name:           glib2
 Version:        2.62.2
 Release:        0
@@ -71,7 +70,8 @@ BuildRequires:  pkgconfig(zlib)
 # gtk-doc requires glib2-devel, but we will only be building this here; break up a cycle
 #!BuildIgnore:  glib2-devel
 %if %{with systemtap}
-BuildRequires:  systemtap-sdt-devel
+BuildRequires:  systemtap-dtrace
+BuildRequires:  systemtap-headers
 %endif
 
 %description
@@ -262,7 +262,11 @@ cp -a %{SOURCE4} gnome_defaults.conf
 grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|%{_bindir}/python3|g"
 
 %build
+%if %{with systemtap}
+%global _lto_cflags %{nil}
+%else
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+%endif
 %meson \
 	--default-library=both \
 	-Dselinux=enabled \
@@ -490,6 +494,8 @@ done
 %{_datadir}/gtk-doc/html/gobject
 %{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
 %if %{with systemtap}
+%dir %{_datadir}/systemtap
+%dir %{_datadir}/systemtap/tapset
 %dir %{_datadir}/systemtap/tapset/*
 %{_datadir}/systemtap/tapset/*/libgio-*.so.*.stp
 %{_datadir}/systemtap/tapset/*/libglib-*.so.*.stp