diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-07-19 14:13:00 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-07-26 20:10:07 -0700 |
commit | 2f5819d9c37387764a600d9dc8d22bee8a71f710 (patch) | |
tree | 55cb9f395fc659630885d305ffa1105095424f41 /meta-oe/recipes-devtools/protobuf | |
parent | c031adb61d36ada4ac9afeadeaa64d43ffb76323 (diff) | |
download | meta-openembedded-2f5819d9c37387764a600d9dc8d22bee8a71f710.tar.gz |
protobuf: upgrade 3.5.1 -> 3.6.0.1
License-Update: copyright year updated and clean some useless content
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/protobuf')
-rw-r--r-- | meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/protobuf/protobuf_3.6.0.1.bb (renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb) | 14 |
2 files changed, 43 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch new file mode 100644 index 000000000..a2f7a4b77 --- /dev/null +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 52959e8e01e39139d18f752e97283e45b4b7a426 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Wed, 18 Jul 2018 17:52:34 +0800 | ||
4 | Subject: [PATCH] protobuf: fix configure error | ||
5 | |||
6 | fix below error: | ||
7 | gnu-configize: 'configure.ac' or 'configure.in' is required | ||
8 | |||
9 | third_party/googletest is git submodule of protobuf. Above error | ||
10 | caused by missing submodule googletest. | ||
11 | |||
12 | Upstream-Status: Inappropriate [oe-specific] | ||
13 | |||
14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
15 | --- | ||
16 | configure.ac | 1 - | ||
17 | 1 file changed, 1 deletion(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index aec10cf..7fbe57d 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -214,7 +214,6 @@ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) | ||
24 | # too. | ||
25 | export CFLAGS | ||
26 | export CXXFLAGS | ||
27 | -AC_CONFIG_SUBDIRS([third_party/googletest]) | ||
28 | |||
29 | AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) | ||
30 | AC_OUTPUT | ||
31 | -- | ||
32 | 2.7.4 | ||
33 | |||
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.0.1.bb index 8cef391bd..58507442a 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.0.1.bb | |||
@@ -5,18 +5,19 @@ all of its internal RPC protocols and file formats." | |||
5 | HOMEPAGE = "https://github.com/google/protobuf" | 5 | HOMEPAGE = "https://github.com/google/protobuf" |
6 | SECTION = "console/tools" | 6 | SECTION = "console/tools" |
7 | LICENSE = "BSD-3-Clause" | 7 | LICENSE = "BSD-3-Clause" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" |
9 | 9 | ||
10 | DEPENDS = "zlib" | 10 | DEPENDS = "zlib" |
11 | DEPENDS_append_class-target = " protobuf-native" | 11 | DEPENDS_append_class-target = " protobuf-native" |
12 | 12 | ||
13 | PV .= "+git${SRCPV}" | 13 | PV .= "+git${SRCPV}" |
14 | SRCREV = "106ffc04be1abf3ff3399f54ccf149815b287dd9" | ||
15 | 14 | ||
16 | SRC_URI = "git://github.com/google/protobuf.git;branch=3.5.x \ | 15 | SRCREV = "ce044817c7ba0aea27c3fd8e496635d94d20a755" |
16 | |||
17 | SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \ | ||
17 | file://run-ptest \ | 18 | file://run-ptest \ |
19 | file://0001-protobuf-fix-configure-error.patch \ | ||
18 | " | 20 | " |
19 | |||
20 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
21 | 22 | ||
22 | inherit autotools-brokensep pkgconfig ptest | 23 | inherit autotools-brokensep pkgconfig ptest |
@@ -82,3 +83,8 @@ RDEPENDS_${PN}-ptest = "bash python-protobuf" | |||
82 | MIPS_INSTRUCTION_SET = "mips" | 83 | MIPS_INSTRUCTION_SET = "mips" |
83 | 84 | ||
84 | BBCLASSEXTEND = "native nativesdk" | 85 | BBCLASSEXTEND = "native nativesdk" |
86 | |||
87 | LDFLAGS_append_arm = " -latomic" | ||
88 | LDFLAGS_append_mips = " -latomic" | ||
89 | LDFLAGS_append_powerpc = " -latomic" | ||
90 | LDFLAGS_append_mipsel = " -latomic" | ||