svn commit: r426687 - in head/sysutils/freefilesync: . files

[Jan Beich]

Author: jbeich
Date: Mon Nov 21 03:52:38 2016
New Revision: 426687
URL: https://svnweb.freebsd.org/changeset/ports/426687

Log:
  sysutils/freefilesync: unbreak with boost 1.62 on 11.0+
  
  In file included from algorithm.cpp:13:
  In file included from ../../zen/guid.h:16:
  In file included from /usr/local/include/boost/uuid/uuid_generators.hpp:17:
  In file included from /usr/local/include/boost/uuid/random_generator.hpp:17:
  In file included from /usr/local/include/boost/shared_ptr.hpp:17:
  In file included from /usr/local/include/boost/smart_ptr/shared_ptr.hpp:28:
  In file included from /usr/local/include/boost/smart_ptr/detail/shared_count.hpp:29:
  In file included from /usr/local/include/boost/smart_ptr/detail/sp_counted_base.hpp:45:
  In file included from /usr/local/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp:18:
  In file included from /usr/local/include/boost/detail/sp_typeinfo.hpp:20:
  In file included from /usr/local/include/boost/core/typeinfo.hpp:119:
  In file included from /usr/local/include/boost/core/demangle.hpp:32:
  /usr/include/c++/v1/cxxabi.h:190:19: error: '__cxa_get_globals' is missing exception specification
        'noexcept'
  __cxa_eh_globals *__cxa_get_globals(void);
                    ^
  ../../zen/scope_guard.h:31:30: note: previous declaration is here
  extern "C" __cxa_eh_globals* __cxa_get_globals() noexcept;
                               ^
  
  PR:		214485
  Reported by:	antoine (via exp-run)

Added:
  head/sysutils/freefilesync/files/patch-zen_scope__guard.h   (contents, props changed)
Modified:
  head/sysutils/freefilesync/Makefile   (contents, props changed)

Modified: head/sysutils/freefilesync/Makefile
==============================================================================
--- head/sysutils/freefilesync/Makefile	Mon Nov 21 03:15:05 2016	(r426686)
+++ head/sysutils/freefilesync/Makefile	Mon Nov 21 03:52:38 2016	(r426687)
@@ -3,6 +3,7 @@
 
 PORTNAME=	freefilesync
 PORTVERSION=	8.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.freefilesync.org/download/ \
 		http://www.freefilesync.org/archive/

Added: head/sysutils/freefilesync/files/patch-zen_scope__guard.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/freefilesync/files/patch-zen_scope__guard.h	Mon Nov 21 03:52:38 2016	(r426687)
@@ -0,0 +1,11 @@
+--- ../../zen/scope_guard.h.orig	2016-03-31 20:08:04 UTC
++++ ../../zen/scope_guard.h
+@@ -14,7 +14,7 @@
+ //best of Zen, Loki and C++17
+ 
+ 
+-#ifdef ZEN_WIN
++#if defined(ZEN_WIN) || (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3700)
+ inline int getUncaughtExceptionCount() { return std::uncaught_exceptions(); }
+ 
+ #elif defined ZEN_LINUX || defined ZEN_MAC