Merge 6b3d974 into 99e4d50

jupp0r · Apr 16, 2023 · 98fde02 · 98fde02
2 parents 99e4d50 + 6b3d974
commit 98fde02
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/3rdparty/civetweb b/3rdparty/civetweb
diff --git a/bazel/civetweb.BUILD b/bazel/civetweb.BUILD
@@ -51,7 +51,6 @@ cc_library(
     name = "libcivetweb",
     srcs = [
         "src/civetweb.c",
-        "src/response.inl",
     ],
     hdrs = [
         "include/civetweb.h",
@@ -69,8 +68,11 @@ cc_library(
         "//conditions:default": ["-lrt"],
     }),
     textual_hdrs = [
-        "src/md5.inl",
         "src/handle_form.inl",
+        "src/match.inl",
+        "src/md5.inl",
+        "src/response.inl",
+        "src/sort.inl",
     ],
     visibility = ["//visibility:public"],
     deps = DEPS,

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -5,10 +5,10 @@ def prometheus_cpp_repositories():
     maybe(
         http_archive,
         name = "civetweb",
-        strip_prefix = "civetweb-1.15",
-        sha256 = "90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9",
+        strip_prefix = "civetweb-1.16",
+        sha256 = "f0e471c1bf4e7804a6cfb41ea9d13e7d623b2bcc7bc1e2a4dd54951a24d60285",
         urls = [
-            "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz",
+            "https://github.com/civetweb/civetweb/archive/v1.16.tar.gz",
         ],
         build_file = "@com_github_jupp0r_prometheus_cpp//bazel:civetweb.BUILD",
     )

diff --git a/bazel/zlib.BUILD b/bazel/zlib.BUILD
@@ -12,5 +12,11 @@ cc_library(
         "-Dverbose=-1",
     ],
     includes = ["."],
+    local_defines = select({
+        "@bazel_tools//src/conditions:windows": [],
+        "//conditions:default": [
+            "Z_HAVE_UNISTD_H",
+        ],
+    }),
     visibility = ["//visibility:public"],
 )