From f3dca9e3c3373a5817582d4b583077b8f9358604 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Mon, 31 Jul 2017 08:28:21 +0200 Subject: General: Update build system to upstream support of meson+ninja. Upstream thinks, that the auto tools are too 'legacy', or that they are at least no longer fitting. We follow, as the classic auto tools files have been removed, so no other choice here... --- src/libelogind/meson.build | 144 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 src/libelogind/meson.build (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build new file mode 100644 index 000000000..5d012ea6e --- /dev/null +++ b/src/libelogind/meson.build @@ -0,0 +1,144 @@ +sd_login_c = files('sd-login/sd-login.c') + +#if 0 /// elogind has a shorter list, of course... +# libsystemd_internal_sources = files(''' +# sd-bus/bus-bloom.c +# sd-bus/bus-bloom.h +# sd-bus/bus-common-errors.c +# sd-bus/bus-common-errors.h +# sd-bus/bus-container.c +# sd-bus/bus-container.h +# sd-bus/bus-control.c +# sd-bus/bus-control.h +# sd-bus/bus-convenience.c +# sd-bus/bus-creds.c +# sd-bus/bus-creds.h +# sd-bus/bus-dump.c +# sd-bus/bus-dump.h +# sd-bus/bus-error.c +# sd-bus/bus-error.h +# sd-bus/bus-gvariant.c +# sd-bus/bus-gvariant.h +# sd-bus/bus-internal.c +# sd-bus/bus-internal.h +# sd-bus/bus-introspect.c +# sd-bus/bus-introspect.h +# sd-bus/bus-kernel.c +# sd-bus/bus-kernel.h +# sd-bus/bus-match.c +# sd-bus/bus-match.h +# sd-bus/bus-message.c +# sd-bus/bus-message.h +# sd-bus/bus-objects.c +# sd-bus/bus-objects.h +# sd-bus/bus-protocol.h +# sd-bus/bus-signature.c +# sd-bus/bus-signature.h +# sd-bus/bus-slot.c +# sd-bus/bus-slot.h +# sd-bus/bus-socket.c +# sd-bus/bus-socket.h +# sd-bus/bus-track.c +# sd-bus/bus-track.h +# sd-bus/bus-type.c +# sd-bus/bus-type.h +# sd-bus/sd-bus.c +# sd-daemon/sd-daemon.c +# sd-device/device-enumerator-private.h +# sd-device/device-enumerator.c +# sd-device/device-internal.h +# sd-device/device-private.c +# sd-device/device-private.h +# sd-device/device-util.h +# sd-device/sd-device.c +# sd-event/sd-event.c +# sd-hwdb/hwdb-internal.h +# sd-hwdb/hwdb-util.h +# sd-hwdb/sd-hwdb.c +# sd-id128/id128-util.c +# sd-id128/id128-util.h +# sd-id128/sd-id128.c +# sd-netlink/local-addresses.c +# sd-netlink/local-addresses.h +# sd-netlink/netlink-internal.h +# sd-netlink/netlink-message.c +# sd-netlink/netlink-socket.c +# sd-netlink/netlink-types.c +# sd-netlink/netlink-types.h +# sd-netlink/netlink-util.c +# sd-netlink/netlink-util.h +# sd-netlink/rtnl-message.c +# sd-netlink/sd-netlink.c +# sd-network/network-util.c +# sd-network/network-util.h +# sd-network/sd-network.c +# sd-path/sd-path.c +# sd-resolve/sd-resolve.c +# sd-utf8/sd-utf8.c +# '''.split()) + sd_login_c +#else +libelogind_internal_sources = files(''' + sd-bus/bus-bloom.c + sd-bus/bus-bloom.h + sd-bus/bus-common-errors.c + sd-bus/bus-common-errors.h + sd-bus/bus-container.c + sd-bus/bus-container.h + sd-bus/bus-control.c + sd-bus/bus-control.h + sd-bus/bus-convenience.c + sd-bus/bus-creds.c + sd-bus/bus-creds.h + sd-bus/bus-error.c + sd-bus/bus-error.h + sd-bus/bus-gvariant.c + sd-bus/bus-gvariant.h + sd-bus/bus-internal.c + sd-bus/bus-internal.h + sd-bus/bus-introspect.c + sd-bus/bus-introspect.h + sd-bus/bus-kernel.c + sd-bus/bus-kernel.h + sd-bus/bus-match.c + sd-bus/bus-match.h + sd-bus/bus-message.c + sd-bus/bus-message.h + sd-bus/bus-objects.c + sd-bus/bus-objects.h + sd-bus/bus-protocol.h + sd-bus/bus-signature.c + sd-bus/bus-signature.h + sd-bus/bus-slot.c + sd-bus/bus-slot.h + sd-bus/bus-socket.c + sd-bus/bus-socket.h + sd-bus/bus-track.c + sd-bus/bus-track.h + sd-bus/bus-type.c + sd-bus/bus-type.h + sd-bus/sd-bus.c + sd-daemon/sd-daemon.c + sd-event/sd-event.c + sd-id128/id128-util.c + sd-id128/id128-util.h + sd-id128/sd-id128.c +'''.split()) + sd_login_c +#endif // 0 + +libelogind_internal = static_library( + 'elogind', + libelogind_internal_sources, + install : false, + include_directories : includes, + link_with : libbasic, + dependencies : [threads, + librt]) + +libelogind_sym = 'src/libelogind/libelogind.sym' + +libelogind_pc = configure_file( + input : 'libelogind.pc.in', + output : 'libelogind.pc', + configuration : substs) +install_data(libelogind_pc, + install_dir : pkgconfiglibdir) -- cgit v1.2.3 From ade93879a863195acb0cc2f346ef6ecf48416b4f Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Mon, 14 Aug 2017 10:18:50 +0200 Subject: Prep v235: Add missing includes and dependencies. --- src/libelogind/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index 5d012ea6e..098a8a34b 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -131,8 +131,12 @@ libelogind_internal = static_library( install : false, include_directories : includes, link_with : libbasic, - dependencies : [threads, - librt]) +#if 0 /// elogind does not need librt +# dependencies : [threads, +# librt]) +#else + dependencies : [threads]) +#endif // 0 libelogind_sym = 'src/libelogind/libelogind.sym' -- cgit v1.2.3 From aaae10b1838c7cb84608fe905e6360b9b8544e1b Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Tue, 13 Mar 2018 08:17:29 +0100 Subject: Prep v236: Apply missing upstream updates to the build system --- src/libelogind/meson.build | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index 098a8a34b..d4306bba0 100644 --- a/src/libelogind/meson.build +++ b/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 . + sd_login_c = files('sd-login/sd-login.c') #if 0 /// elogind has a shorter list, of course... -- cgit v1.2.3 From 5e7c94d0ff790aee82d5cbf934a6a440aeca6f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 19 Dec 2017 11:35:01 +0100 Subject: meson: rename libsystemd_internal to libsystem_static We already use the "_static" suffix for libshared_static ("shared" is the name of the library, "static" is the format) and other libs, so let's rename for consistency. Also change libsystemd_static_sources to libsystemd_sources, since the same list is used for both and shorter is better. --- src/libelogind/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index d4306bba0..583f4d73f 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -18,7 +18,7 @@ sd_login_c = files('sd-login/sd-login.c') #if 0 /// elogind has a shorter list, of course... -# libsystemd_internal_sources = files(''' +# libsystemd_sources = files(''' # sd-bus/bus-bloom.c # sd-bus/bus-bloom.h # sd-bus/bus-common-errors.c @@ -142,9 +142,9 @@ libelogind_internal_sources = files(''' '''.split()) + sd_login_c #endif // 0 -libelogind_internal = static_library( +libelogind_static = static_library( 'elogind', - libelogind_internal_sources, + libelogind_sources, install : false, include_directories : includes, link_with : libbasic, -- cgit v1.2.3 From cba4e27941fef3c0b170792f6ec0cba019d36734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 19 Dec 2017 19:14:03 +0100 Subject: meson: link libsystemd_static in libshared instead of recompiling This is similar to the great-grandpa commit. This time the number of meson targets compilation without man is reduced from 1347 to 1302. --- src/libelogind/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index 583f4d73f..e4fd6d864 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -150,7 +150,8 @@ libelogind_static = static_library( link_with : libbasic, #if 0 /// elogind does not need librt # dependencies : [threads, -# librt]) +# librt], +# c_args : ['-fvisibility=default']) #else dependencies : [threads]) #endif // 0 -- cgit v1.2.3 From 0e498e932cc91d8ca971592837f418c9139f6417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Dec 2017 15:17:06 +0100 Subject: sd-netlink: add generic netlink support This also adds the ability to incorporate arrays into netlink messages and to determine when a netlink message is too big, used by some generic netlink protocols. --- src/libelogind/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index e4fd6d864..b5c9b23cb 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -18,7 +18,7 @@ sd_login_c = files('sd-login/sd-login.c') #if 0 /// elogind has a shorter list, of course... -# libsystemd_sources = files(''' +# libsystemd_internal_sources = files(''' # sd-bus/bus-bloom.c # sd-bus/bus-bloom.h # sd-bus/bus-common-errors.c @@ -75,6 +75,7 @@ sd_login_c = files('sd-login/sd-login.c') # sd-id128/id128-util.c # sd-id128/id128-util.h # sd-id128/sd-id128.c +# sd-netlink/generic-netlink.c # sd-netlink/local-addresses.c # sd-netlink/local-addresses.h # sd-netlink/netlink-internal.h @@ -142,16 +143,15 @@ libelogind_internal_sources = files(''' '''.split()) + sd_login_c #endif // 0 -libelogind_static = static_library( +libelogind_internal = static_library( 'elogind', - libelogind_sources, + libelogind_internal_sources, install : false, include_directories : includes, link_with : libbasic, #if 0 /// elogind does not need librt # dependencies : [threads, -# librt], -# c_args : ['-fvisibility=default']) +# librt]) #else dependencies : [threads]) #endif // 0 -- cgit v1.2.3 From 345fe418feab4d06953d1d50ed40399e470cbee8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Jan 2018 00:28:49 +0100 Subject: sd-bus: drop bloom stuff, it's not needed anymore since kdbus is gone --- src/libelogind/meson.build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index b5c9b23cb..69424a054 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -18,9 +18,7 @@ sd_login_c = files('sd-login/sd-login.c') #if 0 /// elogind has a shorter list, of course... -# libsystemd_internal_sources = files(''' -# sd-bus/bus-bloom.c -# sd-bus/bus-bloom.h +# libsystemd_sources = files(''' # sd-bus/bus-common-errors.c # sd-bus/bus-common-errors.h # sd-bus/bus-container.c @@ -143,15 +141,16 @@ libelogind_internal_sources = files(''' '''.split()) + sd_login_c #endif // 0 -libelogind_internal = static_library( +libelogind_static = static_library( 'elogind', - libelogind_internal_sources, + libelogind_sources, install : false, include_directories : includes, link_with : libbasic, #if 0 /// elogind does not need librt # dependencies : [threads, -# librt]) +# librt], +# c_args : ['-fvisibility=default']) #else dependencies : [threads]) #endif // 0 -- cgit v1.2.3 From 04fa10265f18424ca0ed2f6d2c8ce98196b4a291 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 14 Feb 2018 05:08:50 -0800 Subject: meson: factor out daemon/event/id128 sources into variables (#8170) --- src/libelogind/meson.build | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index 69424a054..cc46f04d9 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -15,6 +15,14 @@ # You should have received a copy of the GNU Lesser General Public License # along with elogind; If not, see . +id128_sources = files(''' + sd-id128/id128-util.c + sd-id128/id128-util.h + sd-id128/sd-id128.c +'''.split()) + +sd_daemon_c = files('sd-daemon/sd-daemon.c') +sd_event_c = files('sd-event/sd-event.c') sd_login_c = files('sd-login/sd-login.c') #if 0 /// elogind has a shorter list, of course... @@ -58,7 +66,6 @@ sd_login_c = files('sd-login/sd-login.c') # sd-bus/bus-type.c # sd-bus/bus-type.h # sd-bus/sd-bus.c -# sd-daemon/sd-daemon.c # sd-device/device-enumerator-private.h # sd-device/device-enumerator.c # sd-device/device-internal.h @@ -66,13 +73,9 @@ sd_login_c = files('sd-login/sd-login.c') # sd-device/device-private.h # sd-device/device-util.h # sd-device/sd-device.c -# sd-event/sd-event.c # sd-hwdb/hwdb-internal.h # sd-hwdb/hwdb-util.h # sd-hwdb/sd-hwdb.c -# sd-id128/id128-util.c -# sd-id128/id128-util.h -# sd-id128/sd-id128.c # sd-netlink/generic-netlink.c # sd-netlink/local-addresses.c # sd-netlink/local-addresses.h @@ -91,7 +94,7 @@ sd_login_c = files('sd-login/sd-login.c') # sd-path/sd-path.c # sd-resolve/sd-resolve.c # sd-utf8/sd-utf8.c -# '''.split()) + sd_login_c +# '''.split()) + id128_sources + sd_daemon_c + sd_event_c + sd_login_c #else libelogind_internal_sources = files(''' sd-bus/bus-bloom.c @@ -151,15 +154,15 @@ libelogind_static = static_library( # dependencies : [threads, # librt], # c_args : ['-fvisibility=default']) +# +# libsystemd_sym = 'src/libsystemd/libsystemd.sym' +# +# libsystemd_pc = configure_file( +# input : 'libsystemd.pc.in', +# output : 'libsystemd.pc', +# install_data(libsystemd_pc, #else dependencies : [threads]) #endif // 0 - -libelogind_sym = 'src/libelogind/libelogind.sym' - -libelogind_pc = configure_file( - input : 'libelogind.pc.in', - output : 'libelogind.pc', configuration : substs) -install_data(libelogind_pc, install_dir : pkgconfiglibdir) -- cgit v1.2.3 From 8290b1a8c9471da570ebc6e58fd837c59265a19a Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 1 Jun 2018 20:21:49 +0200 Subject: Prep v238: Applied some upstream updates to src/libelogind (5/5) --- src/libelogind/meson.build | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index cc46f04d9..fd6127790 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -96,9 +96,7 @@ sd_login_c = files('sd-login/sd-login.c') # sd-utf8/sd-utf8.c # '''.split()) + id128_sources + sd_daemon_c + sd_event_c + sd_login_c #else -libelogind_internal_sources = files(''' - sd-bus/bus-bloom.c - sd-bus/bus-bloom.h +libelogind_sources = files(''' sd-bus/bus-common-errors.c sd-bus/bus-common-errors.h sd-bus/bus-container.c @@ -153,16 +151,16 @@ libelogind_static = static_library( #if 0 /// elogind does not need librt # dependencies : [threads, # librt], -# c_args : ['-fvisibility=default']) -# -# libsystemd_sym = 'src/libsystemd/libsystemd.sym' -# -# libsystemd_pc = configure_file( -# input : 'libsystemd.pc.in', -# output : 'libsystemd.pc', -# install_data(libsystemd_pc, #else - dependencies : [threads]) + dependencies : [threads], #endif // 0 + c_args : ['-fvisibility=default']) + +libelogind_sym = 'src/libelogind/libelogind.sym' + +libelogind_pc = configure_file( + input : 'libelogind.pc.in', + output : 'libelogind.pc', configuration : substs) +install_data(libelogind_pc, install_dir : pkgconfiglibdir) -- cgit v1.2.3 From 9d1ff89d622fd4d8b3be210996cfa73943d81e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 6 Apr 2018 18:58:55 +0200 Subject: tree-wide: drop license boilerplate Files which are installed as-is (any .service and other unit files, .conf files, .policy files, etc), are left as is. My assumption is that SPDX identifiers are not yet that well known, so it's better to retain the extended header to avoid any doubt. I also kept any copyright lines. We can probably remove them, but it'd nice to obtain explicit acks from all involved authors before doing that. --- src/libelogind/meson.build | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index fd6127790..bacf323bd 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -1,19 +1,6 @@ # 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 . id128_sources = files(''' sd-id128/id128-util.c -- cgit v1.2.3 From 6be67d4563e4a6f51e5358121f6cd9d92ea5208b Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Mon, 9 Apr 2018 02:43:35 -0700 Subject: meson: add support for building static libsystemd and libudev --- src/libelogind/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index bacf323bd..b434b5ccf 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -130,18 +130,20 @@ libelogind_sources = files(''' #endif // 0 libelogind_static = static_library( - 'elogind', libelogind_sources, +libelogind_c_args = ['-fvisibility=default'] + + 'elogind_static', install : false, include_directories : includes, link_with : libbasic, #if 0 /// elogind does not need librt # dependencies : [threads, # librt], +# c_args : libsystemd_c_args) #else dependencies : [threads], #endif // 0 - c_args : ['-fvisibility=default']) libelogind_sym = 'src/libelogind/libelogind.sym' -- cgit v1.2.3 From 002c7228dfa839a68591964563e5ef4ded4230a5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Jun 2018 19:00:24 +0200 Subject: tree-wide: beautify remaining copyright statements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's unify an beautify our remaining copyright statements, with a unicode ©. This means our copyright statements are now always formatted the same way. Yay. --- src/libelogind/meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index b434b5ccf..6e390490e 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1+ # -# Copyright 2017 Zbigniew Jędrzejewski-Szmek +# Copyright © 2017 Zbigniew Jędrzejewski-Szmek id128_sources = files(''' sd-id128/id128-util.c @@ -141,15 +141,15 @@ libelogind_c_args = ['-fvisibility=default'] # dependencies : [threads, # librt], # c_args : libsystemd_c_args) +# +# libsystemd_sym = 'src/libsystemd/libsystemd.sym' +# +# libsystemd_pc = configure_file( +# input : 'libsystemd.pc.in', +# output : 'libsystemd.pc', +# install_data(libsystemd_pc, #else dependencies : [threads], #endif // 0 - -libelogind_sym = 'src/libelogind/libelogind.sym' - -libelogind_pc = configure_file( - input : 'libelogind.pc.in', - output : 'libelogind.pc', configuration : substs) -install_data(libelogind_pc, install_dir : pkgconfiglibdir) -- cgit v1.2.3 From 9c9fc6a72d3e3ce9d3574c5acbfcca1737e4d0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 14 Jun 2018 12:47:16 +0200 Subject: Drop my copyright headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit perl -i -0pe 's/\s*Copyright © .... Zbigniew Jędrzejewski.*?\n/\n/gms' man/*xml git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/(#\n)?# +Copyright © [0-9, -]+ Zbigniew Jędrzejewski.*?\n//gms' git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s*\/\*\*\*\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*?\s*\*\*\*\/\s*/\n\n/gms' git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*//gms' --- src/libelogind/meson.build | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index 6e390490e..a54113d45 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -1,6 +1,4 @@ # SPDX-License-Identifier: LGPL-2.1+ -# -# Copyright © 2017 Zbigniew Jędrzejewski-Szmek id128_sources = files(''' sd-id128/id128-util.c -- cgit v1.2.3 From 48d68297393c8b3699dd1ccabfe2e30b84c0a624 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 10 Aug 2018 17:41:29 +0200 Subject: Build system: Fix various issues that came from errornous migration. No matter how much advanced check_tree.pl is, there are plenty possibilities where upstream changes can be transported wrong. Mainly adding something we then have to mask out. But at the end of the day this is actually wanted, so we do not miss important changes. --- src/libelogind/meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/libelogind/meson.build') diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index a54113d45..dfecea3bc 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -127,27 +127,27 @@ libelogind_sources = files(''' '''.split()) + sd_login_c #endif // 0 -libelogind_static = static_library( - libelogind_sources, libelogind_c_args = ['-fvisibility=default'] +libelogind_static = static_library( 'elogind_static', + libelogind_sources, install : false, include_directories : includes, link_with : libbasic, #if 0 /// elogind does not need librt # dependencies : [threads, # librt], -# c_args : libsystemd_c_args) -# -# libsystemd_sym = 'src/libsystemd/libsystemd.sym' -# -# libsystemd_pc = configure_file( -# input : 'libsystemd.pc.in', -# output : 'libsystemd.pc', -# install_data(libsystemd_pc, #else dependencies : [threads], #endif // 0 + c_args : libelogind_c_args) + +libelogind_sym = 'src/libelogind/libelogind.sym' + +libelogind_pc = configure_file( + input : 'libelogind.pc.in', + output : 'libelogind.pc', configuration : substs) +install_data(libelogind_pc, install_dir : pkgconfiglibdir) -- cgit v1.2.3