Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Librdkafka/openssl patch/all #19496

Closed
wants to merge 8 commits into from
15 changes: 15 additions & 0 deletions recipes/librdkafka/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,49 @@ patches:
- patch_file: patches/0002-Change-library-targets-and-result-variables-2-0-2.patch
patch_description: "refer conan package names"
patch_type: "conan"
- patch_file: patches/0003-Add-debug-library-pragma-for-openssl.patch
patch_description: "refer conan package names"
patch_type: "conan"
"1.9.2":
- patch_file: patches/0001-Change-library-names-1-9-1.patch
patch_description: "find_package conan packages"
patch_type: "conan"
- patch_file: patches/0002-Change-library-targets-and-result-variables-1-9-1.patch
patch_description: "refer conan package names"
patch_type: "conan"
- patch_file: patches/0003-Add-debug-library-pragma-for-openssl.patch
patch_description: "refer conan package names"
patch_type: "conan"
"1.9.1":
- patch_file: patches/0001-Change-library-names-1-9-1.patch
patch_description: "find_package conan packages"
patch_type: "conan"
- patch_file: patches/0002-Change-library-targets-and-result-variables-1-9-1.patch
patch_description: "refer conan package names"
patch_type: "conan"
- patch_file: patches/0003-Add-debug-library-pragma-for-openssl.patch
patch_description: "refer conan package names"
patch_type: "conan"
"1.8.2":
- patch_file: patches/0001-Change-library-names-1-7-0.patch
patch_description: "find_package conan packages"
patch_type: "conan"
- patch_file: patches/0002-Change-library-targets-and-result-variables-1-7-0.patch
patch_description: "refer conan package names"
patch_type: "conan"
- patch_file: patches/0003-Add-debug-library-pragma-for-openssl-1-8-0.patch
patch_description: "refer conan package names"
patch_type: "conan"
"1.8.0":
- patch_file: patches/0001-Change-library-names-1-7-0.patch
patch_description: "find_package conan packages"
patch_type: "conan"
- patch_file: patches/0002-Change-library-targets-and-result-variables-1-7-0.patch
patch_description: "refer conan package names"
patch_type: "conan"
- patch_file: patches/0003-Add-debug-library-pragma-for-openssl-1-8-0.patch
patch_description: "refer conan package names"
patch_type: "conan"
"1.7.0":
- patch_file: patches/0001-Change-library-names-1-7-0.patch
patch_description: "find_package conan packages"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/src/rdkafka_ssl.c b/src/rdkafka_ssl.c
index 85f745cb..dd03ff67 100644
--- a/src/rdkafka_ssl.c
+++ b/src/rdkafka_ssl.c
@@ -39,9 +39,14 @@
#ifdef _WIN32
#include <wincrypt.h>
#pragma comment (lib, "crypt32.lib")
+#ifdef _DEBUG
+#pragma comment(lib, "libcryptod.lib")
+#pragma comment(lib, "libssld.lib")
+#else
#pragma comment (lib, "libcrypto.lib")
#pragma comment (lib, "libssl.lib")
#endif
+#endif

#include <openssl/x509.h>
#include <openssl/x509_vfy.h>

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/src/rdkafka_ssl.c b/src/rdkafka_ssl.c
index 85f745cb..dd03ff67 100644
--- a/src/rdkafka_ssl.c
+++ b/src/rdkafka_ssl.c
@@ -39,9 +39,14 @@
#ifdef _WIN32
#include <wincrypt.h>
#pragma comment(lib, "crypt32.lib")
+#ifdef _DEBUG
+#pragma comment(lib, "libcryptod.lib")
+#pragma comment(lib, "libssld.lib")
+#else
#pragma comment(lib, "libcrypto.lib")
#pragma comment(lib, "libssl.lib")
#endif
+#endif

#include <openssl/x509.h>
#include <openssl/x509_vfy.h>