CVS commit: pkgsrc/lang/llvm

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri May  5 21:46:50 UTC 2017

Modified Files:
        pkgsrc/lang/llvm: Makefile

Log Message:
Synchronize llvm/Makefile with pkgsrc-wip/llvm-git/Makefile

There shouldn't be functional change in produced binary package.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/llvm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.20 pkgsrc/lang/llvm/Makefile:1.21
--- pkgsrc/lang/llvm/Makefile:1.20      Fri May  5 18:12:24 2017
+++ pkgsrc/lang/llvm/Makefile   Fri May  5 21:46:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/05/05 18:12:24 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2017/05/05 21:46:50 kamil Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -30,8 +30,8 @@ CONFIGURE_DIRS=               ${WRKDIR}/build
 CMAKE_ARG_PATH=                ${WRKSRC}
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=g++
+CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_ARGS+=   -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
 CMAKE_ARGS+=   -DLLVM_BUILD_LLVM_DYLIB=ON
 CMAKE_ARGS+=   -DLLVM_INSTALL_UTILS=ON
@@ -42,44 +42,23 @@ CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr
 CHECK_PORTABILITY_SKIP=        utils/buildit/build_llvm
 
 # XXX perl is not added as a tool as it does not seem to be required
-REPLACE_PERL+=         utils/GenLibDeps.pl
-REPLACE_PERL+=         utils/UpdateCMakeLists.pl
+REPLACE_PERL+=         utils/*.pl
 REPLACE_PERL+=         utils/codegen-diff
-REPLACE_PERL+=         utils/findsym.pl
 REPLACE_PERL+=         utils/llvm-native-gxx
-REPLACE_PERL+=         utils/test_debuginfo.pl
 
-REPLACE_PYTHON+=       examples/Kaleidoscope/MCJIT/cached/genk-timing.py
-REPLACE_PYTHON+=       examples/Kaleidoscope/MCJIT/cached/split-lib.py
-REPLACE_PYTHON+=       examples/Kaleidoscope/MCJIT/complete/genk-timing.py
-REPLACE_PYTHON+=       examples/Kaleidoscope/MCJIT/complete/split-lib.py
-REPLACE_PYTHON+=       examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
-REPLACE_PYTHON+=       test/BugPoint/compile-custom.ll.py
-REPLACE_PYTHON+=       test/tools/llvm-readobj/Inputs/relocs.py
+REPLACE_PYTHON+=       *.py
+REPLACE_PYTHON+=       */*.py
+REPLACE_PYTHON+=       */*/*.py
+REPLACE_PYTHON+=       */*/*/*.py
+REPLACE_PYTHON+=       */*/*/*/*.py
 REPLACE_PYTHON+=       utils/Misc/zkill
-REPLACE_PYTHON+=       utils/Target/ARM/analyze-match-table.py
 REPLACE_PYTHON+=       utils/bisect
 REPLACE_PYTHON+=       utils/clang-parse-diagnostics-file
-REPLACE_PYTHON+=       utils/create_ladder_graph.py
 REPLACE_PYTHON+=       utils/git/find-rev
-REPLACE_PYTHON+=       utils/lint/common_lint.py
-REPLACE_PYTHON+=       utils/lint/cpp_lint.py
-REPLACE_PYTHON+=       utils/lint/generic_lint.py
-REPLACE_PYTHON+=       utils/lit/lit.py
-REPLACE_PYTHON+=       utils/lit/lit/ProgressBar.py
-REPLACE_PYTHON+=       utils/lit/lit/main.py
 REPLACE_PYTHON+=       utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest
 REPLACE_PYTHON+=       utils/llvm-build/llvm-build
 REPLACE_PYTHON+=       utils/llvm-compilers-check
 REPLACE_PYTHON+=       utils/llvm-lit/llvm-lit.in
-REPLACE_PYTHON+=       utils/release/findRegressions-nightly.py
-REPLACE_PYTHON+=       utils/release/findRegressions-simple.py
-REPLACE_PYTHON+=       utils/schedcover.py
-REPLACE_PYTHON+=       utils/shuffle_fuzz.py
-REPLACE_PYTHON+=       utils/sort_includes.py
-REPLACE_PYTHON+=       utils/testgen/mc-bundling-x86-gen.py
-REPLACE_PYTHON+=       utils/update_llc_test_checks.py
-REPLACE_PYTHON+=       utils/wciia.py
 
 TEST_TARGET=           check
 TEST_ENV+=             LD_LIBRARY_PATH=${WRKDIR}/build/lib