forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-admin/conky: Add patch to build with >=cmake-3.4.0.
Also fixes epatch_user which failed in any case, because still trying to run eautoreconf. Thanks to Casey Webster for the report and the patches. Package-Manager: portage-2.2.20.1
- Loading branch information
Showing
2 changed files
with
32 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
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,29 @@ | ||
--- a/cmake/ConkyPlatformChecks.cmake | ||
+++ b/cmake/ConkyPlatformChecks.cmake | ||
@@ -22,7 +22,7 @@ | ||
|
||
include(FindPkgConfig) | ||
include(CheckFunctionExists) | ||
-include(CheckIncludeFile) | ||
+include(CheckIncludeFiles) | ||
include(CheckSymbolExists) | ||
|
||
# Check for some headers | ||
@@ -119,7 +119,7 @@ if(BUILD_HTTP) | ||
endif(BUILD_HTTP) | ||
|
||
if(BUILD_NCURSES) | ||
- check_include_file(ncurses.h NCURSES_H) | ||
+ check_include_files(ncurses.h NCURSES_H) | ||
find_library(NCURSES_LIB NAMES ncurses) | ||
if(NOT NCURSES_H OR NOT NCURSES_LIB) | ||
message(FATAL_ERROR "Unable to find ncurses library") | ||
@@ -167,7 +167,7 @@ endif(BUILD_PORT_MONITORS) | ||
|
||
# Check for iconv | ||
if(BUILD_ICONV) | ||
- check_include_file(iconv.h HAVE_ICONV_H) | ||
+ check_include_files(iconv.h HAVE_ICONV_H) | ||
find_library(ICONV_LIBRARY NAMES iconv) | ||
if(NOT ICONV_LIBRARY) | ||
# maybe iconv() is provided by libc |