Merge pull request redpanda-data#23049 from rockwotj/pkg

.bazelrc

@@ -69,7 +69,6 @@ build:release --config=secure
 build:release --copt -mllvm --copt -inline-threshold=2500
 build:release --linkopt=-flto
 
-build --@seastar//:openssl=True
 build --keep_going
 
 # prevent actions and tests from using the network. anything that needs to

bazel/thirdparty/seastar.BUILD

@@ -44,11 +44,6 @@ bool_flag(
     build_setting_default = False,
 )
 
-bool_flag(
-    name = "openssl",
-    build_setting_default = False,
-)
-
 bool_flag(
     name = "sstring",
     build_setting_default = True,
@@ -100,13 +95,6 @@ config_setting(
     },
 )
 
-config_setting(
-    name = "use_openssl",
-    flag_values = {
-        ":openssl": "true",
-    },
-)
-
 config_setting(
     name = "use_logger_compile_time_fmt",
     flag_values = {
@@ -292,6 +280,7 @@ cc_library(
         "src/net/native-stack.cc",
         "src/net/native-stack-impl.hh",
         "src/net/net.cc",
+        "src/net/ossl.cc",
         "src/net/packet.cc",
         "src/net/posix-stack.cc",
         "src/net/proxy.cc",
@@ -318,10 +307,7 @@ cc_library(
         "src/util/short_streams.cc",
         "src/util/tmp_file.cc",
         "src/websocket/server.cc",
-    ] + select({
-        ":use_openssl": ["src/net/ossl.cc"],
-        "//conditions:default": ["src/net/tls.cc"],
-    }),
+    ],
     hdrs = [
         "include/seastar/core/abort_on_ebadf.hh",
         "include/seastar/core/abort_on_expiry.hh",
@@ -560,7 +546,9 @@ cc_library(
         "include/seastar/util/variant_utils.hh",
         "include/seastar/websocket/server.hh",
     ],
-    copts = select({
+    copts = [
+        "-Wno-unused-but-set-variable",
+    ] + select({
         ":use_stack_guards": ["-fstack-clash-protection"],
         "//conditions:default": [],
     }),
@@ -569,6 +557,7 @@ cc_library(
         "BOOST_TEST_NO_LIB",
         "SEASTAR_API_LEVEL=$(API_LEVEL)",
         "SEASTAR_SCHEDULING_GROUPS_COUNT=$(SCHEDULING_GROUPS)",
+        "SEASTAR_WITH_TLS_OSSL",
     ] + select({
         ":use_task_backtrace": ["SEASTAR_TASK_BACKTRACE"],
         "//conditions:default": [],
@@ -578,9 +567,6 @@ cc_library(
     }) + select({
         ":use_logger_compile_time_fmt": ["SEASTAR_LOGGER_COMPILE_TIME_FMT"],
         "//conditions:default": [],
-    }) + select({
-        ":use_openssl": ["SEASTAR_WITH_TLS_OSSL"],
-        "//conditions:default": [],
     }) + select({
         ":with_debug": ["SEASTAR_DEBUG"],
         "//conditions:default": [],
@@ -634,12 +620,12 @@ cc_library(
         "@boost//:filesystem",
         "@boost//:lockfree",
         "@boost//:program_options",
-        "@boost//:test.so",
         "@boost//:thread",
         "@c-ares",
         "@fmt",
         "@lksctp",
         "@lz4",
+        "@openssl",
         "@protobuf",
         "@yaml-cpp",
     ] + select({
@@ -651,14 +637,12 @@ cc_library(
     }) + select({
         ":use_numactl": ["@numactl"],
         "//conditions:default": [],
-    }) + select({
-        ":use_openssl": ["@openssl"],
-        "//conditions:default": ["@gnutls"],
     }),
 )
 
 cc_library(
     name = "testing",
+    testonly = True,
     srcs = [
         "src/testing/entry_point.cc",
         "src/testing/random.cc",
@@ -685,11 +669,13 @@ cc_library(
     ],
     deps = [
         ":seastar",
+        "@boost//:test.so",
     ],
 )
 
 cc_library(
     name = "benchmark",
+    testonly = True,
     srcs = [
         "tests/perf/linux_perf_event.cc",
         "tests/perf/perf_tests.cc",

src/v/hashing/tests/BUILD

@@ -9,6 +9,7 @@ redpanda_cc_btest(
     deps = [
         "//src/v/hashing:secure",
         "@boost//:test",
+        "@seastar//:testing",
     ],
 )
 

src/v/storage/tests/BUILD

@@ -68,6 +68,7 @@ redpanda_cc_btest(
         "//src/v/serde",
         "//src/v/storage:index_state",
         "@boost//:test",
+        "@seastar//:testing",
     ],
 )