Merge branches 'NovaSagittarii/websocket' and 'NovaSagittarii/websock…

…et' of github.com:ucrcyber/conway-rts into NovaSagittarii/websocket
ucrcyber · Jan 6, 2024 · 083dd83 · 083dd83
2 parents 99ba846 + d7621c6
commit 083dd83
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 12 deletions.
diff --git a/cc_config.bzl b/cc_config.bzl
@@ -4,5 +4,5 @@ CC Compiler options to be used for all project files.
 
 CC_OPTS = select({
     "@bazel_tools//src/conditions:windows": ["/std:c++20"],
-    "//conditions:default": ["--std=c++20"],
+    "//conditions:default": ["-std=c++20"],
 })
diff --git a/externals/BUILD.boringssl.bazel b/externals/BUILD.boringssl.bazel
@@ -1,6 +1,6 @@
 CC_OPTS = select({
     "@bazel_tools//src/conditions:windows": ["/std:c++17"],
-    "//conditions:default": ["--std=c++17"],
+    "//conditions:default": [],
 })
 
 cc_library(

diff --git a/externals/BUILD.libuv.bazel b/externals/BUILD.libuv.bazel
@@ -1,12 +1,63 @@
 """
 https://github.com/libuv/help/issues/83
 https://github.com/bazelregistry/libuv/commit/b8e9b269bc7294f485e4be030b3340017745ca58
+https://github.com/libuv/libuv/blob/v1.47.0/CMakeLists.txt
 """
 
 _win_srcs = glob(["src/win/**/*"])
 
 _unix_srcs = glob(["src/unix/**/*"])
 
+SRCS_COMMON = [
+    "src/fs-poll.c",
+    "src/idna.c",
+    "src/inet.c",
+    "src/random.c",
+    "src/strscpy.c",
+    "src/strtok.c",
+    "src/thread-common.c",
+    "src/threadpool.c",
+    "src/timer.c",
+    "src/uv-common.c",
+    "src/uv-data-getter-setters.c",
+    "src/version.c",
+]
+
+SRCS_UNIX = SRCS_COMMON + [
+    "src/unix/async.c",
+    "src/unix/core.c",
+    "src/unix/dl.c",
+    "src/unix/fs.c",
+    "src/unix/getaddrinfo.c",
+    "src/unix/getnameinfo.c",
+    "src/unix/loop-watcher.c",
+    "src/unix/loop.c",
+    "src/unix/pipe.c",
+    "src/unix/poll.c",
+    "src/unix/process.c",
+    "src/unix/random-devurandom.c",
+    "src/unix/signal.c",
+    "src/unix/stream.c",
+    "src/unix/tcp.c",
+    "src/unix/thread.c",
+    "src/unix/tty.c",
+    "src/unix/udp.c",
+]
+
+SRCS_DARWIN_ANDROID_LINUX = SRCS_UNIX + ["src/unix/proctitle.c"]
+
+SRCS_LINUX = SRCS_DARWIN_ANDROID_LINUX + [
+    "src/unix/linux.c",
+    "src/unix/procfs-exepath.c",
+    "src/unix/random-getrandom.c",
+    "src/unix/random-sysctl-linux.c",
+]
+
+DEFS_LINUX = [
+    "_GNU_SOURCE",
+    "_POSIX_C_SOURCE=200112",
+]
+
 _srcs = glob(["src/*"])
 
 _win_linkopts = [
@@ -25,16 +76,33 @@ cc_library(
     name = "libuv",
     srcs = select({
         "@bazel_tools//src/conditions:windows": _srcs + _win_srcs,
-        "//conditions:default": _srcs + _unix_srcs,
+        "@bazel_tools//src/conditions:linux": SRCS_LINUX,
+        "//conditions:default": _srcs + _unix_srcs,  # doesn't work since it includes too many (different Unix's)
+    }),
+    hdrs = glob([
+        "include/**/*",
+        "src/*.h",
+    ]) + select({
+        "@bazel_tools//src/conditions:linux": glob(["src/unix/*.h"]),
+        "//conditions:default": [],
+    }),
+    defines = select({
+        "@bazel_tools//src/conditions:windows": [],
+        "@bazel_tools//src/conditions:linux": DEFS_LINUX,
+        "//conditions:default": [],
     }),
-    hdrs = glob(["include/**/*"]),
     includes = [
-        "include/",
-        "src/",
+        "include",
+        "src",
     ],
     linkopts = select({
         "@bazel_tools//src/conditions:windows": _win_linkopts,
-        "//conditions:default": [],
+        "//conditions:default": [
+            "-lpthread",
+            "-ldl",
+            "-lrt",
+        ],
     }),
+    linkstatic = True,
     visibility = ["//visibility:public"],
 )
diff --git a/externals/BUILD.lsquic.bazel b/externals/BUILD.lsquic.bazel
@@ -1,19 +1,24 @@
 """
 lsquic bazel build file
+
+lsquic v3.2.0
+https://github.com/litespeedtech/lsquic/blob/v3.2.0/CMakeLists.txt
+https://github.com/litespeedtech/lsquic/blob/v3.2.0/src/liblsquic/CMakeLists.txt
 """
 
 # c++17 needed for sys/uio.h on windows
 CC_OPTS = select({
-    "@bazel_tools//src/conditions:windows": ["/std:c++20"],
-    "//conditions:default": ["--std=c++20"],
+    "@bazel_tools//src/conditions:windows": ["/std:c++17"],
+    "//conditions:default": [],
 })
 
 cc_library(
     name = "lsquic",
-    srcs = glob(["src/liblsquic/ls*.c"]) + ["src/liblsquic/ls-qpack/lsqpack.c"],
+    srcs = glob(["src/liblsquic/lsquic_*.c"]) + ["src/liblsquic/ls-qpack/lsqpack.c"],
     hdrs = glob([
         "include/*.h",
         "src/**/*.h",
+        "src/liblsquic/common_*",
     ]),
     copts = CC_OPTS,
     defines = select({

diff --git a/externals/BUILD.usockets.bazel b/externals/BUILD.usockets.bazel
@@ -1,6 +1,6 @@
 CC_OPTS = select({
     "@bazel_tools//src/conditions:windows": ["/std:c++17"],
-    "//conditions:default": ["--std=c++17"],
+    "//conditions:default": ["-std=c++17"],
 })
 
 cc_library(

diff --git a/externals/BUILD.uwebsockets.bazel b/externals/BUILD.uwebsockets.bazel
@@ -1,6 +1,6 @@
 CC_OPTS = select({
     "@bazel_tools//src/conditions:windows": ["/std:c++17"],
-    "//conditions:default": ["--std=c++17"],
+    "//conditions:default": ["-std=c++17"],
 })
 
 cc_library(