From owner-svn-ports-all@FreeBSD.ORG Tue May 19 14:18:33 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 412768FC; Tue, 19 May 2015 14:18:33 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22684119E; Tue, 19 May 2015 14:18:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4JEIXtN074488; Tue, 19 May 2015 14:18:33 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4JEIVKN074480; Tue, 19 May 2015 14:18:31 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201505191418.t4JEIVKN074480@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 19 May 2015 14:18:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386779 - in head/lang: clang-devel clang33 clang34 clang35 clang36 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.20 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, 19 May 2015 14:18:33 -0000 Author: marino Date: Tue May 19 14:18:31 2015 New Revision: 386779 URL: https://svnweb.freebsd.org/changeset/ports/386779 Log: lang/clang3*, lang/clang-devel: set environment during build The clang ports override the default build target, but the new targets fail to set the environment like the default target does. This patch passes MAKE_ENV to environment. It also combines compounds to a single make cmd and unsuppresses the commands so the output shows on the build logs. PR: 199500 Submitted by: marino Approved by: brooks (maintainer) Modified: head/lang/clang-devel/Makefile head/lang/clang33/Makefile head/lang/clang34/Makefile head/lang/clang35/Makefile head/lang/clang36/Makefile Modified: head/lang/clang-devel/Makefile ============================================================================== --- head/lang/clang-devel/Makefile Tue May 19 14:18:25 2015 (r386778) +++ head/lang/clang-devel/Makefile Tue May 19 14:18:31 2015 (r386779) @@ -140,10 +140,11 @@ pre-build: ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/utils/unittest post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man html ps + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools man html ps post-install: ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Tue May 19 14:18:25 2015 (r386778) +++ head/lang/clang33/Makefile Tue May 19 14:18:31 2015 (r386779) @@ -126,11 +126,13 @@ pre-build: ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/utils/unittest post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools man + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools html ps post-install: ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so Modified: head/lang/clang34/Makefile ============================================================================== --- head/lang/clang34/Makefile Tue May 19 14:18:25 2015 (r386778) +++ head/lang/clang34/Makefile Tue May 19 14:18:31 2015 (r386779) @@ -123,11 +123,13 @@ pre-build: ${LN} -sf ${LLVM_PREFIX}/lib/${LIBNAME} ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/utils/unittest post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools man + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools html ps post-install: ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so Modified: head/lang/clang35/Makefile ============================================================================== --- head/lang/clang35/Makefile Tue May 19 14:18:25 2015 (r386778) +++ head/lang/clang35/Makefile Tue May 19 14:18:31 2015 (r386779) @@ -122,11 +122,13 @@ pre-build: ${LN} -sf ${LLVM_PREFIX}/lib/${LIBNAME} ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/utils/unittest post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools man + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools html ps post-install: ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so Modified: head/lang/clang36/Makefile ============================================================================== --- head/lang/clang36/Makefile Tue May 19 14:18:25 2015 (r386778) +++ head/lang/clang36/Makefile Tue May 19 14:18:31 2015 (r386779) @@ -125,11 +125,13 @@ pre-build: ${LN} -sf ${LLVM_PREFIX}/lib/${LIBNAME} ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/utils/unittest post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man - @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools man + ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} -C ${WRKSRC}/tools/clang/docs/tools html ps post-install: ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so