[oe,meta-oe,2/2] grpc: Update to 1.8.5

Message ID 20180201014414.12948-2-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-networking,1/2] net-snmp: Fix compiler options with paths in net-snmp-config
Related show

Commit Message

Khem Raj Feb. 1, 2018, 1:44 a.m.
Switch to Unix Makefiles in cmake generator, it
could not be built with ninja

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...01-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch | 0
 ...01-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0
 ...001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 0
 ...01-use-the-right-protoc-executable-regardless-of-protob.patch | 0
 meta-oe/recipes-devtools/grpc/{grpc_1.6.6.bb => grpc_1.8.5.bb}   | 9 +++++----
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch (100%)
 rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch (100%)
 rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch (100%)
 rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-use-the-right-protoc-executable-regardless-of-protob.patch (100%)
 rename meta-oe/recipes-devtools/grpc/{grpc_1.6.6.bb => grpc_1.8.5.bb} (78%)

-- 
2.16.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch
similarity index 100%
rename from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch
rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch
diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
similarity index 100%
rename from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
similarity index 100%
rename from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-use-the-right-protoc-executable-regardless-of-protob.patch
similarity index 100%
rename from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch
rename to meta-oe/recipes-devtools/grpc/grpc/0001-use-the-right-protoc-executable-regardless-of-protob.patch
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb b/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
similarity index 78%
rename from meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb
rename to meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
index 6fde33d85..c37cc4411 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
@@ -10,12 +10,11 @@  DEPENDS_append_class-target = " gtest grpc-native "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI = "https://github.com/grpc/grpc/archive/v1.6.6.tar.gz"
-SRC_URI[md5sum] = "a960878ad0231189d48ac8ff17eeca3c"
-SRC_URI[sha256sum] = "b97eaa0c8a63b0492dc94bdad621795b4815278e841f06b0c78d6bcbd4c8bdec"
+SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz"
+SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e"
+SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de"
 
 SRC_URI += " \
-    file://0001-use-the-right-protoc-executable-regardless-of-protob.patch \
     file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \
 "
 
@@ -33,6 +32,8 @@  EXTRA_OECMAKE = " \
     -DBUILD_SHARED_LIBS=ON \
     "
 
+OECMAKE_GENERATOR = "Unix Makefiles"
+
 FILES_${PN}-dev += "${libdir}/cmake"
 
 BBCLASSEXTEND = "native"