Upgrade libuv to v1.37.0 (#27684)

* Upgrade libuv to v1.42.0

Also eliminates some cruft from the node implementation from 5 years ago

* sanitize.sh added a blank line?? ok then.

* pin to libuv v1.37.0
pull/27704/head
AJ Heller 3 years ago committed by GitHub
parent 8907c891b7
commit 9841366806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      bazel/grpc_deps.bzl
  2. 7
      templates/tools/dockerfile/libuv_install.include
  3. 1
      templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
  4. 2
      third_party/libuv
  5. 3
      tools/dockerfile/test/cxx_jessie_x64/Dockerfile
  6. 3
      tools/run_tests/sanity/check_submodules.sh

@ -392,11 +392,11 @@ def grpc_deps():
http_archive( http_archive(
name = "libuv", name = "libuv",
build_file = "@com_github_grpc_grpc//third_party:libuv.BUILD", build_file = "@com_github_grpc_grpc//third_party:libuv.BUILD",
sha256 = "dfb4fe1ff0b47340978490a14bf253475159ecfcbad46ab2a350c78f9ce3360f", sha256 = "7afa3c8a326b3eed02a9addb584ae7e995ae4d30516cad5e1e4af911931162a6",
strip_prefix = "libuv-15ae750151ac9341e5945eb38f8982d59fb99201", strip_prefix = "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809",
urls = [ urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/15ae750151ac9341e5945eb38f8982d59fb99201.tar.gz", "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz",
"https://github.com/libuv/libuv/archive/15ae750151ac9341e5945eb38f8982d59fb99201.tar.gz", "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz",
], ],
) )

@ -1,7 +0,0 @@
#================
# libuv
RUN cd /tmp \
&& wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz \
&& tar -xf libuv-v1.9.1.tar.gz \
&& cd libuv-v1.9.1 \
&& sh autogen.sh && ./configure --prefix=/usr && make && make install

@ -22,7 +22,6 @@
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../cmake_jessie_backports.include"/> <%include file="../../cmake_jessie_backports.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
<%include file="../../libuv_install.include"/>
# Install gcc-4.9 and other relevant items # Install gcc-4.9 and other relevant items
RUN apt-get update && apt-get -y install gcc gcc-multilib g++ g++-multilib && apt-get clean RUN apt-get update && apt-get -y install gcc gcc-multilib g++ g++-multilib && apt-get clean

2
third_party/libuv vendored

@ -1 +1 @@
Subproject commit 15ae750151ac9341e5945eb38f8982d59fb99201 Subproject commit 02a9e1be252b623ee032a3137c0b0c94afbe6809

@ -85,9 +85,6 @@ RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get cl
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins
#================
# libuv
RUN cd /tmp && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz && tar -xf libuv-v1.9.1.tar.gz && cd libuv-v1.9.1 && sh autogen.sh && ./configure --prefix=/usr && make && make install
# Install gcc-4.9 and other relevant items # Install gcc-4.9 and other relevant items
RUN apt-get update && apt-get -y install gcc gcc-multilib g++ g++-multilib && apt-get clean RUN apt-get update && apt-get -y install gcc gcc-multilib g++ g++-multilib && apt-get clean

@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
set -e set -e
export TEST=true export TEST=true
@ -34,7 +33,7 @@ third_party/cares/cares e982924acee7f7313b4baa4ee5ec000c5e373c30
third_party/envoy-api 2f0d081fab0b0823f088c6e368f40e1992f46fcd third_party/envoy-api 2f0d081fab0b0823f088c6e368f40e1992f46fcd
third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92 third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92
third_party/googletest c9ccac7cb7345901884aabf5d1a786cfa6e2f397 third_party/googletest c9ccac7cb7345901884aabf5d1a786cfa6e2f397
third_party/libuv 15ae750151ac9341e5945eb38f8982d59fb99201 third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809
third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
third_party/protobuf 909a0f36a10075c4b4bc70fdee2c7e32dd612a72 third_party/protobuf 909a0f36a10075c4b4bc70fdee2c7e32dd612a72

Loading…
Cancel
Save