Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports-gnome
Path: blob/main/deskutils/bijiben/files/patch-src_libbiji_meson.build
17397 views
1
From 6dd31c362b264a7d7e5441310ee5baebb3769ac5 Mon Sep 17 00:00:00 2001
2
From: Michael Forney <mforney@mforney.org>
3
Date: Fri, 9 Apr 2021 21:45:13 -0700
4
Subject: [PATCH] Add generated biji-marshalers.h to libbiji dependency sources
5
6
The meson manual states that
7
8
> Each target that depends on a generated header should add that
9
> header to it's sources, as seen above with libfoo and myexe. This
10
> is because there is no way for Meson or the backend to know that
11
> myexe depends on foo.h just because libfoo does, it could be a
12
> private header.
13
14
Since biji-marshalers.h is included by the libbiji public header
15
libbiji.h, it must be added as a source to all targets that depend
16
on libbiji. This can be done by adding it to the sources of
17
libbiji_dep.
18
19
Fixes #157.
20
21
https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/116
22
23
--- src/libbiji/meson.build.orig 2020-09-20 21:32:11 UTC
24
+++ src/libbiji/meson.build
25
@@ -27,11 +27,9 @@ sources = files(
26
'../bjb-utils.c',
27
)
28
29
-marshalers = 'biji-marshalers'
30
-
31
-sources += gnome.genmarshal(
32
- marshalers,
33
- sources: marshalers + '.list',
34
+marshalers = gnome.genmarshal(
35
+ 'biji-marshalers',
36
+ sources: 'biji-marshalers.list',
37
prefix: '_biji_marshal'
38
)
39
40
@@ -48,7 +46,7 @@ endif
41
42
libbiji = static_library(
43
'biji',
44
- sources: sources,
45
+ sources: sources + marshalers,
46
include_directories: top_inc,
47
dependencies: deps,
48
c_args: cflags
49
@@ -57,5 +55,6 @@ libbiji = static_library(
50
libbiji_dep = declare_dependency(
51
link_with: libbiji,
52
include_directories: include_directories('.'),
53
- dependencies: deps
54
+ dependencies: deps,
55
+ sources: marshalers[1],
56
)
57
58