Bazel: update ngx_brotli to 5ead1ad and Brotli to 222564a. This update includes the following changes in ngx_brotli: 5ead1ad Brotli: update Brotli to 222564a. 228db0f Brotli: bundle Brotli library. 4af1741 Brotli: fix build after recent changes in libbrotli. baebc45 Brotli: link against libm. This update includes the following changes in Brotli: 222564a Fix encoder (#472) 6a4bf43 Fix build with -Wconditional-uninitialized. (#471) 396309a Update (#470) 5db62dc Fixes: (#468) 1e5ea6a Python: Add unit tests for brotli.compress and brotli.decompress (#467) 1275076 bro: check return values of chown and chmod (#465) 6c47009 FInishing touches for installing libbrotli with CMake (#464) e9b278a Update docs and add more java tests (#463) a260b6b Python: Add tests for streamed compression (#458) 9203765 Python: Use "build" instead of "build_ext" in scripts (#460) 1a8ee40 Python: Run Appveyor tests in CMD mode (#461) 3b9d4a2 enable rbit instruction for arm64 (#459) 4e157c4 Update API (#457) afb1272 Python: Publicly expose the Compressor object in the Python API (#456) 5632315 Python: Support streamed compression with the Compressor object (#448) 678f862 Fix OSX gcc-4.x compilation (#455) b1db6f1 Fix `-Wcast-align` warnings 82c297f Fix build instructions for cmake 8bcaabb Fix "take output" flush workflow. b93cb69 * leave static compilation declaration intouch (e.g. Python build) f5ba0b6 (compress_fragment_two_pass) 69982c2 Build shared libraries by default d18c736 Fix POM files sources paths b04f4ea Python: Update README with information about code formatting 595a524 Python: Create an extension Compressor object 9521d96 Eliminate more magic constants. f7b5b3d Python: Create native brotli module and move extension to _brotli 5025365 Add Java port of Brotli decoder. 8db7411 Add some basic build instructions in the README.md #166 1c77766 CMake: Also add ARCHIVE DESTINATION for non-WIN32 ed2748a Remove the underscore in the name of brotli libraries. #326 6f55ee6 Python: Clean up setup.py file 9389876 Add ARCHIVE destination for Windows. c41962f Use install directories provided by GNUInstallDirs. db4cfc1 Use system version of compiler with macpython 82536d2 Also install the libraries and headers when building static libraries. cd8153a Do not install the public headers on WIN32. #326 9393340 Actually use BROTLI_INCLUDE_DIRS to get the path to headers. 89a77a9 Also install the brotli headers when building the shared libraries. #326 dd8fa3e Update research 0a63f99 Update encoder 86fdb68 Update brotlimodule.cc 7cbdb4a Update brotlimodule.cc de1007f Fix uid/gid types b754f60 Update python module 9223fd4 Update bro tool: f20b3ee Update decoder: ea9c51e Update .travis.yml 887f6fd Fix integration build 9294022 Replace sais.hxx by submodule hillbig/esaxx. 4291932 Update research tools description. 0e52c59 Update variable naming. 9589396 Add description of research tools. 58cecf1 Add distance encoding research tools. 214629c check for __ARM64_ARCH_8__ in dec/port.h so that arm64 arch under clang is detected, check for __ARM_ARCH being exactly equal to 7 so that arm64 arch does not define BROTLI_TARGET_ARMV7 Change-Id: I24d1fc5db39bc2ee78b051aabfe64980b6e7318d Signed-off-by: Piotr Sikora <piotrsikora@google.com> Reviewed-on: https://nginx-review.googlesource.com/2660 Reviewed-by: Gurgen Hrachyan <gugo@google.com>
diff --git a/BUILD b/BUILD index 953f138..efc249a 100644 --- a/BUILD +++ b/BUILD
@@ -1400,9 +1400,9 @@ srcs = [ ":LICENSE", "@boringssl//:LICENSE", - "@io_brotli//:LICENSE", "@nginx_pcre//:LICENCE", "@nginx_zlib//:README", + "@org_brotli//:LICENSE", ], outs = [ "usr/share/doc/nginx-google/copyright", @@ -1414,7 +1414,7 @@ "echo \"\n\nBoringSSL license:\n==================\n\" >> $(@);" + "cat $(location @boringssl//:LICENSE) >> $(@);" + "echo \"\n\nBrotli license:\n===============\n\" >> $(@);" + - "cat $(location @io_brotli//:LICENSE) >> $(@);" + + "cat $(location @org_brotli//:LICENSE) >> $(@);" + "echo \"\n\nPCRE license:\n=============\n\" >> $(@);" + "cat $(location @nginx_pcre//:LICENCE) >> $(@);" + "echo \"\n\nzlib license:\n=============\n\" >> $(@);" +
diff --git a/build.bzl b/build.bzl index 3f2de41..79fc28c 100644 --- a/build.bzl +++ b/build.bzl
@@ -81,7 +81,9 @@ srcs = [ "src/ngx_http_brotli_filter_module.c", ], - copts = nginx_copts, + copts = nginx_copts + [ + "-Wno-deprecated-declarations", + ], defines = [ "NGX_HTTP_BROTLI_FILTER", ], @@ -622,27 +624,27 @@ def nginx_repositories_brotli(bind): native.git_repository( - name = "io_brotli", - commit = "5ce9bf11b3fe0924d87b2a2d47eb7a53a76a4421", # 2016-08-29 + name = "org_brotli", + commit = "222564a95d9ab58865a096b8d9f7324ea5f2e03e", # 2016-12-02 remote = "https://github.com/google/brotli.git", ) if bind: native.bind( name = "brotli_enc", - actual = "@io_brotli//:brotli_enc" + actual = "@org_brotli//:brotlienc" ) native.bind( name = "brotli_dec", - actual = "@io_brotli//:brotli_dec" + actual = "@org_brotli//:brotlidec" ) def nginx_repositories_ngx_brotli(nginx): native.new_git_repository( name = "ngx_brotli", build_file_content = _NGX_BROTLI_BUILD_FILE.format(nginx = nginx), - commit = "01a2a6555f436f3b7ae5191d423b23a95f7d0169", # 2016-08-26 + commit = "5ead1ada782b18c7b38a3c2798a40a334801c7b6", # 2016-12-05 remote = "https://nginx.googlesource.com/ngx_brotli", )