Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Sep 2015 15:45:58 +0000 (UTC)
From:      Michael Moll <mmoll@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396904 - in head/sysutils/facter: . files
Message-ID:  <201509141545.t8EFjwbg037658@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mmoll
Date: Mon Sep 14 15:45:58 2015
New Revision: 396904
URL: https://svnweb.freebsd.org/changeset/ports/396904

Log:
  sysutils/facter: unbreak build on -CURRENT
  
  - disable -Werror until boost 1.59 gets into the portstree
  - while here, correct COMMENT (noted by junovitch)

Modified:
  head/sysutils/facter/Makefile
  head/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake

Modified: head/sysutils/facter/Makefile
==============================================================================
--- head/sysutils/facter/Makefile	Mon Sep 14 15:29:54 2015	(r396903)
+++ head/sysutils/facter/Makefile	Mon Sep 14 15:45:58 2015	(r396904)
@@ -2,11 +2,12 @@
 
 PORTNAME=	facter
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/facter/
 
 MAINTAINER=	mmoll@FreeBSD.org
-COMMENT=	Cross-platform Ruby library for retrieving facts from OS
+COMMENT=	Cross-platform library for retrieving facts from OS
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE

Modified: head/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake
==============================================================================
--- head/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake	Mon Sep 14 15:29:54 2015	(r396903)
+++ head/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake	Mon Sep 14 15:45:58 2015	(r396904)
@@ -1,5 +1,14 @@
 --- vendor/leatherman/cmake/cflags.cmake.orig	2015-07-21 17:31:29 UTC
 +++ vendor/leatherman/cmake/cflags.cmake
+@@ -2,7 +2,7 @@
+ # Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do
+ # not set CMAKE_CXX_FLAGS globally because gtest is not warning-clean.
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-    set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare")
++    set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error")
+ 
+     # Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet.
+     # The warning flag is different on different clang versions so we need to extract the clang version.
 @@ -21,6 +21,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL 
      else()
          set(LEATHERMAN_CXX_FLAGS "${LEATHERMAN_CXX_FLAGS} -Wno-deprecated")



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