Skip site navigation (1)Skip section navigation (2)
Date:      Tue,  4 Mar 2014 07:16:30 +0400 (MSK)
From:      Dmitry Marakasov <amdmi3@amdmi3.ru>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        brooks@FreeBSD.org
Subject:   ports/187243: [PATCH] lang/clang34: fix scan-build reports
Message-ID:  <20140304031630.9CBFF1CF64@hades.panopticon>
Resent-Message-ID: <201403040320.s243K0dL027937@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         187243
>Category:       ports
>Synopsis:       [PATCH] lang/clang34: fix scan-build reports
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 04 03:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
I've altead submitted this by email but it seems to have been lost.

- Fix scan-build reports: do replace %%DATADIR%% placeholders with actual paths
- While here, silence post-extract and post-patch

Port maintainer (brooks@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- clang34-3.4.patch begins here ---
diff -ruN /usr/ports/lang/clang34/Makefile ./Makefile
--- /usr/ports/lang/clang34/Makefile	2014-03-01 02:02:14.000000000 +0400
+++ ./Makefile	2014-03-04 07:13:15.882105580 +0400
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
@@ -97,18 +97,20 @@
 .endif
 
 post-extract:
-	${RM} -f ${BUILD_WRKSRC}
-	${MV} ${WRKDIR}/${CLANG_EXTRACT} ${BUILD_WRKSRC}
+	@${RM} -f ${BUILD_WRKSRC}
+	@${MV} ${WRKDIR}/${CLANG_EXTRACT} ${BUILD_WRKSRC}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
+	@${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
 	    ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
+	@${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
-	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
+	@${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
-	${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
 	    ${WRKSRC}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
+	    ${WRKSRC}/tools/clang/tools/scan-build/scan-build
 
 pre-build:
 	${LN} -sf ${LLVM_PREFIX}/include/llvm/IR/Intrinsics.gen \
--- clang34-3.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140304031630.9CBFF1CF64>