Commit 3a39eff1 authored by Allan McRae's avatar Allan McRae
Browse files

meson.build: change ExternalProgram.path to full_path



Removes "Future-deprecated features used", but reuires meson-0.55

Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
parent 6cdb2030
Pipeline #16332 passed with stage
in 1 minute and 50 seconds
...@@ -8,7 +8,7 @@ project('pacman', ...@@ -8,7 +8,7 @@ project('pacman',
'sysconfdir=/etc', 'sysconfdir=/etc',
'localstatedir=/var', 'localstatedir=/var',
], ],
meson_version : '>= 0.51') meson_version : '>= 0.55')
libalpm_version = '13.0.1' libalpm_version = '13.0.1'
...@@ -262,7 +262,7 @@ substs.set('sysconfdir', SYSCONFDIR) ...@@ -262,7 +262,7 @@ substs.set('sysconfdir', SYSCONFDIR)
substs.set('localstatedir', LOCALSTATEDIR) substs.set('localstatedir', LOCALSTATEDIR)
substs.set('PKGDATADIR', PKGDATADIR) substs.set('PKGDATADIR', PKGDATADIR)
substs.set('PREFIX', PREFIX) substs.set('PREFIX', PREFIX)
substs.set('BASH', BASH.path()) substs.set('BASH', BASH.full_path())
substs.set('PACKAGE_VERSION', PACKAGE_VERSION) substs.set('PACKAGE_VERSION', PACKAGE_VERSION)
substs.set('PACKAGE_NAME', meson.project_name()) substs.set('PACKAGE_NAME', meson.project_name())
substs.set('BUILDSCRIPT', BUILDSCRIPT) substs.set('BUILDSCRIPT', BUILDSCRIPT)
...@@ -374,7 +374,7 @@ executable( ...@@ -374,7 +374,7 @@ executable(
foreach wrapper : script_wrappers foreach wrapper : script_wrappers
cdata = configuration_data() cdata = configuration_data()
cdata.set_quoted('BASH', BASH.path()) cdata.set_quoted('BASH', BASH.full_path())
cdata.set_quoted('BUILDDIR', wrapper[2]) cdata.set_quoted('BUILDDIR', wrapper[2])
cdata.set_quoted('REAL_PROGPATH', wrapper[1].full_path()) cdata.set_quoted('REAL_PROGPATH', wrapper[1].full_path())
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment