Skip to contentSkip to conversation

c-ares: support host build

PATCH Superseded Robert Rose 1 participant 2 messages Nov 29, 2018

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Robert Rose

author
#0 lore raw

PATCH v3 1/2 c-ares: support host build

From: Robert Rose <[email protected]>

Signed-off-by Robert Rose <[email protected]>
---
 package/c-ares/c-ares.mk | 1 +
 1 file changed, 1 insertion(+)
package/c-ares/c-ares.mk +1 -0
index 67254244a1..76e9687b37 100644
@@ -15,3 +15,4 @@ C_ARES_LICENSE = MIT
 C_ARES_LICENSE_FILES = ares_mkquery.c
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 1 line
2.20.0.rc0.387.gc7a69e6b6c-goog
author
#1 lore raw

PATCH v3 2/2 grpc: new package

From: Robert Rose <[email protected]>

Signed-off-by Robert Rose <[email protected]>
---
 DEVELOPERS                                    |  3 ++
 package/Config.in                             |  1 +
 .../0001-target-build-using-host-plugin.patch | 26 ++++++++++++++
 package/grpc/Config.in                        | 11 ++++++
 package/grpc/grpc.hash                        |  5 +++
 package/grpc/grpc.mk                          | 36 +++++++++++++++++++
 6 files changed, 82 insertions(+)
 create mode 100644 package/grpc/0001-target-build-using-host-plugin.patch
 create mode 100644 package/grpc/Config.in
 create mode 100644 package/grpc/grpc.hash
 create mode 100644 package/grpc/grpc.mk
DEVELOPERS +3 -0
index 53467da489..437614c190 100644
@@ -1772,6 +1772,9 @@ F:	package/subversion/
 N:	RJ Ascani <[email protected]>
 F:	package/azmq/
 
+N:	Robert Rose <[email protected]>
+F:	package/grpc
+
 N:	Rodrigo Rebello <[email protected]>
 F:	package/chocolate-doom/
 F:	package/irssi/
package/Config.in +1 -0
index b60e7700ad..2d0cc51797 100644
@@ -1495,6 +1495,7 @@ menu "Networking"
 	source "package/freeradius-client/Config.in"
 	source "package/geoip/Config.in"
 	source "package/glib-networking/Config.in"
+	source "package/grpc/Config.in"
 	source "package/gssdp/Config.in"
 	source "package/gupnp/Config.in"
 	source "package/gupnp-av/Config.in"
package/grpc/0001-target-build-using-host-plugin.patch new file +26 -0
new file mode 100644
index 0000000000..379464916a
@@ -0,0 +1,26 @@
+From f7e70f03167834ce5e221c7dbca936edb1662274 Mon Sep 17 00:00:00 2001
+From: Robert Rose <[email protected]>
+Date: Sun, 18 Nov 2018 12:55:49 -0800
+Subject: [PATCH 1/1] target build using host plugin
+
+Signed-off-by: Robert Rose <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ab1802e..1b44c3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,7 @@ function(protobuf_generate_grpc_cpp)
+       COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
+       ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
+            --cpp_out=${_gRPC_PROTO_GENS_DIR}
+-           --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin>
++           --plugin=protoc-gen-grpc=$<IF:$<BOOL:${gRPC_NATIVE_CPP_PLUGIN}>,${gRPC_NATIVE_CPP_PLUGIN},$<TARGET_FILE:grpc_cpp_plugin>>
+            ${_protobuf_include_path}
+            ${REL_FIL}
+       DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin
+-- 
+2.19.1
+
package/grpc/Config.in new file +11 -0
new file mode 100644
index 0000000000..e4364c2fe6
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_GRPC
+	bool "grpc"
+	select BR2_PACKAGE_C_ARES
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_PROTOBUF
+	select BR2_PACKAGE_ZLIB
+	help
+	  A language-neutral, platform-neutral, open source, remote
+	  procedure call (RPC) system initially developed at Google.
+
+	  http://github.com/grpc/grpc
package/grpc/grpc.hash new file +5 -0
new file mode 100644
index 0000000000..8a1df947fd
@@ -0,0 +1,5 @@
+# Locally computed
+sha256 a5342629fe1b689eceb3be4d4f167b04c70a84b9d61cf8b555e968bc500bdb5a grpc-v1.16.1.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
+
+
package/grpc/grpc.mk new file +36 -0
new file mode 100644
index 0000000000..1aa5447386
@@ -0,0 +1,36 @@
+################################################################################
+#
+# grpc
+#
+################################################################################
+
+GRPC_VERSION = v1.16.1
+GRPC_SOURCE = grpc-$(GRPC_VERSION).tar.gz
+GRPC_SITE = $(call github,grpc,grpc,$(GRPC_VERSION))
+GRPC_LICENSE = Apache-2.0
+GRPC_LICENSE_FILES = LICENSE
+
+GRPC_INSTALL_STAGING = YES
+
+# Need to use host grpc_cpp_plugin during cross compilation.
+GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib
+HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib
+
+GRPC_CONF_OPTS = \
+         -D_gRPC_CARES_LIBRARIES=cares \
+         -DgRPC_CARES_PROVIDER=none \
+         -DgRPC_PROTOBUF_PROVIDER=package \
+         -DgRPC_SSL_PROVIDER=package \
+         -DgRPC_ZLIB_PROVIDER=package \
+         -DgRPC_NATIVE_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin
+
+HOST_GRPC_CONF_OPTS = \
+         -D_gRPC_CARES_LIBRARIES=cares \
+         -DgRPC_CARES_PROVIDER=none \
+         -DgRPC_CARES_PROVIDER=none \
+         -DgRPC_PROTOBUF_PROVIDER=package \
+         -DgRPC_SSL_PROVIDER=package \
+         -DgRPC_ZLIB_PROVIDER=package
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
Signature · 1 line
2.20.0.rc0.387.gc7a69e6b6c-goog