libLLVM38: Update install prefixes and PLIST

Avoids conflicts with lang/LLVM

libLLVM38: Bump PKGREVISION since PLIST has been changed

libLLVM38/Makefile

@@ -12,6 +12,7 @@ CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
 #MASTER_SITES=	http://llvm.org/pre-releases/3.8.0/rc2/
 EXTRACT_SUFX=	.tar.xz
+PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://llvm.org/
@@ -29,7 +30,23 @@ CMAKE_ARG_PATH=		${WRKSRC}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
-CMAKE_ARGS+=	-DLLVM_INSTALL_UTILS=ON
+CMAKE_ARGS+=	-DLLVM_INCLUDE_UTILS=OFF
+CMAKE_ARGS+=	-DLLVM_INSTALL_UTILS=OFF
+CMAKE_ARGS+=	-DLLVM_INCLUDE_TESTS=OFF
+
+.for tool in 	bugpoint bugpoint_passes dsymutil gold llc lli llvm_ar	\
+	llvm_as llvm_as_fuzzer llvm_bcanalyzer llvm_c_test llvm_cat	\
+	llvm_cov llvm_cxxdump llvm_cxxfilt llvm_diff llvm_dis		\
+	llvm_dwarfdump llvm_dwp llvm_extract llvm_go llvm_jitlistener	\
+	llvm_link llvm_lto llvm_lto2 llvm_mc llvm_mc_fuzzer		\
+	llvm_mcmarkup llvm_modextract llvm_nm llvm_objdump		\
+	llvm_opt_report llvm_pdbdump llvm_profdata llvm_readobj		\
+	llvm_rtdyld llvm_size llvm_split llvm_stress llvm_strings	\
+	llvm_symbolizer llvm_xray lto msbuild obj2yaml opt sancov	\
+	sanstats verify_uselistorder xcode_toolchain yaml2obj
+
+CMAKE_ARGS+=	-DLLVM_TOOL_${tool:tu}_BUILD=OFF
+.endfor
 
 CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 

libLLVM38/distinfo

@@ -4,6 +4,9 @@ SHA1 (llvm-3.8.1.src.tar.xz) = e0c48c4c182424b99999367d688cd8ce7876827b
 RMD160 (llvm-3.8.1.src.tar.xz) = 5e4d2193e7d58abaa70ab53e67b6fe058b781e6a
 SHA512 (llvm-3.8.1.src.tar.xz) = 99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366
 Size (llvm-3.8.1.src.tar.xz) = 16551472 bytes
-SHA1 (patch-cmake_modules_AddLLVM.cmake) = ec89e9469115b22feeb106e1c36b36af1f079576
+SHA1 (patch-CMakeLists.txt) = baed04f8bdbb130858714b1e5817a463381a9fc9
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = 9576729dbc7f8263c3ad879786b51187aaad0fd2
+SHA1 (patch-cmake_modules_CMakeLists.txt) = 539612937a2b5658e45ef010633d3bade1029a22
+SHA1 (patch-cmake_modules_TableGen.cmake) = b9630a10f268d64e2212a93adc416a965d7adb22
 SHA1 (patch-include_llvm_IR_ValueMap.h) = 8d8fdde528099d0860e810a25c001727cbee6906
 SHA1 (patch-include_llvm_Support_Host.h) = 55a9fab6ee49ec09a2fd644747a6dddd6b39f942

libLLVM38/patches/patch-CMakeLists.txt

@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2016-03-28 18:13:48.000000000 +0000
++++ CMakeLists.txt
+@@ -728,7 +728,7 @@ add_subdirectory(cmake/modules)
+ 
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   install(DIRECTORY include/llvm include/llvm-c
+-    DESTINATION include
++    DESTINATION include/libLLVM38
+     COMPONENT llvm-headers
+     FILES_MATCHING
+     PATTERN "*.def"
+@@ -740,7 +740,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+     )
+ 
+   install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm
+-    DESTINATION include
++    DESTINATION include/libLLVM38
+     COMPONENT llvm-headers
+     FILES_MATCHING
+     PATTERN "*.def"

libLLVM38/patches/patch-cmake_modules_AddLLVM.cmake

@@ -17,3 +17,45 @@ Don't use non-portable -z discard-unused on SunOS.
        elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD)
          # Object files are compiled with -ffunction-data-sections.
          # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks
+@@ -546,7 +546,7 @@ macro(add_llvm_library name)
+     set_target_properties( ${name} PROPERTIES EXCLUDE_FROM_ALL ON)
+   elseif(NOT _is_gtest)
+     if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO")
+-      set(install_dir lib${LLVM_LIBDIR_SUFFIX})
++	    set(install_dir lib/libLLVM38)
+       if(ARG_SHARED OR BUILD_SHARED_LIBS)
+         if(WIN32 OR CYGWIN OR MINGW)
+           set(install_type RUNTIME)
+@@ -590,12 +590,12 @@ macro(add_llvm_loadable_module name)
+           # DLL platform
+           set(dlldir "bin")
+         else()
+-          set(dlldir "lib${LLVM_LIBDIR_SUFFIX}")
++		set(dlldir "lib/libLLVM38")
+         endif()
+         install(TARGETS ${name}
+           EXPORT LLVMExports
+           LIBRARY DESTINATION ${dlldir}
+-          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
++	  ARCHIVE DESTINATION libLLVM38)
+       endif()
+       set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
+     endif()
+@@ -702,7 +702,7 @@ macro(add_llvm_tool name)
+     if( LLVM_BUILD_TOOLS )
+       install(TARGETS ${name}
+               EXPORT LLVMExports
+-              RUNTIME DESTINATION bin
++	      RUNTIME DESTINATION libexec/libLLVM38
+               COMPONENT ${name})
+ 
+       if (NOT CMAKE_CONFIGURATION_TYPES)
+@@ -738,7 +738,7 @@ macro(add_llvm_utility name)
+   set_target_properties(${name} PROPERTIES FOLDER "Utils")
+   if( LLVM_INSTALL_UTILS )
+     install (TARGETS ${name}
+-      RUNTIME DESTINATION bin
++	    RUNTIME DESTINATION libexec/libLLVM38
+       COMPONENT ${name})
+     if (NOT CMAKE_CONFIGURATION_TYPES)
+       add_custom_target(install-${name}

libLLVM38/patches/patch-cmake_modules_CMakeLists.txt

@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- cmake/modules/CMakeLists.txt.orig	2014-12-29 11:16:19.000000000 +0000
++++ cmake/modules/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-set(LLVM_INSTALL_PACKAGE_DIR share/llvm/cmake)
++set(LLVM_INSTALL_PACKAGE_DIR share/libLLVM38/cmake)
+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ get_property(LLVM_EXPORTS GLOBAL PROPERTY LLVM_EXPORTS)

libLLVM38/patches/patch-cmake_modules_TableGen.cmake

@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- cmake/modules/TableGen.cmake.orig	2015-10-23 19:48:17.000000000 +0000
++++ cmake/modules/TableGen.cmake
+@@ -138,10 +138,10 @@ macro(add_tablegen target project)
+       set_target_properties(${target} PROPERTIES LINK_FLAGS -Wl,--stack,16777216)
+     endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
+   endif( MINGW )
+-  if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
++  if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND false)
+     install(TARGETS ${target}
+             EXPORT LLVMExports
+             RUNTIME DESTINATION bin)
+   endif()
+-  set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target})
++  #set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target})
+ endmacro()