From owner-svn-ports-all@freebsd.org  Sun May 29 15:02:05 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 047CCB53525;
 Sun, 29 May 2016 15:02:05 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BBC981254;
 Sun, 29 May 2016 15:02:04 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4TF23dC096130;
 Sun, 29 May 2016 15:02:03 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4TF23S5096129;
 Sun, 29 May 2016 15:02:03 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201605291502.u4TF23S5096129@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sun, 29 May 2016 15:02:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416111 - head/graphics/embree/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2016 15:02:05 -0000

Author: danfe
Date: Sun May 29 15:02:03 2016
New Revision: 416111
URL: https://svnweb.freebsd.org/changeset/ports/416111

Log:
  Disable some overloaded math functions for libc++ 3.8.0 and higher, and thus
  unbreak the build.
  
  This is because this port defines its own versions of a number of <cmath>
  functions, which cause the ambiguity.  These functions are only declared in
  <cmath> for libc++ 3.8.0 and later, so fix it by disabling the custom
  functions for those versions of libc++.
  
  PR:		209652
  Submitted by:	dim

Modified:
  head/graphics/embree/files/patch-common_math_math.h

Modified: head/graphics/embree/files/patch-common_math_math.h
==============================================================================
--- head/graphics/embree/files/patch-common_math_math.h	Sun May 29 14:29:30 2016	(r416110)
+++ head/graphics/embree/files/patch-common_math_math.h	Sun May 29 15:02:03 2016	(r416111)
@@ -1,5 +1,14 @@
 --- common/math/math.h.orig	2016-05-20 05:45:13 UTC
 +++ common/math/math.h
+@@ -83,7 +83,7 @@ namespace embree
+     return _mm_cvtss_f32(c);
+   }
+ 
+-#if !defined(__WIN32__)
++#if !defined(__WIN32__) && (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 3800)
+   __forceinline float abs  ( const float x ) { return ::fabsf(x); }
+   __forceinline float acos ( const float x ) { return ::acosf (x); }
+   __forceinline float asin ( const float x ) { return ::asinf (x); }
 @@ -179,7 +179,7 @@ namespace embree
    }
  #endif