Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Mar 2020 05:27:05 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529769 - in head/deskutils/peaclock: . files
Message-ID:  <202003290527.02T5R5f2045149@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sun Mar 29 05:27:05 2020
New Revision: 529769
URL: https://svnweb.freebsd.org/changeset/ports/529769

Log:
  deskutils/peaclock: Fix build
  
  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

Added:
  head/deskutils/peaclock/files/
  head/deskutils/peaclock/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/deskutils/peaclock/Makefile

Modified: head/deskutils/peaclock/Makefile
==============================================================================
--- head/deskutils/peaclock/Makefile	Sat Mar 28 23:45:29 2020	(r529768)
+++ head/deskutils/peaclock/Makefile	Sun Mar 29 05:27:05 2020	(r529769)
@@ -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>

Added: head/deskutils/peaclock/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/peaclock/files/patch-CMakeLists.txt	Sun Mar 29 05:27:05 2020	(r529769)
@@ -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 ()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003290527.02T5R5f2045149>