From owner-svn-ports-all@FreeBSD.ORG Tue Jan 28 00:04:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E11DBBB0; Tue, 28 Jan 2014 00:04:47 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CCD0F1F9D; Tue, 28 Jan 2014 00:04:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0S04lhm076533; Tue, 28 Jan 2014 00:04:47 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0S04l7I076528; Tue, 28 Jan 2014 00:04:47 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201401280004.s0S04l7I076528@svn.freebsd.org> From: Brooks Davis Date: Tue, 28 Jan 2014 00:04:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341489 - in head/lang/clang34: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 00:04:48 -0000 Author: brooks Date: Tue Jan 28 00:04:46 2014 New Revision: 341489 URL: http://svnweb.freebsd.org/changeset/ports/341489 QAT: https://qat.redports.org/buildarchive/r341489/ Log: Attempt to add back support for scan-build.[1] Change ccc-analyzer's default compiler to clang.[2] Install unwind.h.[3] PR: ports/185733 [1], ports/183802 [2], ports/186173 [3] Added: head/lang/clang34/files/patch-tools_clang_tools_scan-build_ccc-analyzer (contents, props changed) Modified: head/lang/clang34/Makefile head/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile head/lang/clang34/pkg-plist Modified: head/lang/clang34/Makefile ============================================================================== --- head/lang/clang34/Makefile Tue Jan 28 00:04:20 2014 (r341488) +++ head/lang/clang34/Makefile Tue Jan 28 00:04:46 2014 (r341489) @@ -2,6 +2,7 @@ PORTNAME= clang DISTVERSION= 3.4 +PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -56,16 +57,22 @@ CONFIGURE_ARGS+= --disable-docs PLIST_SUB+= LLVM_SUFFIX=${LLVM_SUFFIX} \ PORTVERSION=${PORTVERSION} - -COMMANDS= c-index-test \ +COMMANDS= c++-analyzer \ + c-index-test \ + ccc-analyzer \ clang \ clang++ \ clang-check \ clang-cpp \ clang-format \ - clang-tblgen + clang-tblgen \ + scan-build \ + scan-view FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} +PORTDATA= scanview.css \ + sorttable.js + .include .if ${PORT_OPTIONS:MASSERTS} @@ -128,6 +135,15 @@ post-install: ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} + ${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \ + ${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \ + ${WRKSRC}/tools/clang/tools/scan-build/scan-build \ + ${WRKSRC}/tools/clang/tools/scan-view/scan-view \ + ${STAGEDIR}${LLVM_PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css \ + ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js \ + ${STAGEDIR}${DATADIR} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} ${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ @@ -139,6 +155,8 @@ post-install: .endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 + ${INSTALL_MAN} ${WRKSRC}/tools/clang/tools/scan-build/scan-build.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1 PLIST_FILE_LIST= ${COMMANDS:S|^|bin/|} \ lib/libclang* @@ -156,6 +174,7 @@ build-plist: | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | ${SORT} >> ${PLIST} echo man/man1/clang%%LLVM_SUFFIX%%.1.gz >> ${PLIST} + echo man/man1/scan-build%%LLVM_SUFFIX%%.1.gz >> ${PLIST} ${FIND} ${STAGEDIR}${DOCSDIR} -type f | \ ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \ ${SORT} >> ${PLIST} Modified: head/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile ============================================================================== --- head/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile Tue Jan 28 00:04:20 2014 (r341488) +++ head/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile Tue Jan 28 00:04:46 2014 (r341489) @@ -8,7 +8,7 @@ $FreeBSD$ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include -HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h)) -+HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*intrin*.h) altivec.h cpuid.h mm3dnow.h mm_malloc.h) ++HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*intrin*.h) altivec.h cpuid.h mm3dnow.h mm_malloc.h unwind.h) OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS)) Added: head/lang/clang34/files/patch-tools_clang_tools_scan-build_ccc-analyzer ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/clang34/files/patch-tools_clang_tools_scan-build_ccc-analyzer Tue Jan 28 00:04:46 2014 (r341489) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- tools/clang/tools/scan-build/ccc-analyzer.orig ++++ tools/clang/tools/scan-build/ccc-analyzer +@@ -30,7 +30,7 @@ + my $DefaultCCompiler; + my $DefaultCXXCompiler; + +-if (`uname -a` =~ m/Darwin/) { ++if (`uname -a` =~ m/(Darwin|FreeBSD)/) { + $DefaultCCompiler = 'clang'; + $DefaultCXXCompiler = 'clang++'; + } else { Modified: head/lang/clang34/pkg-plist ============================================================================== --- head/lang/clang34/pkg-plist Tue Jan 28 00:04:20 2014 (r341488) +++ head/lang/clang34/pkg-plist Tue Jan 28 00:04:46 2014 (r341489) @@ -1,17 +1,25 @@ +bin/c++-analyzer%%LLVM_SUFFIX%% bin/c-index-test%%LLVM_SUFFIX%% +bin/ccc-analyzer%%LLVM_SUFFIX%% bin/clang%%LLVM_SUFFIX%% bin/clang++%%LLVM_SUFFIX%% bin/clang-check%%LLVM_SUFFIX%% bin/clang-cpp%%LLVM_SUFFIX%% bin/clang-format%%LLVM_SUFFIX%% bin/clang-tblgen%%LLVM_SUFFIX%% +bin/scan-build%%LLVM_SUFFIX%% +bin/scan-view%%LLVM_SUFFIX%% +llvm%%LLVM_SUFFIX%%/bin/c++-analyzer llvm%%LLVM_SUFFIX%%/bin/c-index-test +llvm%%LLVM_SUFFIX%%/bin/ccc-analyzer llvm%%LLVM_SUFFIX%%/bin/clang llvm%%LLVM_SUFFIX%%/bin/clang++ llvm%%LLVM_SUFFIX%%/bin/clang-check llvm%%LLVM_SUFFIX%%/bin/clang-cpp llvm%%LLVM_SUFFIX%%/bin/clang-format llvm%%LLVM_SUFFIX%%/bin/clang-tblgen +llvm%%LLVM_SUFFIX%%/bin/scan-build +llvm%%LLVM_SUFFIX%%/bin/scan-view llvm%%LLVM_SUFFIX%%/include/clang-c/CXCompilationDatabase.h llvm%%LLVM_SUFFIX%%/include/clang-c/CXString.h llvm%%LLVM_SUFFIX%%/include/clang-c/Index.h @@ -450,6 +458,7 @@ llvm%%LLVM_SUFFIX%%/lib/clang/3.4/includ llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/smmintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/tbmintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/tmmintrin.h +llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/unwind.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/wmmintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/x86intrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/xmmintrin.h @@ -480,6 +489,7 @@ llvm%%LLVM_SUFFIX%%/lib/libclangStaticAn llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a man/man1/clang%%LLVM_SUFFIX%%.1.gz +man/man1/scan-build%%LLVM_SUFFIX%%.1.gz %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps