Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:dirkmueller:acdc:as_python3_module
meson-testsuite
meson-use-header-basename-in-mkenums_simple.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File meson-use-header-basename-in-mkenums_simple.patch of Package meson-testsuite
From c5865c50c444912afd92c2feb94d8739874a62b2 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan <nirbheek@centricular.com> Date: Sat, 5 May 2018 16:50:27 +0530 Subject: [PATCH] gnome: Use the header basename for #include in mkenums_simple Otherwise, when you use a File target, the value will be the full path to the header from the build root, which is not what anyone wants. --- mesonbuild/modules/gnome.py | 2 +- test cases/frameworks/7 gnome/mkenums/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 84943dc56a..12f6412fd0 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1128,7 +1128,7 @@ def mkenums_simple(self, state, args, kwargs): fhead += '%s\n' % body_prefix fhead += '#include "%s"\n' % hdr_filename for hdr in sources: - fhead += '#include "%s"\n' % hdr + fhead += '#include "%s"\n' % os.path.basename(str(hdr)) fhead += ''' #define C_ENUM(v) ((gint) v) #define C_FLAGS(v) ((guint) v) diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build index 44c21cba4d..ff3161991c 100644 --- a/test cases/frameworks/7 gnome/mkenums/meson.build +++ b/test cases/frameworks/7 gnome/mkenums/meson.build @@ -118,7 +118,7 @@ enumexe3 = executable('enumprog3', main, enums_c3, enums_h3, dependencies : gobj) test('enum test 3', enumexe3) -enums4 = gnome.mkenums_simple('enums4', sources : 'meson-sample.h', +enums4 = gnome.mkenums_simple('enums4', sources : files('meson-sample.h'), function_prefix : '_') enumexe4 = executable('enumprog4', 'main4.c', enums4, dependencies : gobj)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor