mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-11 23:16:14 +01:00
Convert systemtap from bool to feature option type
Now systemtap can be enabled by default in distros that use -Dauto_features=enabled or for developers who already have systemtap installed, while it's still disabled for developers who do not have systemtap installed. See #3354
This commit is contained in:
parent
ed020a688a
commit
153cda6669
@ -185,7 +185,7 @@ fedora-x86_64:
|
|||||||
--prefix=$HOME/glib-installed
|
--prefix=$HOME/glib-installed
|
||||||
--localstatedir=/var
|
--localstatedir=/var
|
||||||
--libdir=lib
|
--libdir=lib
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
-Ddtrace=enabled
|
-Ddtrace=enabled
|
||||||
-Dinstalled_tests=true
|
-Dinstalled_tests=true
|
||||||
-Ddocumentation=true
|
-Ddocumentation=true
|
||||||
@ -240,7 +240,7 @@ debian-stable-x86_64:
|
|||||||
--prefix=$HOME/glib-installed
|
--prefix=$HOME/glib-installed
|
||||||
--localstatedir=/var
|
--localstatedir=/var
|
||||||
--libdir=lib
|
--libdir=lib
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
-Ddtrace=enabled
|
-Ddtrace=enabled
|
||||||
_build
|
_build
|
||||||
- meson compile -C _build
|
- meson compile -C _build
|
||||||
@ -312,7 +312,7 @@ muslc-alpine-x86_64:
|
|||||||
--prefix=$HOME/glib-installed
|
--prefix=$HOME/glib-installed
|
||||||
--localstatedir=/var
|
--localstatedir=/var
|
||||||
--libdir=lib
|
--libdir=lib
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
_build
|
_build
|
||||||
- meson compile -C _build
|
- meson compile -C _build
|
||||||
- .gitlab-ci/run-tests.sh
|
- .gitlab-ci/run-tests.sh
|
||||||
@ -383,7 +383,7 @@ G_DISABLE_ASSERT:
|
|||||||
script:
|
script:
|
||||||
- meson setup ${MESON_COMMON_OPTIONS}
|
- meson setup ${MESON_COMMON_OPTIONS}
|
||||||
--werror
|
--werror
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
-Ddtrace=enabled
|
-Ddtrace=enabled
|
||||||
-Dinstalled_tests=true
|
-Dinstalled_tests=true
|
||||||
-Dglib_assert=false
|
-Dglib_assert=false
|
||||||
@ -421,7 +421,7 @@ valgrind:
|
|||||||
script:
|
script:
|
||||||
- meson setup ${MESON_COMMON_OPTIONS}
|
- meson setup ${MESON_COMMON_OPTIONS}
|
||||||
--werror
|
--werror
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
-Ddtrace=enabled
|
-Ddtrace=enabled
|
||||||
-Dinstalled_tests=true
|
-Dinstalled_tests=true
|
||||||
-Dintrospection=enabled
|
-Dintrospection=enabled
|
||||||
@ -766,7 +766,7 @@ scan-build:
|
|||||||
--localstatedir=/var
|
--localstatedir=/var
|
||||||
--libdir=lib
|
--libdir=lib
|
||||||
-Dglib_debug=enabled
|
-Dglib_debug=enabled
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
-Ddtrace=enabled
|
-Ddtrace=enabled
|
||||||
-Dinstalled_tests=true
|
-Dinstalled_tests=true
|
||||||
-Dintrospection=enabled
|
-Dintrospection=enabled
|
||||||
@ -796,7 +796,7 @@ scan-build:
|
|||||||
--prefix=$HOME/glib-installed
|
--prefix=$HOME/glib-installed
|
||||||
--localstatedir=/var
|
--localstatedir=/var
|
||||||
--libdir=lib
|
--libdir=lib
|
||||||
-Dsystemtap=true
|
-Dsystemtap=enabled
|
||||||
-Ddtrace=enabled
|
-Ddtrace=enabled
|
||||||
-Dinstalled_tests=true
|
-Dinstalled_tests=true
|
||||||
-Dintrospection=enabled
|
-Dintrospection=enabled
|
||||||
|
@ -2575,10 +2575,10 @@ if cc.has_header_symbol('sys/ptrace.h', 'PTRACE_O_EXITKILL')
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# systemtap
|
# systemtap
|
||||||
want_systemtap = get_option('systemtap')
|
systemtap = get_option('systemtap').require(enable_dtrace, error_message: 'Cannot enable systemtap because dtrace feature is disabled')
|
||||||
enable_systemtap = false
|
enable_systemtap = systemtap.allowed()
|
||||||
|
|
||||||
if want_systemtap and enable_dtrace
|
if enable_systemtap
|
||||||
tapset_install_dir = get_option('tapset_install_dir')
|
tapset_install_dir = get_option('tapset_install_dir')
|
||||||
if tapset_install_dir == ''
|
if tapset_install_dir == ''
|
||||||
tapset_install_dir = join_paths(get_option('datadir'), 'systemtap/tapset', host_machine.cpu_family())
|
tapset_install_dir = join_paths(get_option('datadir'), 'systemtap/tapset', host_machine.cpu_family())
|
||||||
@ -2587,7 +2587,6 @@ if want_systemtap and enable_dtrace
|
|||||||
stp_cdata.set('ABS_GLIB_RUNTIME_LIBDIR', glib_libdir)
|
stp_cdata.set('ABS_GLIB_RUNTIME_LIBDIR', glib_libdir)
|
||||||
stp_cdata.set('LT_CURRENT', minor_version * 100)
|
stp_cdata.set('LT_CURRENT', minor_version * 100)
|
||||||
stp_cdata.set('LT_REVISION', micro_version)
|
stp_cdata.set('LT_REVISION', micro_version)
|
||||||
enable_systemtap = true
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# introspection
|
# introspection
|
||||||
|
@ -56,8 +56,9 @@ option('dtrace',
|
|||||||
description : 'include tracing support for dtrace')
|
description : 'include tracing support for dtrace')
|
||||||
|
|
||||||
option('systemtap',
|
option('systemtap',
|
||||||
type : 'boolean',
|
type : 'feature',
|
||||||
value : false,
|
value : 'auto',
|
||||||
|
deprecated : { 'true': 'enabled', 'false': 'disabled' },
|
||||||
description : 'include tracing support for systemtap')
|
description : 'include tracing support for systemtap')
|
||||||
|
|
||||||
option('tapset_install_dir',
|
option('tapset_install_dir',
|
||||||
|
Loading…
Reference in New Issue
Block a user