mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
84 lines
3.9 KiB
Diff
84 lines
3.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dylan Baker <dylan@pnwbakers.com>
|
||
|
|
Date: Wed, 27 Oct 2021 11:02:04 -0700
|
||
|
|
Subject: [PATCH] modules/gnome: ensure that `install_dir` is set
|
||
|
|
|
||
|
|
The `mkenums` functions can have this unset if, and only if, the
|
||
|
|
c file only variant is called. Due to side effects if the header file is
|
||
|
|
generated then `install_dir` is ensured to be set for the c file. I have
|
||
|
|
removed this side effect so that our tests actually cover this case.
|
||
|
|
|
||
|
|
Fixes #9472
|
||
|
|
---
|
||
|
|
mesonbuild/modules/gnome.py | 22 ++++++++++++-------
|
||
|
|
.../frameworks/7 gnome/mkenums/meson.build | 6 ++---
|
||
|
|
2 files changed, 17 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
||
|
|
index 714b68a8da3c..4b3107e36738 100644
|
||
|
|
--- a/mesonbuild/modules/gnome.py
|
||
|
|
+++ b/mesonbuild/modules/gnome.py
|
||
|
|
@@ -1434,31 +1434,37 @@ class GnomeModule(ExtensionModule):
|
||
|
|
# so --template consumes it.
|
||
|
|
h_cmd = cmd + ['--template', '@INPUT@']
|
||
|
|
h_sources = [h_template] + sources
|
||
|
|
- custom_kwargs['install'] = install_header
|
||
|
|
- if 'install_dir' not in custom_kwargs:
|
||
|
|
- custom_kwargs['install_dir'] = \
|
||
|
|
+
|
||
|
|
+ # Copy so we don't mutate the arguments for the c_template
|
||
|
|
+ h_kwargs = custom_kwargs.copy()
|
||
|
|
+ h_kwargs['install'] = install_header
|
||
|
|
+ if 'install_dir' not in h_kwargs:
|
||
|
|
+ h_kwargs['install_dir'] = \
|
||
|
|
state.environment.coredata.get_option(mesonlib.OptionKey('includedir'))
|
||
|
|
h_target = self._make_mkenum_custom_target(state, h_sources,
|
||
|
|
h_output, h_cmd,
|
||
|
|
- custom_kwargs)
|
||
|
|
+ h_kwargs)
|
||
|
|
targets.append(h_target)
|
||
|
|
|
||
|
|
if c_template is not None:
|
||
|
|
c_output = os.path.basename(os.path.splitext(c_template)[0])
|
||
|
|
# We always set template as the first element in the source array
|
||
|
|
# so --template consumes it.
|
||
|
|
c_cmd = cmd + ['--template', '@INPUT@']
|
||
|
|
c_sources = [c_template] + sources
|
||
|
|
+
|
||
|
|
+ c_kwargs = custom_kwargs.copy()
|
||
|
|
# Never install the C file. Complain on bug tracker if you need it.
|
||
|
|
- custom_kwargs['install'] = False
|
||
|
|
+ c_kwargs['install'] = False
|
||
|
|
+ c_kwargs['install_dir'] = False
|
||
|
|
if h_template is not None:
|
||
|
|
if 'depends' in custom_kwargs:
|
||
|
|
- custom_kwargs['depends'] += [h_target]
|
||
|
|
+ c_kwargs['depends'] += [h_target]
|
||
|
|
else:
|
||
|
|
- custom_kwargs['depends'] = h_target
|
||
|
|
+ c_kwargs['depends'] = h_target
|
||
|
|
c_target = self._make_mkenum_custom_target(state, c_sources,
|
||
|
|
c_output, c_cmd,
|
||
|
|
- custom_kwargs)
|
||
|
|
+ c_kwargs)
|
||
|
|
targets.insert(0, c_target)
|
||
|
|
|
||
|
|
if c_template is None and h_template is None:
|
||
|
|
diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build
|
||
|
|
index 8ff05ba5ea24..4cf4dcf8a01a 100644
|
||
|
|
--- a/test cases/frameworks/7 gnome/mkenums/meson.build
|
||
|
|
+++ b/test cases/frameworks/7 gnome/mkenums/meson.build
|
||
|
|
@@ -34,9 +34,9 @@ enums_c2 = gnome.mkenums('abc2',
|
||
|
|
sources : 'meson-sample.h',
|
||
|
|
depends : [enums_h1, enums_h2],
|
||
|
|
c_template : 'enums2.c.in',
|
||
|
|
- ftail : '/* trailing source file info */',
|
||
|
|
- install_header : true,
|
||
|
|
- install_dir : get_option('includedir'))
|
||
|
|
+ ftail : '/* trailing source file info */')
|
||
|
|
+# explicitly don't set install_dir here, for bug testing
|
||
|
|
+# See https://github.com/mesonbuild/meson/issues/9472
|
||
|
|
|
||
|
|
conf = configuration_data()
|
||
|
|
conf.set('ENUM_FILE', 'enums2.h')
|