Attachment 196645 Details for Bug 211921 – Fix of LLVM bug introduced somewhere

[patch] Fix of LLVM bug introduced somewhere

brlcad_tmp_fix.diff (text/plain), 2.66 KB, created by bye on 2018-08-28 14:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bye

Created: 2018-08-28 14:00:02 UTC

Size: 2.66 KB

patch

obsolete

>Index: brlcad/Makefile
>===================================================================
>--- brlcad/Makefile	(revision 478316)
>+++ brlcad/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	brlcad
>-PORTVERSION=	7.24.0
>-PORTREVISION=	7
>+PORTVERSION=	7.26.4
>+PORTREVISION=	8
> CATEGORIES=	cad
> MASTER_SITES=	SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
> 
>@@ -25,10 +25,10 @@
> 		libexpat.so:textproc/expat2 \
> 		libfontconfig.so:x11-fonts/fontconfig
> 
>-CONFLICTS_INSTALL=	py[23][0-9]-epsilon
>+CONFLICTS_INSTALL=	py[23][0-9]-epsilon mesa-demos
> 
>-USES=		bison cmake:outsource pathfix pkgconfig python:env shebangfix \
>-		tar:bzip2 tk:85
>+USES=		bison cmake:outsource,noninja pathfix pkgconfig python:env shebangfix \
>+		tar:bzip2 tk:86
> USE_GL=		gl glu
> USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
> 		xorgproto xrender xscrnsaver xt xxf86vm
>@@ -39,25 +39,28 @@
> 
> PLIST_SUB+=	PORTVERSION=${PORTVERSION}
> 
>-CMAKE_OFF=	BRLCAD_ENABLE_STRICT
>+# CMAKE_OFF=	BRLCAD_ENABLE_STRICT
>+CMAKE_ARGS=	-DBRLCAD_BUNDLED_LIBS=ON 	\
>+		-DBRLCAD_ENABLE_STRICT=OFF 	\
>+		-DBRLCAD_FLAGS_DEBUG=OFF
> CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
> MANPREFIX=	${PREFIX}/${PORTNAME}/share
> 
> TEST_TARGET=	check
> 
>-post-patch:
>-	@${REINPLACE_CMD} "s+-exact Tcl 8\.5\.9+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
>+# post-patch:
>+	# @${REINPLACE_CMD} "s+-exact Tcl 8\.5\.9+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
> 
>-pre-install:
>-	${CP} ${FILESDIR}/mged.sh ${WRKSRC}
>-	${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}/${PORTNAME}+g;' ${WRKSRC}/mged.sh
>+# pre-install:
>+	# ${CP} ${FILESDIR}/mged.sh ${WRKSRC}
>+	# ${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}/${PORTNAME}+g;' ${WRKSRC}/mged.sh
> 
> # note that installing outside of PREFIX wigs out package stuff... :/
>-post-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${STAGEDIR}${PREFIX}/bin/mged.sh
>+# post-install:
>+	# ${MKDIR} ${STAGEDIR}${PREFIX}/bin
>+	# ${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${STAGEDIR}${PREFIX}/bin/mged.sh
> 
>-regression-test: build
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
>+# regression-test: build
>+	# @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
> 
> .include <bsd.port.mk>
>Index: brlcad/distinfo
>===================================================================
>--- brlcad/distinfo	(revision 478316)
>+++ brlcad/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (brlcad-7.24.0.tar.bz2) = 2ee79c563573abed3214ec379020af48c34234e21ae810e76044840fdedcaa20
>-SIZE (brlcad-7.24.0.tar.bz2) = 71818033
>+TIMESTAMP = 1535121752
>+SHA256 (brlcad-7.26.4.tar.bz2) = 1fbf2551b9dd8b1b97beca9eb26bb2db9aa270017cc17329ba3a7518bab30440
>+SIZE (brlcad-7.26.4.tar.bz2) = 116079771

Actions: View | Diff

Attachments on bug 211921: 173760 | 174537 | 180759 | 189460 | 189461 | 189472 | 189476 | 189489 | 191141 | 191169 | 191190 | 194976 | 196645 | 197475 | 197589