diff options
Diffstat (limited to 'meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch')
-rw-r--r-- | meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch index 896a568e19..cae68e948b 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001 | 1 | From ad4d22cd6b0b1237a4d50699736d38cd3c902ace Mon Sep 17 00:00:00 2001 |
2 | From: Xiangyu Chen <xiangyu.chen@windriver.com> | 2 | From: Xiangyu Chen <xiangyu.chen@windriver.com> |
3 | Date: Fri, 31 Mar 2023 16:02:50 +0800 | 3 | Date: Wed, 12 Mar 2025 00:16:24 -0700 |
4 | Subject: [PATCH] Makefile.am: do not compile the code which was generated from | 4 | Subject: [PATCH] Makefile.am: do not compile the code which was generated from |
5 | test-full.proto in protobuf-c-native | 5 | test-full.proto in protobuf-c-native |
6 | 6 | ||
@@ -11,15 +11,18 @@ the test-full.proto with latest version protobuf. | |||
11 | Upstream-Status: Inappropriate [oe specific] | 11 | Upstream-Status: Inappropriate [oe specific] |
12 | 12 | ||
13 | Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | 13 | Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> |
14 | |||
15 | Rebase to 1.5.1 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | 17 | --- |
15 | Makefile.am | 75 ----------------------------------------------------- | 18 | Makefile.am | 75 ----------------------------------------------------- |
16 | 1 file changed, 75 deletions(-) | 19 | 1 file changed, 75 deletions(-) |
17 | 20 | ||
18 | diff --git a/Makefile.am b/Makefile.am | 21 | diff --git a/Makefile.am b/Makefile.am |
19 | index ff12664..7412aef 100644 | 22 | index 77aa9d9..5cdd81a 100644 |
20 | --- a/Makefile.am | 23 | --- a/Makefile.am |
21 | +++ b/Makefile.am | 24 | +++ b/Makefile.am |
22 | @@ -136,81 +136,6 @@ else | 25 | @@ -138,81 +138,6 @@ else |
23 | 26 | ||
24 | LOG_COMPILER = $(VALGRIND) | 27 | LOG_COMPILER = $(VALGRIND) |
25 | 28 | ||
@@ -72,20 +75,20 @@ index ff12664..7412aef 100644 | |||
72 | -t_generated_code2_cxx_generate_packed_data_LDADD = \ | 75 | -t_generated_code2_cxx_generate_packed_data_LDADD = \ |
73 | - $(protobuf_LIBS) | 76 | - $(protobuf_LIBS) |
74 | - | 77 | - |
75 | -t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto | 78 | -t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto |
76 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto | 79 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
77 | - | 80 | - |
78 | -t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto | 81 | -t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto |
79 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto | 82 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto |
80 | - | 83 | - |
81 | -t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto | 84 | -t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto |
82 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto | 85 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
83 | - | 86 | - |
84 | -t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto | 87 | -t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto |
85 | - $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto | 88 | - $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
86 | - | 89 | - |
87 | -t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto | 90 | -t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto |
88 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto | 91 | - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto |
89 | - | 92 | - |
90 | -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) | 93 | -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) |
91 | - $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc | 94 | - $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc |
@@ -102,5 +105,5 @@ index ff12664..7412aef 100644 | |||
102 | t/version/version.c | 105 | t/version/version.c |
103 | t_version_version_LDADD = \ | 106 | t_version_version_LDADD = \ |
104 | -- | 107 | -- |
105 | 2.34.1 | 108 | 2.25.1 |
106 | 109 | ||