From 6deea6f9112b20068bdb8e82f049e28508efac83 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:10:46 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/innoextract-1.4-cmake-3.5.patch | 31 ---------------------- .../innoextract/files/innoextract-1.4-cmake.patch | 30 --------------------- 2 files changed, 61 deletions(-) delete mode 100644 app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch delete mode 100644 app-arch/innoextract/files/innoextract-1.4-cmake.patch (limited to 'app-arch/innoextract/files') diff --git a/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch b/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch deleted file mode 100644 index 0b619ac3810f..000000000000 --- a/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001 -From: Daniel Scharrer -Date: Tue, 23 Feb 2016 05:45:50 +0100 -Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if() - -This makes the build system more rubust against stray variables -coming from included CMake scripts provided by the system. - -Fixes build with CMake 3.5 (tested with 3.5.0-rc3). - -Fixes: issue #50 ---- - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02e0308..8653b93 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,11 @@ project(innoextract) - - cmake_minimum_required(VERSION 2.8) - -+if(POLICY CMP0054) -+ # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted. -+ cmake_policy(SET CMP0054 NEW) -+endif() -+ - - # Define configuration options - diff --git a/app-arch/innoextract/files/innoextract-1.4-cmake.patch b/app-arch/innoextract/files/innoextract-1.4-cmake.patch deleted file mode 100644 index 199a10e14fac..000000000000 --- a/app-arch/innoextract/files/innoextract-1.4-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- innoextract-1.4/CMakeLists.txt -+++ innoextract-1.4/CMakeLists.txt -@@ -6,6 +6,7 @@ - # Define configuration options - - option(USE_LZMA "Build lzma decompression support." ON) -+option(WITH_DEBUG "Debug build" OFF) - option(DEBUG_EXTRA "Expensive debug options" OFF) - option(SET_WARNING_FLAGS "Adjust compiler warning flags" ON) - option(SET_OPTIMIZATION_FLAGS "Adjust compiler optimization flags" ON) ---- innoextract-1.4/cmake/BuildType.cmake -+++ innoextract-1.4/cmake/BuildType.cmake -@@ -8,7 +8,7 @@ - if(CMAKE_BUILD_TYPE STREQUAL "") - set(CMAKE_BUILD_TYPE "Release") - endif() --if(CMAKE_BUILD_TYPE STREQUAL "Debug") -+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR WITH_DEBUG) - add_definitions(-DDEBUG) - set(DEBUG 1) - endif() -@@ -64,7 +64,7 @@ - # Specifically, the need for libboost_system depends on the Boost version - add_ldflag("-Wl,--as-needed") - -- if(CMAKE_BUILD_TYPE STREQUAL "Debug") -+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR WITH_DEBUG) - - # set debug symbol level to -g3 - check_compiler_flag(RESULT "-g3") -- cgit v1.2.3