[13/17] protobuf-c: upgrade 1.3.3 -> 1.4.0

Submitted by Andreas Müller on May 22, 2021, 1:35 a.m. | Patch ID: 179756

Details

Message ID 20210522013521.588774-13-schnitzeltony@gmail.com
State Master Next
Commit ab2f1b9095871bd7cf2f1c6d3b0ffb5527681b54
Headers show

Commit Message

Andreas Müller May 22, 2021, 1:35 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../protobuf-c/0001-avoid-race-condition.patch         | 10 +++++-----
 .../{protobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb}       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb} (96%)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
index 4fc7703d8..17fa14092 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
@@ -20,17 +20,17 @@  Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.am b/Makefile.am
-index b0cb065..1608ae0 100644
+index c7339ef..882756d 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -156,6 +156,7 @@ noinst_PROGRAMS += \
- t_generated_code2_cxx_generate_packed_data_SOURCES = \
+@@ -166,6 +166,7 @@ t_generated_code2_cxx_generate_packed_data_SOURCES = \
  	t/generated-code2/cxx-generate-packed-data.cc \
- 	t/test-full.pb.cc
+ 	t/test-full.pb.cc \
+ 	protobuf-c/protobuf-c.pb.cc
 +t/generated-code2/cxx-generate-packed-data.cc: t/test-full.pb.h
  $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
  t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
  	$(AM_CXXFLAGS) \
 -- 
-2.17.1
+2.31.1
 
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
similarity index 96%
rename from meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
index 6fef0bed2..85172047a 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
@@ -12,7 +12,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558"
 
 DEPENDS = "protobuf-native protobuf"
 
-SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26"
+SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907"
 
 SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
            file://0001-avoid-race-condition.patch \

Comments

Khem Raj May 22, 2021, 12:44 p.m.
seeing errors

https://errors.yoctoproject.org/Errors/Details/585453/
https://errors.yoctoproject.org/Errors/Details/585452/

On Fri, May 21, 2021 at 6:35 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../protobuf-c/0001-avoid-race-condition.patch         | 10 +++++-----
>  .../{protobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb}       |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>  rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb} (96%)
>
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> index 4fc7703d8..17fa14092 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> @@ -20,17 +20,17 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>   1 file changed, 1 insertion(+)
>
>  diff --git a/Makefile.am b/Makefile.am
> -index b0cb065..1608ae0 100644
> +index c7339ef..882756d 100644
>  --- a/Makefile.am
>  +++ b/Makefile.am
> -@@ -156,6 +156,7 @@ noinst_PROGRAMS += \
> - t_generated_code2_cxx_generate_packed_data_SOURCES = \
> +@@ -166,6 +166,7 @@ t_generated_code2_cxx_generate_packed_data_SOURCES = \
>         t/generated-code2/cxx-generate-packed-data.cc \
> -       t/test-full.pb.cc
> +       t/test-full.pb.cc \
> +       protobuf-c/protobuf-c.pb.cc
>  +t/generated-code2/cxx-generate-packed-data.cc: t/test-full.pb.h
>   $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
>   t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
>         $(AM_CXXFLAGS) \
>  --
> -2.17.1
> +2.31.1
>
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
> similarity index 96%
> rename from meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
> rename to meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
> index 6fef0bed2..85172047a 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
> @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558"
>
>  DEPENDS = "protobuf-native protobuf"
>
> -SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26"
> +SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907"
>
>  SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
>             file://0001-avoid-race-condition.patch \
> --
> 2.31.1
>
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91468): https://lists.openembedded.org/g/openembedded-devel/message/91468
Mute This Topic: https://lists.openembedded.org/mt/83000591/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Andreas Müller May 22, 2021, 3:15 p.m.
On Sat, May 22, 2021 at 2:45 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> seeing errors
>
> https://errors.yoctoproject.org/Errors/Details/585453/
> https://errors.yoctoproject.org/Errors/Details/585452/

Look like [1] - will adjust to CMake tonight and send V2.

[1] https://github.com/protocolbuffers/protobuf/issues/5144

Andreas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91470): https://lists.openembedded.org/g/openembedded-devel/message/91470
Mute This Topic: https://lists.openembedded.org/mt/83000591/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-