Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mail/evolution: Fix build with CMake 3.20.1 and modern compilers
* 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)
- Loading branch information
Showing
3 changed files
with
76 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 changes: 20 additions & 0 deletions
20
mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |