This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch devs/dimmus/meson
in repository efl.
View the commit online.
commit 808423d71b81f4f1163d193ef9aa451eb43b9bbc
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Tue Dec 5 17:38:57 2023 +0500
meson: make get_pkgconfig_variable version specific
---
dbus-services/meson.build | 8 +++++++-
meson.build | 13 +++++++++++--
src/wayland_protocol/meson.build | 10 ++++++++--
systemd-services/meson.build | 7 ++++++-
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/dbus-services/meson.build b/dbus-services/meson.build
index 29fe392411..4d6080ae4b 100644
--- a/dbus-services/meson.build
+++ b/dbus-services/meson.build
@@ -11,8 +11,14 @@ endif
org_enlightenment_ethumb_service_config.set('systemd_dbus_prefix',
systemd_dbus_prefix)
+if meson.version().version_compare('>=0.58')
+ session_bus_services_dir = dep.get_variable('session_bus_services_dir')
+else
+ session_bus_services_dir = dep.get_pkgconfig_variable('session_bus_services_dir')
+endif
+
configure_file(
input: 'org.enlightenment.Ethumb.service.in',
output: 'org.enlightenment.Ethumb.service',
configuration: org_enlightenment_ethumb_service_config,
- install_dir: dep.get_pkgconfig_variable('session_bus_services_dir'))
+ install_dir: session_bus_services_dir)
diff --git a/meson.build b/meson.build
index 4ceba2f322..eaa0e031d8 100644
--- a/meson.build
+++ b/meson.build
@@ -306,9 +306,18 @@ if sys_osx and get_option('lua-interpreter') == 'luajit'
# luajit on macro is broken, this means we need to generate our own
# dependency with our arguments, a library later still needs to link to
# luajit for the pagesize argument thingy
+ if meson.version().version_compare('>=0.58')
+ lua_inc_dir = lua.get_variable('includedir')
+ lua_lib_dir = lua.get_variable('libdir')
+ lua_lib_name = lua.get_variable('libname')
+ else
+ lua_inc_dir = lua.get_pkgconfig_variable('includedir')
+ lua_lib_dir = lua.get_pkgconfig_variable('libdir')
+ lua_lib_name = lua.get_pkgconfig_variable('libname')
+ endif
lua = declare_dependency(
- include_directories: include_directories(lua.get_pkgconfig_variable('includedir')),
- link_args: ['-L' + lua.get_pkgconfig_variable('libdir'), '-l' + lua.get_pkgconfig_variable('libname')]
+ include_directories: include_directories(lua_inc_dir),
+ link_args: ['-L' + lua_lib_dir, '-l' + lua_lib_name]
)
endif
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index a61f8c8de3..5aed7ea157 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -20,15 +20,21 @@ wl_stable_protocol_sys = [
join_paths('xdg-shell', 'xdg-shell.xml'),
]
+if meson.version().version_compare('>=0.58')
+ wl_pkg_data_dir = _wayland_protocols.get_variable('pkgdatadir')
+else
+ wl_pkg_data_dir = _wayland_protocols.get_pkgconfig_variable('pkgdatadir')
+endif
+
foreach sys_protocol : wl_unstable_protocol_sys
wl_protocol_local += [
- join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
+ join_paths(wl_pkg_data_dir, 'unstable',
sys_protocol)]
endforeach
foreach sys_protocol : wl_stable_protocol_sys
wl_protocol_local += [
- join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'stable',
+ join_paths(wl_pkg_data_dir, 'stable',
sys_protocol)]
endforeach
diff --git a/systemd-services/meson.build b/systemd-services/meson.build
index a17790e857..4d4561c286 100644
--- a/systemd-services/meson.build
+++ b/systemd-services/meson.build
@@ -1,7 +1,12 @@
if get_option('systemd') == true
sys_dep = dependency('systemd', required: false)
if sys_dep.found()
- sys_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
+ if meson.version().version_compare('>=0.58')
+ sys_unit_dir = sys_dep.get_variable('systemduserunitdir')
+ else
+ sys_unit_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
+ endif
+ sys_dir = sys_unit_dir
else
sys_dir = join_paths(dir_lib, 'systemd', 'user')
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
