Browse Source

Prep v236: Apply missing upstream updates to the build system

upstream/latest
Sven Eden 4 years ago
parent
commit
aaae10b183
  1. 17
      man/meson.build
  2. 507
      meson.build
  3. 55
      meson_options.txt
  4. 17
      shell-completion/bash/meson.build
  5. 17
      shell-completion/zsh/meson.build
  6. 22
      src/basic/meson.build
  7. 33
      src/core/meson.build
  8. 17
      src/libelogind/meson.build
  9. 28
      src/login/meson.build
  10. 21
      src/shared/meson.build
  11. 17
      src/systemd/meson.build
  12. 31
      src/test/meson.build

17
man/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
# This is lame, I know, but meson has no other include mechanism
subdir('rules')

507
meson.build

File diff suppressed because it is too large

55
meson_options.txt

@ -1,4 +1,20 @@
# -*- mode: meson -*-
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
option('split-usr', type : 'boolean', value : false,
description : '''assume that /bin, /sbin aren't symlinks into /usr''')
@ -9,7 +25,7 @@ option('rootprefix', type : 'string',
#if 0 /// UNNEEDED by elogind
# option('link-udev-shared', type : 'boolean',
# description : 'link systemd-udev and its helpers to libsystemd-shared.so')
#
# option('sysvinit-path', type : 'string', value : '/etc/init.d',
# description : 'the directory where the SysV init scripts are located')
# option('sysvrcnd-path', type : 'string', value : '/etc/rc.d',
@ -19,7 +35,7 @@ option('rootprefix', type : 'string',
# value : '/etc/rc.local')
# option('halt-local', type : 'string',
# value : '/usr/sbin/halt.local')
#
# option('quotaon-path', type : 'string', description : 'path to quotaon')
# option('quotacheck-path', type : 'string', description : 'path to quotacheck')
# option('kill-path', type : 'string', description : 'path to kill')
@ -48,7 +64,7 @@ option('kexec-path', type : 'string', description : 'path to kexec')
# option('umount-path', type : 'string', description : 'path to umount')
# option('loadkeys-path', type : 'string', description : 'path to loadkeys')
# option('setfont-path', type : 'string', description : 'path to setfont')
#
# option('debug-shell', type : 'string', value : '/bin/sh',
# description : 'path to debug shell binary')
# option('debug-tty', type : 'string', value : '/dev/tty9',
@ -155,15 +171,16 @@ option('fallback-hostname', type : 'string', value : 'localhost',
#endif // 0
option('default-hierarchy', type : 'combo',
choices : ['legacy', 'hybrid', 'unified'], value : 'hybrid',
description : 'default cgroup hierarchy
#if 0 /// elogind interprets this a bit different
# description : 'default cgroup hierarchy')
# option('time-epoch', type : 'string',
# description : 'time epoch for time clients')
#else
description : 'Wanted cgroup hierarchy if elogind has to be a cgroup controller:
"legacy" assumes cgroups version 1 mounted on /sys/fs/cgroup
"hybrid" assumes cgroups version 2 mounted on /sys/fs/cgroup/unified and
cgroups version 1 mounted on /sys/fs/cgroup.
"unified" assumes cgroups version 2 on /sys/fs/cgroup')
#if 0 /// UNNEEDED by elogind
# option('time-epoch', type : 'string',
# description : 'time epoch for time clients')
#else
option('cgroup-controller', type : 'string',
description : 'Name of the cgroup controller to use')
#endif // 0
@ -171,10 +188,26 @@ option('system-uid-max', type : 'string',
description : 'maximum system UID')
option('system-gid-max', type : 'string',
description : 'maximum system GID')
#if 0 /// UNNEEDED by elogind
# option('dynamic-uid-min', type : 'string',
# description : 'minimum dynamic UID',
# value : '61184') # That's → 0x0000EF00 in hex
# option('dynamic-uid-max', type : 'string',
# description : 'maximum dynamic UID',
# value : '65519') # That's → 0x0000FFEF in hex
# option('container-uid-base-min', type : 'string',
# description : 'minimum container UID base',
# value : '524288') # That's → 0x00080000 in hex
# option('container-uid-base-max', type : 'string',
# description : 'maximum container UID base',
# value : '1878982656') # That's → 0x6FFF0000 in hex
#endif // 0
option('tty-gid', type : 'string',
description : 'the numeric GID of the "tty" group',
value : '5')
#if 0 /// UNNEEDED by elogind
# option('users-gid', type : 'string',
# description : 'the numeric GID of the "users" group')
# option('adm-group', type : 'boolean',
# description : 'the ACL for adm group should be added')
# option('wheel-group', type : 'boolean',
@ -185,8 +218,10 @@ option('tty-gid', type : 'string',
# option('nobody-group', type : 'string',
# description : 'The name of the nobody group (the one with GID 65534)',
# value : 'nobody')
# option('dev-kvm-mode', type : 'string', value : '0660',
# option('dev-kvm-mode', type : 'string', value : '0666',
# description : '/dev/kvm access mode')
# option('group-render-mode', type : 'string', value : '0666',
# description : 'Access mode for devices owned by render group (e.g. /dev/dri/renderD*, /dev/kfd).')
#endif // 0
option('default-kill-user-processes', type : 'boolean',
description : 'the default value for KillUserProcesses= setting')
@ -210,7 +245,7 @@ option('gshadow', type : 'boolean',
# option('www-target', type : 'string',
# description : 'the address and dir to upload docs too',
# value : 'www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd')
#
# option('seccomp', type : 'combo', choices : ['auto', 'true', 'false'],
# description : 'SECCOMP support')
#endif // 0

17
shell-completion/bash/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
bashcompletiondir = get_option('bashcompletiondir')
if bashcompletiondir == ''
bash_completion = dependency('bash-completion', required : false)

17
shell-completion/zsh/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
zshcompletiondir = get_option('zshcompletiondir')
if zshcompletiondir == ''
zshcompletiondir = join_paths(datadir, 'zsh/site-functions')

22
src/basic/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
#if 0 /// elogind has a shorter list
# basic_sources_plain = files('''
# MurmurHash2.c
@ -45,6 +62,8 @@
# copy.h
# cpu-set-util.c
# cpu-set-util.h
# crypt-util.c
# crypt-util.h
# def.h
# device-nodes.c
# device-nodes.h
@ -114,6 +133,7 @@
# mkdir-label.c
# mkdir.c
# mkdir.h
# module-util.h
# mount-util.c
# mount-util.h
# nss-util.h
@ -184,6 +204,8 @@
# unaligned.h
# unit-name.c
# unit-name.h
# unit-def.c
# unit-def.h
# user-util.c
# user-util.h
# utf8.c

33
src/core/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
#if 0 /// elogind has only two of the parts here in it...
# libcore_la_sources = '''
# audit-fd.c
@ -207,26 +224,16 @@ libcore_la_sources = files('''
# output : 'org.freedesktop.systemd1.policy.in',
# configuration : substs)
#
# custom_target(
# i18n.merge_file(
# 'org.freedesktop.systemd1.policy',
# input : policy_in,
# output : 'org.freedesktop.systemd1.policy',
# command : intltool_command,
# po_dir : po_dir,
# data_dirs : po_dir,
# install : install_polkit,
# install_dir : polkitpolicydir)
#endif // 0
# TODO: this might work with meson from git, see
# https://github.com/mesonbuild/meson/issues/1441#issuecomment-283585493
#
# i18n.merge_file(
# 'org.freedesktop.systemd1.policy',
# po_dir : po_dir,
# input : policy_in,
# output : 'org.freedesktop.systemd1.policy',
# install : install_polkit,
# install_dir : polkitpolicydir)
#if 0 /// totally UNNEEDED in elogind
# install_data('system.conf',
# 'user.conf',

17
src/libelogind/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
sd_login_c = files('sd-login/sd-login.c')
#if 0 /// elogind has a shorter list, of course...

28
src/login/meson.build

@ -1,4 +1,22 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
#if 0 /// rename to elogind
#
# systemd_logind_sources = files('''
# logind.c
# logind.h
@ -105,11 +123,12 @@ loginctl_sources += files('''
# install_data('org.freedesktop.login1.service',
# install_dir : dbussystemservicedir)
#
# custom_target(
# i18n.merge_file(
# 'org.freedesktop.login1.policy',
# input : 'org.freedesktop.login1.policy.in',
# output : 'org.freedesktop.login1.policy',
# command : intltool_command,
# po_dir : po_dir,
# data_dirs : po_dir,
# install : install_polkit,
# install_dir : polkitpolicydir)
#
@ -156,11 +175,12 @@ logind_service = configure_file(
install_data(logind_service,
install_dir : dbussystemservicedir)
custom_target(
i18n.merge_file(
'org.freedesktop.login1.policy',
input : 'org.freedesktop.login1.policy.in',
output : 'org.freedesktop.login1.policy',
command : intltool_command,
po_dir : po_dir,
data_dirs : po_dir,
install : install_polkit,
install_dir : polkitpolicydir)

21
src/shared/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
#if 0 /// elogind has a much shorter list
# shared_sources = '''
# acl-util.h
@ -11,6 +28,8 @@
# base-filesystem.h
# boot-timestamps.c
# boot-timestamps.h
# bootspec.c
# bootspec.h
# bus-unit-util.c
# bus-unit-util.h
# bus-util.c
@ -89,6 +108,8 @@
# sysctl-util.h
# tests.c
# tests.h
# tomoyo-util.c
# tomoyo-util.h
# udev-util.h
# udev-util.c
# uid-range.c

17
src/systemd/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
#if 0 /// No systemd-journal in elogind ...
# _systemd_headers = '''
# sd-bus.h

31
src/test/meson.build

@ -1,3 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# Copyright 2017 Zbigniew Jędrzejewski-Szmek
#
# elogind is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with elogind; If not, see <http://www.gnu.org/licenses/>.
awkscript = 'test-hashmap-ordered.awk'
test_hashmap_ordered_c = custom_target(
'test-hashmap-ordered.c',
@ -41,6 +58,12 @@ test_dlopen_c = files('test-dlopen.c')
############################################################
#if 0 /// UNNEEDED by elogind
# test_elogind_tmpfiles_py = find_program('test-elogind-tmpfiles.py')
#endif // 0
############################################################
tests += [
#if 0 /// UNNEEDED in elogind
# [['src/test/test-device-nodes.c'],
@ -145,7 +168,8 @@ tests += [
#
# [['src/test/test-async.c'],
# [],
# []],
# [],
# '', 'timeout=120'],
#endif // 0
[['src/test/test-locale-util.c'],
@ -440,7 +464,7 @@ tests += [
# [],
# []],
#
# [['src/test/test-time.c'],
# [['src/test/test-time-util.c'],
# [],
# []],
#
@ -702,7 +726,8 @@ tests += [
# libshared],
# [threads,
# libxz,
# liblz4]],
# liblz4],
# '', 'timeout=360'],
#
# [['src/journal/test-journal-stream.c'],
# [libjournal_core,

Loading…
Cancel
Save