From owner-svn-ports-head@freebsd.org  Mon Aug 31 02:54:16 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 4350C9C7CF4;
 Mon, 31 Aug 2015 02:54:16 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 33C7D1EF;
 Mon, 31 Aug 2015 02:54:16 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7V2sGQQ092798;
 Mon, 31 Aug 2015 02:54:16 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7V2sFkM092796;
 Mon, 31 Aug 2015 02:54:15 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201508310254.t7V2sFkM092796@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: Mon, 31 Aug 2015 02:54:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r395647 - in head/graphics/hdr_tools: . 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Aug 2015 02:54:16 -0000

Author: danfe
Date: Mon Aug 31 02:54:15 2015
New Revision: 395647
URL: https://svnweb.freebsd.org/changeset/ports/395647

Log:
  Fix the build against `math/ldouble' when logl(), expl(), and log2l() are
  not available in the base libm by wrapping #include <mathl.h> with extern
  "C" block.

Added:
  head/graphics/hdr_tools/files/patch-helpers.hh   (contents, props changed)
Modified:
  head/graphics/hdr_tools/Makefile

Modified: head/graphics/hdr_tools/Makefile
==============================================================================
--- head/graphics/hdr_tools/Makefile	Sun Aug 30 23:19:09 2015	(r395646)
+++ head/graphics/hdr_tools/Makefile	Mon Aug 31 02:54:15 2015	(r395647)
@@ -36,10 +36,9 @@ CXXFLAGS+=	-msse2 -mfpmath=sse
 CXXFLAGS+=	-fopenmp
 .endif
 
-# NB: `math/ldouble' port provides these functions, but does not export
-# them correctly; as a result linking with C++ code is currently broken
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034
-BROKEN=		requires logl(), expl(), log2l()
+LIB_DEPENDS+=	libml.so:${PORTSDIR}/math/ldouble
+LDFLAGS+=	-lml
 .endif
 
 post-patch:

Added: head/graphics/hdr_tools/files/patch-helpers.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hdr_tools/files/patch-helpers.hh	Mon Aug 31 02:54:15 2015	(r395647)
@@ -0,0 +1,17 @@
+--- helpers.hh.orig	2010-11-23 21:22:51 UTC
++++ helpers.hh
+@@ -35,6 +35,14 @@
+ 
+ #include <stdint.h>
+ 
++#if defined __FreeBSD__
++#include <osreldate.h>
++#if __FreeBSD_version < 1000034
++extern "C" {
++#include <mathl.h>
++}
++#endif
++#endif
+ 
+ 
+