Date: Thu, 30 Apr 2015 23:29:35 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385075 - head/graphics/inkscape Message-ID: <201504302329.t3UNTZFv027131@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Thu Apr 30 23:29:35 2015 New Revision: 385075 URL: https://svnweb.freebsd.org/changeset/ports/385075 Log: Unbreak graphics/inkscape build on FreeBSD 9.3 i386. The base version of clang 3.4.1 in FreeBSD 9.3 is missing some patches that are present in clang 3.4.1 in FreeBSD 10.1. One of these patches appears to fix a code generation bug on i386 that is triggered when building graphics/inkscape. Work around this issue by building inkscape with lang/clang34 from ports on FreeBSD 9.3 i386. Approved by: mat (mentor) MFH: 2015Q2 Differential Revision: https://reviews.freebsd.org/D2417 Modified: head/graphics/inkscape/Makefile Modified: head/graphics/inkscape/Makefile ============================================================================== --- head/graphics/inkscape/Makefile Thu Apr 30 23:15:09 2015 (r385074) +++ head/graphics/inkscape/Makefile Thu Apr 30 23:29:35 2015 (r385075) @@ -71,6 +71,18 @@ WPG_LIB_DEPENDS= libwpg-0.2.so:${PORTSDI CPPFLAGS+= -Wno-mismatched-tags -Wno-unknown-attributes .endif +# Base clang 3.4.1 in FreeBSD 9.3 fails to compile this code on i386 +# but base clang 3.4.1 in FreeBSD 10.1 succeeds. The difference *appears* +# to be the patch applied in r271597 (head) / r271739 (stable/10). The +# latter happened shortly before 10.1 was branched. +.if ${ARCH} == i386 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 && \ + ( ${COMPILER_TYPE} == clang || ${ALT_COMPILER_TYPE} == clang ) +BUILD_DEPENDS+= clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 +.endif + post-patch: @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/configure
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504302329.t3UNTZFv027131>