switch clang version for editors/libreoffice

Brooks Davis brooks at freebsd.org
Mon Oct 28 19:20:41 UTC 2013


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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-office/attachments/20131028/a0d761ce/attachment.sig>


More information about the freebsd-office mailing list