Skip to content

Commit 5c8d878

Browse files
committed
Revert "Ship with BoringSSL (#135)"
This reverts commit 5dbf2fa.
1 parent f1800c2 commit 5c8d878

File tree

11 files changed

+11
-125
lines changed

11 files changed

+11
-125
lines changed

Package.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ let package = Package(
4646
],
4747
dependencies: [
4848
.package(url: "https://github.com/apple/swift-nio.git", from: "2.55.0"),
49-
.package(url: "https://github.com/apple/swift-nio-ssl", from: "2.25.0"),
50-
.package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.1.0"),
49+
.package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.0.0-beta.1"),
5150
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
5251
// The zstd Swift package produces warnings that we cannot resolve:
5352
// https://github.com/facebook/zstd/issues/3328
@@ -57,7 +56,7 @@ let package = Package(
5756
.target(
5857
name: "Crdkafka",
5958
dependencies: [
60-
.product(name: "NIOSSL", package: "swift-nio-ssl"),
59+
"COpenSSL",
6160
.product(name: "libzstd", package: "zstd"),
6261
],
6362
exclude: rdkafkaExclude,
@@ -66,9 +65,7 @@ let package = Package(
6665
cSettings: [
6766
// dummy folder, because config.h is included as "../config.h" in librdkafka
6867
.headerSearchPath("./custom/config/dummy"),
69-
.headerSearchPath("./custom/include"),
7068
.headerSearchPath("./librdkafka/src"),
71-
.define("_GNU_SOURCE", to: "1"), // Fix build error for Swift 5.9 onwards
7269
],
7370
linkerSettings: [
7471
.linkedLibrary("curl"),
@@ -91,6 +88,14 @@ let package = Package(
9188
"Kafka",
9289
]
9390
),
91+
.systemLibrary(
92+
name: "COpenSSL",
93+
pkgConfig: "openssl",
94+
providers: [
95+
.brew(["libressl"]),
96+
.apt(["libssl-dev"]),
97+
]
98+
),
9499
.testTarget(
95100
name: "KafkaTests",
96101
dependencies: ["Kafka"]

Sources/COpenSSL/module.modulemap

Whitespace-only changes.

Sources/Crdkafka/custom/include/openssl/err.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/evp.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/hmac.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/pkcs12.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/sha.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/ssl.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/x509.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

Sources/Crdkafka/custom/include/openssl/x509_vfy.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)