mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuzz is not allowed when applying patches

Browse Source 
Former-commit-id: a9d8f3e2b1653d9025e43ca683f816d004730ab5
This commit is contained in:
Jo Shields 2016-11-18 10:11:08 +00:00
parent eb348909de
commit a7516c52ca
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
debian/patches/3975.diff vendored
View File

@ -8,30 +8,17 @@ Date: Mon Nov 14 17:32:24 2016 +0900
BUILD_SHARED_LIBS is TRUE, it won't if BUILD_DYNAMIC_BTLS is TRUE. BUILD_SHARED_LIBS is TRUE, it won't if BUILD_DYNAMIC_BTLS is TRUE.
This change sets CMAKE_POSITION_INDEPENDENT_CODE manually in such a case. This change sets CMAKE_POSITION_INDEPENDENT_CODE manually in such a case.
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt Index: xamarin-pkg-mono/mono/btls/CMakeLists.txt
index 133f5e3..7e5e84f 100644 ===================================================================
--- a/mono/btls/CMakeLists.txt --- xamarin-pkg-mono.orig/mono/btls/CMakeLists.txt
+++ b/mono/btls/CMakeLists.txt +++ xamarin-pkg-mono/mono/btls/CMakeLists.txt
@@ -22,6 +22,9 @@ if (NOT "${BTLS_ARCH}" STREQUAL "") @@ -22,7 +22,14 @@ if (NOT "${BTLS_ARCH}" STREQUAL "")
message (WARNING "SET ARCH: ${BTLS_ARCH}") message (WARNING "SET ARCH: ${BTLS_ARCH}")
set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}") set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
endif () endif ()
-set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+if (BUILD_DYNAMIC_BTLS) +if (BUILD_DYNAMIC_BTLS)
+ set (CMAKE_POSITION_INDEPENDENT_CODE TRUE) + set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+endif ()
set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
index 7e5e84f..8734b71 100644
--- a/mono/btls/CMakeLists.txt
+++ b/mono/btls/CMakeLists.txt
@@ -24,8 +24,12 @@ if (NOT "${BTLS_ARCH}" STREQUAL "")
endif ()
if (BUILD_DYNAMIC_BTLS)
set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-endif ()
-set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+ set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden") + set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+elseif (BUILD_SHARED_LIBS) +elseif (BUILD_SHARED_LIBS)
+ set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden") + set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")