summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch')
-rw-r--r--meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch235
1 files changed, 0 insertions, 235 deletions
diff --git a/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch b/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch
deleted file mode 100644
index b58a658b92..0000000000
--- a/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch
+++ /dev/null
@@ -1,235 +0,0 @@
1From c7806af2957627151ef603ad4aa893ca1a4bf59e Mon Sep 17 00:00:00 2001
2From: Siyu Zhang <siyu.zhang@windriver.com>
3Date: Sat, 10 Sep 2016 15:44:10 +0200
4Subject: [PATCH 1/1] Added option to provide kea-msg-compiler
5
6Upstream-Status: Inappropriate[oe specific]
7
8Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
9---
10 configure.ac | 18 ++++++++++++++++++
11 src/bin/d2/Makefile.am | 2 +-
12 src/bin/dhcp4/Makefile.am | 2 +-
13 src/bin/dhcp6/Makefile.am | 2 +-
14 src/bin/lfc/Makefile.am | 2 +-
15 src/hooks/dhcp/user_chk/Makefile.am | 2 +-
16 src/lib/asiodns/Makefile.am | 2 +-
17 src/lib/config/Makefile.am | 2 +-
18 src/lib/dhcp_ddns/Makefile.am | 2 +-
19 src/lib/dhcpsrv/Makefile.am | 6 +++---
20 src/lib/eval/Makefile.am | 2 +-
21 src/lib/hooks/Makefile.am | 2 +-
22 src/lib/log/Makefile.am | 8 +++++++-
23 src/lib/log/tests/Makefile.am | 2 +-
24 14 files changed, 39 insertions(+), 15 deletions(-)
25
26diff --git a/configure.ac b/configure.ac
27index ea41f08..edb5120 100644
28--- a/configure.ac
29+++ b/configure.ac
30@@ -202,6 +202,24 @@ case "$host" in
31 esac
32 KEA_CXXFLAGS="$KEA_CXXFLAGS $MULTITHREADING_FLAG"
33
34+AC_MSG_CHECKING(whether kea-msg-compiler is provided)
35+AC_ARG_WITH(msg-compiler,
36+ AC_HELP_STRING([--with-msg-compiler=PATH], [use provided kea-msg-compiler instead of local build]),
37+ [
38+ dnl TODO: Validate provided kea-msg-compiler
39+ AC_SUBST([KEA_MSG_COMPILER], [${withval}])
40+ AC_MSG_RESULT(${withval})],
41+ [
42+ AC_MSG_RESULT([no])
43+ if test x"$host" != x"$build" && test x"$host" == x"$target"; then
44+ AC_MSG_ERROR(native kea-msg-compiler not provided for cross compilation: build=${build} host=${host} target=${target})
45+ else
46+ AC_SUBST([KEA_MSG_COMPILER], ['$(top_builddir)/src/lib/log/compiler/kea-msg-compiler'])
47+ with_msg_compiler=no
48+ fi])
49+
50+AM_CONDITIONAL([HAVE_MSG_COMPILER], [test x"$with_msg_compiler" != x"no"])
51+
52 # Disable -Werror by default. Only use it if specifically enabled.
53 # The usage of this flag is:
54 #
55diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
56index 0b4e7d5..40cc094 100644
57--- a/src/bin/d2/Makefile.am
58+++ b/src/bin/d2/Makefile.am
59@@ -53,7 +53,7 @@ spec_config.h: spec_config.h.pre
60 d2_messages.h d2_messages.cc: s-messages
61
62 s-messages: d2_messages.mes
63- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/d2/d2_messages.mes
64+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/d2/d2_messages.mes
65 touch $@
66
67 BUILT_SOURCES = d2_messages.h d2_messages.cc
68diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
69index 8360677..57acb91 100644
70--- a/src/bin/dhcp4/Makefile.am
71+++ b/src/bin/dhcp4/Makefile.am
72@@ -47,7 +47,7 @@ spec_config.h: spec_config.h.pre
73 dhcp4_messages.h dhcp4_messages.cc: s-messages
74
75 s-messages: dhcp4_messages.mes
76- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes
77+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes
78 touch $@
79
80 BUILT_SOURCES = spec_config.h dhcp4_messages.h dhcp4_messages.cc
81diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
82index 47155ae..d7ed722 100644
83--- a/src/bin/dhcp6/Makefile.am
84+++ b/src/bin/dhcp6/Makefile.am
85@@ -48,7 +48,7 @@ spec_config.h: spec_config.h.pre
86 dhcp6_messages.h dhcp6_messages.cc: s-messages
87
88 s-messages: dhcp6_messages.mes
89- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes
90+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes
91 touch $@
92
93 BUILT_SOURCES = spec_config.h dhcp6_messages.h dhcp6_messages.cc
94diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
95index 7bfeb96..09a700e 100644
96--- a/src/bin/lfc/Makefile.am
97+++ b/src/bin/lfc/Makefile.am
98@@ -32,7 +32,7 @@ endif
99 lfc_messages.h lfc_messages.cc: s-messages
100
101 s-messages: lfc_messages.mes
102- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/lfc/lfc_messages.mes
103+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/lfc/lfc_messages.mes
104 touch $@
105
106 BUILT_SOURCES = lfc_messages.h lfc_messages.cc
107diff --git a/src/hooks/dhcp/user_chk/Makefile.am b/src/hooks/dhcp/user_chk/Makefile.am
108index 41ad7b2..32a93412 100644
109--- a/src/hooks/dhcp/user_chk/Makefile.am
110+++ b/src/hooks/dhcp/user_chk/Makefile.am
111@@ -7,7 +7,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS)
112 # Define rule to build logging source files from message file
113 user_chk_messages.h user_chk_messages.cc: s-messages
114 s-messages: user_chk_messages.mes
115- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/user_chk/user_chk_messages.mes
116+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/hooks/dhcp/user_chk/user_chk_messages.mes
117 touch $@
118
119 # Tell automake that the message files are built as part of the build process
120diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
121index 24dfe05..60c9f80 100644
122--- a/src/lib/asiodns/Makefile.am
123+++ b/src/lib/asiodns/Makefile.am
124@@ -11,7 +11,7 @@ CLEANFILES = *.gcno *.gcda asiodns_messages.h asiodns_messages.cc s-messages
125 asiodns_messages.h asiodns_messages.cc: s-messages
126
127 s-messages: asiodns_messages.mes
128- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes
129+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes
130 touch $@
131
132 BUILT_SOURCES = asiodns_messages.h asiodns_messages.cc
133diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
134index a89d530..26894ad 100644
135--- a/src/lib/config/Makefile.am
136+++ b/src/lib/config/Makefile.am
137@@ -7,7 +7,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
138 config_messages.h config_messages.cc: s-messages
139
140 s-messages: config_messages.mes
141- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/config/config_messages.mes
142+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/config/config_messages.mes
143 touch $@
144
145 BUILT_SOURCES = config_messages.h config_messages.cc
146diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
147index 820f448..fe15533 100644
148--- a/src/lib/dhcp_ddns/Makefile.am
149+++ b/src/lib/dhcp_ddns/Makefile.am
150@@ -8,7 +8,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS)
151 dhcp_ddns_messages.h dhcp_ddns_messages.cc: s-messages
152
153 s-messages: dhcp_ddns_messages.mes
154- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
155+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
156 touch $@
157
158 # Tell automake that the message files are built as part of the build process
159diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
160index db95dbd..6499b9f 100644
161--- a/src/lib/dhcpsrv/Makefile.am
162+++ b/src/lib/dhcpsrv/Makefile.am
163@@ -52,11 +52,11 @@ alloc_engine_messages.h alloc_engine_messages.cc dhcpsrv_messages.h \
164 dhcpsrv_messages.cc hosts_messages.h hosts_messages.cc: s-messages
165
166 s-messages: alloc_engine_messages.mes dhcpsrv_messages.mes hosts_messages.mes
167- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes
168+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes
169 touch $@
170- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes
171+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes
172 touch $@
173- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes
174+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes
175 touch $@
176
177 # Tell Automake that the {alloc_engine,dhcpsrv,hosts}_messages.{cc,h} source files
178diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
179index e4968c1..f8464f8 100644
180--- a/src/lib/eval/Makefile.am
181+++ b/src/lib/eval/Makefile.am
182@@ -47,7 +47,7 @@ EXTRA_DIST += lexer.ll parser.yy
183 eval_messages.h eval_messages.cc: s-messages
184
185 s-messages: eval_messages.mes
186- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/eval/eval_messages.mes
187+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/eval/eval_messages.mes
188 touch $@
189
190 # Tell Automake that the eval_messages.{cc,h} source files are created in the
191diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
192index 624e227..3458da8 100644
193--- a/src/lib/hooks/Makefile.am
194+++ b/src/lib/hooks/Makefile.am
195@@ -8,7 +8,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS)
196 hooks_messages.h hooks_messages.cc: s-messages
197
198 s-messages: hooks_messages.mes
199- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/hooks/hooks_messages.mes
200+ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/hooks/hooks_messages.mes
201 touch $@
202
203 # Tell automake that the message files are built as part of the build process
204diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
205index e1185cd..22e9ce6 100644
206--- a/src/lib/log/Makefile.am
207+++ b/src/lib/log/Makefile.am
208@@ -1,4 +1,10 @@
209-SUBDIRS = interprocess . compiler tests
210+SUBDIRS = interprocess .
211+
212+if !HAVE_MSG_COMPILER
213+SUBDIRS += compiler
214+endif
215+
216+SUBDIRS += tests
217
218 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
219 AM_CPPFLAGS += $(BOOST_INCLUDES)
220diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
221index 03806f9..caf9cab 100644
222--- a/src/lib/log/tests/Makefile.am
223+++ b/src/lib/log/tests/Makefile.am
224@@ -17,7 +17,7 @@ BUILT_SOURCES = log_test_messages.h log_test_messages.cc
225 log_test_messages.h log_test_messages.cc: s-messages
226
227 s-messages: log_test_messages.mes
228- $(AM_V_GEN) $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/tests/log_test_messages.mes
229+ $(AM_V_GEN) @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/log/tests/log_test_messages.mes
230 touch $@
231
232 CLEANFILES += log_test_messages.h log_test_messages.cc s-messages
233--
2341.8.4.2
235
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-29 04:23:34 +0000