From e6154c685d2fe3831e9558da6849969624bebcd3 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Thu, 21 Jun 2018 23:38:22 +0200 Subject: [PATCH 1/2] Updating submodule, and tagging version as 1.12.4 --- packages/grpc-native-core/build.yaml | 2 +- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index addd757b2..a14a8c63f 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,3 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. - node_version: 1.12.3 + node_version: 1.12.4 diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index bec3b5ada..ca08fd9f9 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit bec3b5ada2c5e5d782dff0b7b5018df646b65cb0 +Subproject commit ca08fd9f9b8043c6ce18071698d8d98b5b7ea1b0 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index d57db163c..c12078ee7 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.12.3", + "version": "1.12.4", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From 9963bbc4e695e8063280fc7ed3db81e5ce3b5006 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 22 Jun 2018 00:00:49 +0200 Subject: [PATCH 2/2] Somehow, nanobp is unhappy now. --- packages/grpc-native-core/binding.gyp | 1 + packages/grpc-native-core/templates/binding.gyp.template | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 67f5a2c3b..37fdb3549 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -85,6 +85,7 @@ ], 'defines': [ 'PB_FIELD_16BIT', + 'PB_NO_PACKED_STRUCTS=1', 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV' diff --git a/packages/grpc-native-core/templates/binding.gyp.template b/packages/grpc-native-core/templates/binding.gyp.template index 85ddbe655..30cca7c2d 100644 --- a/packages/grpc-native-core/templates/binding.gyp.template +++ b/packages/grpc-native-core/templates/binding.gyp.template @@ -79,6 +79,7 @@ ], 'defines': [ 'PB_FIELD_16BIT', + 'PB_NO_PACKED_STRUCTS=1', 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV'