kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deskutils/peaclock: Fix build

Browse source 
Fixed build issues:
* error: non-constant-expression cannot be narrowed from type 'std::__1::chrono::duration<long long, std::__1::ratio<1, 1> >::rep' (aka 'long long') to 'long' in initializer list [-Wc++11-narrowing]
* /usr/bin/ld: unrecognized option '-plugin'

Reported by:	fallout
This commit is contained in:
Yuri Victorovich 2020-03-29 05:27:05 +00:00
parent 92d6899d6e
commit 2e614524f7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=529769
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deskutils/peaclock/Makefile
View file

@ -16,6 +16,8 @@ USES= cmake compiler:c++17-lang localbase:ldflags
USE_GITHUB= yes
GH_ACCOUNT= octobanana
CXXFLAGS+= -Wno-narrowing # https://github.com/octobanana/peaclock/issues/18
PLIST_FILES= bin/${PORTNAME}
.include <bsd.port.mk>

24
deskutils/peaclock/files/patch-CMakeLists.txt Normal file
View file

@ -0,0 +1,24 @@
--- CMakeLists.txt.orig 2020-03-29 03:40:33 UTC
+++ CMakeLists.txt
@@ -85,8 +85,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set (OB_FLAGS_DEBUG "-g -Og -rdynamic -Wpedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused")
set (DEBUG_LINK_FLAGS "-fprofile-arcs -ftest-coverage")
- set (OB_FLAGS_RELEASE "-O3 -flto")
- set (OB_LINKER_FLAGS_RELEASE "-O3 -flto -s")
+ #set (OB_FLAGS_RELEASE "-O3 -flto")
+ #set (OB_LINKER_FLAGS_RELEASE "-O3 -flto -s")
elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${OB_COMPILER_VERSION_CLANG}")
@@ -106,8 +106,8 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set (OB_FLAGS_DEBUG "-g -Og -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-disabled-macro-expansion -Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables -Wno-return-std-move-in-c++11 -Wno-c++11-narrowing")
set (OB_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage")
- set (OB_FLAGS_RELEASE "-O3 -flto")
- set (OB_LINKER_FLAGS_RELEASE "-O3 -flto -s")
+ #set (OB_FLAGS_RELEASE "-O3 -flto")
+ #set (OB_LINKER_FLAGS_RELEASE "-O3 -flto -s")
else ()
message (FATAL_ERROR ">> The ${CMAKE_CXX_COMPILER_ID} compiler is unsupported")
endif ()