From owner-freebsd-office@FreeBSD.ORG  Mon Oct 28 19:20:41 2013
Return-Path: <owner-freebsd-office@FreeBSD.ORG>
Delivered-To: office@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 88198F97
 for <office@freebsd.org>; Mon, 28 Oct 2013 19:20:41 +0000 (UTC)
 (envelope-from brooks@lor.one-eyed-alien.net)
Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D0E97272B
 for <office@freebsd.org>; Mon, 28 Oct 2013 19:20:40 +0000 (UTC)
Received: from lor.one-eyed-alien.net (localhost [127.0.0.1])
 by lor.one-eyed-alien.net (8.14.7/8.14.7) with ESMTP id r9SJKYwO059395
 for <office@freebsd.org>; Mon, 28 Oct 2013 14:20:34 -0500 (CDT)
 (envelope-from brooks@lor.one-eyed-alien.net)
Received: (from brooks@localhost)
 by lor.one-eyed-alien.net (8.14.7/8.14.7/Submit) id r9SJKYsA059394
 for office@freebsd.org; Mon, 28 Oct 2013 14:20:34 -0500 (CDT)
 (envelope-from brooks)
Date: Mon, 28 Oct 2013 14:20:34 -0500
From: Brooks Davis <brooks@freebsd.org>
To: office@freebsd.org
Subject: switch clang version for editors/libreoffice
Message-ID: <20131028192034.GA57868@lor.one-eyed-alien.net>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="zYM0uCDKw75PZbzx"
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
X-BeenThere: freebsd-office@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Office applications on FreeBSD <freebsd-office.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-office>,
 <mailto:freebsd-office-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-office>
List-Post: <mailto:freebsd-office@freebsd.org>
List-Help: <mailto:freebsd-office-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-office>,
 <mailto:freebsd-office-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 19:20:41 -0000


--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

The following patch switches the clang version used by
editors/libreoffice from devel/clang (clang 3.2) to devel/clang32 (also
clang 3.2, but installed with "32" suffixed on binaries so as not to
conflict with other reversions).  I've tested the patch on 8.4 amd64
using redports and clang32 is properly detected and builds.  There are
some leftovers reported but I believe they are not my fault.

https://redports.org/~brooks/20131028171312-09199-155471/libreoffice-4.0.6.log

Please approve or commit this patch.  I'd like to remove the current
lang/clang soon.

Thanks,
Brooks

Index: Makefile
===================================================================
--- Makefile	(revision 331869)
+++ Makefile	(working copy)
@@ -334,11 +334,11 @@
 .endif
 .else
 # XXX Clang PR13308 (http://llvm.org/bugs/show_bug.cgi?id=13308)
-BUILD_DEPENDS+=	clang>=3.2_4:${PORTSDIR}/lang/clang
+BUILD_DEPENDS+=	clang32:${PORTSDIR}/lang/clang32
 USE_BINUTILS=	yes
-CC=		${LOCALBASE}/bin/clang
-CPP=		${CC} -E
-CXX=		${LOCALBASE}/bin/clang++
+CC=		${LOCALBASE}/bin/clang32
+CPP=		${LOCALBASE}/bin/clang-cpp32
+CXX=		${LOCALBASE}/bin/clang++32
 CONFIGURE_ENV+=	CXXCPP="${CXX} -E"
 .endif
 .endif

--zYM0uCDKw75PZbzx
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iD8DBQFSbrkBXY6L6fI4GtQRAtUpAJ4z22Zf4xp1om8gcvxzIbJOrlZjnQCgxlZT
lrpe1eXUDc0fPz71VvKmWpg=
=+2Sm
-----END PGP SIGNATURE-----

--zYM0uCDKw75PZbzx--