From owner-svn-ports-branches@FreeBSD.ORG Fri May 1 09:40:05 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 899E1329; Fri, 1 May 2015 09:40:05 +0000 (UTC) Received: from svn.freebsd.org (svn.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 76B8F1093; Fri, 1 May 2015 09:40:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t419e5Gi031316; Fri, 1 May 2015 09:40:05 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t419e50u031315; Fri, 1 May 2015 09:40:05 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201505010940.t419e50u031315@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Fri, 1 May 2015 09:40:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385096 - branches/2015Q2/graphics/inkscape X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 09:40:05 -0000 Author: truckman Date: Fri May 1 09:40:04 2015 New Revision: 385096 URL: https://svnweb.freebsd.org/changeset/ports/385096 Log: MFH: r385075 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: portmgr (delphij) Modified: branches/2015Q2/graphics/inkscape/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/inkscape/Makefile ============================================================================== --- branches/2015Q2/graphics/inkscape/Makefile Fri May 1 09:32:02 2015 (r385095) +++ branches/2015Q2/graphics/inkscape/Makefile Fri May 1 09:40:04 2015 (r385096) @@ -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