From a6d875248751b0d078fe677b1aaeb369ace83d69 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 28 Nov 2016 20:46:14 +0000 Subject: [PATCH] Remove obsolete patches --- 3975.diff | 43 ------------------------------------------- mono-core.spec | 2 -- 2 files changed, 45 deletions(-) delete mode 100644 3975.diff diff --git a/3975.diff b/3975.diff deleted file mode 100644 index 11660bfa2d..0000000000 --- a/3975.diff +++ /dev/null @@ -1,43 +0,0 @@ -commit 1514322fc90090b9a706c221d074ae80b3e1e079 -Author: 173210 -Date: Mon Nov 14 17:32:24 2016 +0900 - - [btls] Set CMAKE_POSITION_INDEPENDENT_CODE TRUE for BUILD_DYNAMIC_BTLS - - While CMAKE_POSITION_INDEPENDENT_CODE will be automatically set if - 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. - -diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt -index 133f5e3..7e5e84f 100644 ---- a/mono/btls/CMakeLists.txt -+++ b/mono/btls/CMakeLists.txt -@@ -22,6 +22,9 @@ if (NOT "${BTLS_ARCH}" STREQUAL "") - message (WARNING "SET ARCH: ${BTLS_ARCH}") - set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}") - 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 (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") -+elseif (BUILD_SHARED_LIBS) -+ set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden") -+else () -+ set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden") -+endif() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}") - set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${BTLS_CFLAGS}") diff --git a/mono-core.spec b/mono-core.spec index 833ea144cc..9419b3e99c 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -36,7 +36,6 @@ License: LGPL-2.1 and MIT and MS-PL Group: Development/Languages/Mono Url: http://www.mono-project.com Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2 -Patch0: 3975.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -132,7 +131,6 @@ technologies that have been submitted to the ECMA for standardization. %prep %setup -q -n mono-%{__majorver} -%patch0 -p1 %build ./autogen.sh