Date: Mon, 31 Aug 2015 02:54:15 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> 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 Message-ID: <201508310254.t7V2sFkM092796@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 + + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508310254.t7V2sFkM092796>