CVS commit: pkgsrc/lang/libLLVM

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 10:33:41 UTC 2023

Modified Files:
        pkgsrc/lang/libLLVM: Makefile PLIST

Log Message:
lang/libLLVM: Need Python as tool, and llvm-tblgen too if cross-compiling.

Unlike many of my other recent changes, this does affect native builds,
not just cross builds -- but only to install an llvm-tblgen executable,
which is already built in native builds anyway, so that it can be used
as a tool for cross builds.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/libLLVM/PLIST

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

Modified files:

Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.45 pkgsrc/lang/libLLVM/Makefile:1.46
--- pkgsrc/lang/libLLVM/Makefile:1.45   Tue Jan 24 23:37:27 2023
+++ pkgsrc/lang/libLLVM/Makefile        Tue Jun 27 10:33:41 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2023/01/24 23:37:27 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2023/06/27 10:33:41 riastradh Exp $
 
 DISTNAME=      llvm-13.0.1.src
 PKGNAME=       ${DISTNAME:S/llvm/libLLVM/:S/.src//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=llvm/}
 GITHUB_PROJECT=        llvm-project
@@ -16,7 +16,7 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES=         c c++11
 GCC_REQD+=             5
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY= tool
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -29,7 +29,8 @@ CMAKE_ARGS+=  -DLLVM_INSTALL_UTILS=OFF
 CMAKE_ARGS+=   -DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=   -DLLVM_INCLUDE_TESTS=OFF
 CMAKE_ARGS+=   -DLLVM_ENABLE_LIBXML2=OFF
-CMAKE_ARGS+=   -DLLVM_BUILD_UTILS=OFF
+CMAKE_ARGS+=   -DLLVM_BUILD_UTILS=ON # for llvm-tblgen
+CMAKE_ARGS+=   -DLLVM_TOOLS_INSTALL_DIR=${PREFIX}/libexec/libLLVM
 CMAKE_ARGS+=   -DLLVM_INCLUDE_BENCHMARKS=OFF
 CMAKE_ARGS+=   -DLLVM_ENABLE_RTTI=ON
 CMAKE_ARGS+=   -DCMAKE_EXE_LINKER_FLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM
@@ -89,6 +90,11 @@ TEST_ENV+=           LD_LIBRARY_PATH=${WRKSRC}/${
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+TOOL_DEPENDS+= ${PKGNAME}:../../${PKGPATH}
+CMAKE_ARGS+=   -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/libexec/libLLVM/llvm-tblgen
+.endif
+
 # 7.0.1 -> 7.0
 #LLVM_MAJOR_MINOR=     ${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/}
 # 7.0.1 -> 7

Index: pkgsrc/lang/libLLVM/PLIST
diff -u pkgsrc/lang/libLLVM/PLIST:1.14 pkgsrc/lang/libLLVM/PLIST:1.15
--- pkgsrc/lang/libLLVM/PLIST:1.14      Sun Mar 13 15:22:32 2022
+++ pkgsrc/lang/libLLVM/PLIST   Tue Jun 27 10:33:41 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2022/03/13 15:22:32 tnn Exp $
+@comment $NetBSD: PLIST,v 1.15 2023/06/27 10:33:41 riastradh Exp $
 include/libLLVM/llvm-c/Analysis.h
 include/libLLVM/llvm-c/BitReader.h
 include/libLLVM/llvm-c/BitWriter.h
@@ -1666,6 +1666,7 @@ ${PLIST.notdylib}lib/libLLVM/libLLVM-${L
 ${PLIST.notdylib}lib/libLLVM/libLLVM-${PKGVERSION}.${SOEXT}
 lib/libLLVM/libLLVM.${SOEXT}
 libexec/libLLVM/llvm-config
+libexec/libLLVM/llvm-tblgen
 share/libLLVM/cmake/AddLLVM.cmake
 share/libLLVM/cmake/AddLLVMDefinitions.cmake
 share/libLLVM/cmake/AddOCaml.cmake