Revert "Fix for conflict when P/Invoking a library linked against OpenSSL. Fixes: 57019" (Obsolete)
This reverts commit 7c4eda68943e2f6fce377bef1dac0f0115cc6951 [formerly 6dfe942e2d64cec6e5b717e6f59b0e283669fb9b]. Former-commit-id: 83dbeb43fdbefb5082594d3992fc04deb5a71ea7
This commit is contained in:
parent
a0685a2218
commit
a998e7b96c
@ -1,28 +0,0 @@
|
||||
From e6e0fb82261340f9181d1b2b11a9706a16c5dbc7 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Varga <vargaz@gmail.com>
|
||||
Date: Fri, 4 Aug 2017 11:39:28 -0400
|
||||
Subject: [PATCH] [btls] Disable BUILD_SHARED_LIBS while building boringssl, so
|
||||
its symbols are not exported from the btls shared lib. (#5307)
|
||||
|
||||
---
|
||||
mono/btls/CMakeLists.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
|
||||
index 9f2365d3e50..d33038d75cf 100644
|
||||
--- a/mono/btls/CMakeLists.txt
|
||||
+++ b/mono/btls/CMakeLists.txt
|
||||
@@ -31,7 +31,10 @@ set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${BTLS_CFLAGS}")
|
||||
set (CMAKE_MACOSX_RPATH 1)
|
||||
set (MONO_BTLS 1)
|
||||
|
||||
+set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
|
||||
+set(BUILD_SHARED_LIBS OFF)
|
||||
add_subdirectory (${BTLS_ROOT} boringssl)
|
||||
+set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
|
||||
|
||||
include_directories (
|
||||
${SRC_DIR}
|
||||
--
|
||||
2.11.0
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,2 +1 @@
|
||||
0001-btls-Disable-BUILD_SHARED_LIBS-while-building-boring.patch
|
||||
conditionally_define_alignas_for_precise.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user