Fix for conflict when P/Invoking a library linked against OpenSSL. Fixes: 57019

This commit is contained in:
Jo Shields 2017-08-04 12:49:50 -04:00
parent abc510bb08
commit 98afe772f2
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,28 @@
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

View File

@ -37,6 +37,7 @@ Group: Development/Languages/Mono
Url: http://www.mono-project.com Url: http://www.mono-project.com
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2 Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
Patch0: provides-facades.patch Patch0: provides-facades.patch
Patch1: 0001-btls-Disable-BUILD_SHARED_LIBS-while-building-boring.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
@ -133,6 +134,7 @@ technologies that have been submitted to the ECMA for standardization.
%prep %prep
%setup -q -n mono-%{version} %setup -q -n mono-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
./autogen.sh ./autogen.sh