mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

mail/evolution: Fix build with CMake 3.20.1 and modern compilers

Browse Source 
* PrintableOptions.cmake: Correct variable name comparison (CMake 3.20.1 issue)
* SetupBuildFlags.cmake: Correct testing of two compiler/linker build flags
(fix build with clang11+/gcc10+)

Regen patches by 'make makepatch'

Obtained from:	gitlab.gnome.org repository
Approved by:	portmgr blanket (trivial build fix)
This commit is contained in:
Dima Panov 2021-04-24 19:28:42 +10:00
parent ff494da793
commit 8e6f26eaaf
3 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/evolution/files/patch-CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2017-06-08 20:52:16.741243000 +0200
+++ CMakeLists.txt 2017-06-08 20:52:25.747544000 +0200
@@ -329,6 +329,7 @@
--- CMakeLists.txt.orig 2021-04-23 14:06:10 UTC
+++ CMakeLists.txt
@@ -356,6 +356,7 @@ endif(WITH_HELP)
# ******************************
set(CMAKE_REQUIRED_LIBRARIES "-liconv")

53
mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake Normal file
View File

@ -0,0 +1,53 @@
--- cmake/modules/PrintableOptions.cmake.orig 2021-03-19 06:41:05 UTC
+++ cmake/modules/PrintableOptions.cmake
@@ -19,40 +19,40 @@
# prints all the build options previously added with the above functions
macro(add_printable_variable_bare _name)
- if(_name STREQUAL "")
+ if("${_name}" STREQUAL "")
message(FATAL_ERROR "variable name cannot be empty")
- endif(_name STREQUAL "")
+ endif("${_name}" STREQUAL "")
list(APPEND _printable_options ${_name})
endmacro()
macro(add_printable_option _name _description _default_value)
- if(_name STREQUAL "")
+ if("${_name}" STREQUAL "")
message(FATAL_ERROR "option name cannot be empty")
- endif(_name STREQUAL "")
+ endif("${_name}" STREQUAL "")
option(${_name} ${_description} ${_default_value})
add_printable_variable_bare(${_name})
endmacro()
macro(add_printable_variable _name _description _default_value)
- if(_name STREQUAL "")
+ if("${_name}" STREQUAL "")
message(FATAL_ERROR "variable name cannot be empty")
- endif(_name STREQUAL "")
+ endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE STRING ${_description})
add_printable_variable_bare(${_name})
endmacro()
macro(add_printable_variable_path _name _description _default_value)
- if(_name STREQUAL "")
+ if("${_name}" STREQUAL "")
message(FATAL_ERROR "path variable name cannot be empty")
- endif(_name STREQUAL "")
+ endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE PATH ${_description})
add_printable_variable_bare(${_name})
endmacro()
macro(add_printable_variable_filepath _name _description _default_value)
- if(_name STREQUAL "")
+ if("${_name}" STREQUAL "")
message(FATAL_ERROR "filepath variable name cannot be empty")
- endif(_name STREQUAL "")
+ endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE FILEPATH ${_description})
add_printable_variable_bare(${_name})
endmacro()

20
mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake Normal file
View File

@ -0,0 +1,20 @@
--- cmake/modules/SetupBuildFlags.cmake.orig 2021-03-19 06:41:05 UTC
+++ cmake/modules/SetupBuildFlags.cmake
@@ -20,7 +20,7 @@ macro(setup_build_flags _maintainer_mode)
-Wundef
-Wwrite-strings
-Wno-cast-function-type
- -no-undefined
+ -Wl,--no-undefined
-fno-strict-aliasing
)
@@ -34,7 +34,7 @@ macro(setup_build_flags _maintainer_mode)
else(${_maintainer_mode})
list(APPEND proposed_flags
-Wno-deprecated-declarations
- -Wno-missing-include-dir)
+ -Wno-missing-include-dirs)
endif(${_maintainer_mode})
list(APPEND proposed_c_flags