diff options
| author | Niels Thykier <niels@thykier.net> | 2019-10-20 05:07:39 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2019-10-20 05:07:39 +0000 |
| commit | 3fb30816fc75076ba532f31dae5bcf67125c89fb (patch) | |
| tree | 3f4d2c6f6c862785430134059e186e5a75feeb53 | |
| parent | 2d5eddd2922af8222c243cb3b07dd6226e15ced4 (diff) | |
| download | debhelper-3fb30816fc75076ba532f31dae5bcf67125c89fb.tar.gz | |
meson.pm: Fix broken call to NAME
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | lib/Debian/Debhelper/Buildsystem/meson.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 906875b8..c0b9ebb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ debhelper (12.7) UNRELEASED; urgency=medium is embedded in a different package (e.g. the main udeb package). Thanks to Nicolas Braud-Santoni for reporting the issue. (Closes: #942454) + * meson.pm: Fix invalid call under compat 13. Thanks to + Jeremy Bicha for testing it. (Closes: #942690) [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. diff --git a/lib/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm index e18d1112..842991e9 100644 --- a/lib/Debian/Debhelper/Buildsystem/meson.pm +++ b/lib/Debian/Debhelper/Buildsystem/meson.pm @@ -109,7 +109,7 @@ sub test { my $target = $this->get_targetbuildsystem; eval { - if (compat(12) or $target->name ne 'ninja') { + if (compat(12) or $target->NAME ne 'ninja') { $target->test(@_); } else { # In compat 13 with meson+ninja, we prefer using "meson test" @@ -118,7 +118,7 @@ sub test { update_env => { 'LC_ALL' => 'C.UTF-8', } - ); + ); if ($this->get_parallel() > 0) { $options{update_env}{MESON_TESTTHREADS} = $this->get_parallel(); } |