From owner-svn-ports-head@freebsd.org Thu Jul 30 18:45:56 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA72E9AB5F8; Thu, 30 Jul 2015 18:45:55 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2BFD1EFF; Thu, 30 Jul 2015 18:45:55 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6UIjtUQ073767; Thu, 30 Jul 2015 18:45:55 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6UIjs1b073763; Thu, 30 Jul 2015 18:45:54 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201507301845.t6UIjs1b073763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 30 Jul 2015 18:45:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393254 - in head/devel: llvm-devel llvm37 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 18:45:56 -0000 Author: brooks Date: Thu Jul 30 18:45:53 2015 New Revision: 393254 URL: https://svnweb.freebsd.org/changeset/ports/393254 Log: Fix plist when WITH_DEBUG=1 is set. Submitted by: kwm Differential Revision: https://reviews.freebsd.org/D3196 Modified: head/devel/llvm-devel/Makefile head/devel/llvm-devel/pkg-plist head/devel/llvm37/Makefile head/devel/llvm37/pkg-plist Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Thu Jul 30 17:47:45 2015 (r393253) +++ head/devel/llvm-devel/Makefile Thu Jul 30 18:45:53 2015 (r393254) @@ -248,7 +248,8 @@ build-plist: ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ - -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \ + -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ + -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \ Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Thu Jul 30 17:47:45 2015 (r393253) +++ head/devel/llvm-devel/pkg-plist Thu Jul 30 18:45:53 2015 (r393254) @@ -2403,7 +2403,7 @@ llvm-devel/share/llvm/cmake/HandleLLVMSt llvm-devel/share/llvm/cmake/LLVM-Config.cmake llvm-devel/share/llvm/cmake/LLVMConfig.cmake llvm-devel/share/llvm/cmake/LLVMConfigVersion.cmake -llvm-devel/share/llvm/cmake/LLVMExports-release.cmake +llvm-devel/share/llvm/cmake/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake llvm-devel/share/llvm/cmake/LLVMExports.cmake llvm-devel/share/llvm/cmake/LLVMProcessSources.cmake llvm-devel/share/llvm/cmake/TableGen.cmake Modified: head/devel/llvm37/Makefile ============================================================================== --- head/devel/llvm37/Makefile Thu Jul 30 17:47:45 2015 (r393253) +++ head/devel/llvm37/Makefile Thu Jul 30 18:45:53 2015 (r393254) @@ -244,14 +244,12 @@ build-plist: ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ - -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \ + -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ + -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \ ${SORT} >> ${PLIST}.tmp -# ${FIND} ${STAGEDIR}${DOCSDIR} -type f | \ -# ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \ -# ${SORT} >> ${PLIST}.tmp awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} print}' ${PLIST}.tmp >> ${PLIST} ${RM} -f ${PLIST}.tmp Modified: head/devel/llvm37/pkg-plist ============================================================================== --- head/devel/llvm37/pkg-plist Thu Jul 30 17:47:45 2015 (r393253) +++ head/devel/llvm37/pkg-plist Thu Jul 30 18:45:53 2015 (r393254) @@ -2402,7 +2402,7 @@ llvm37/share/llvm/cmake/HandleLLVMStdlib llvm37/share/llvm/cmake/LLVM-Config.cmake llvm37/share/llvm/cmake/LLVMConfig.cmake llvm37/share/llvm/cmake/LLVMConfigVersion.cmake -llvm37/share/llvm/cmake/LLVMExports-release.cmake +llvm37/share/llvm/cmake/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake llvm37/share/llvm/cmake/LLVMExports.cmake llvm37/share/llvm/cmake/LLVMProcessSources.cmake llvm37/share/llvm/cmake/TableGen.cmake