Date: Tue, 19 May 2015 14:18:31 +0000 (UTC) From: John Marino <marino@FreeBSD.org> 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 Message-ID: <201505191418.t4JEIVKN074480@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505191418.t4JEIVKN074480>