pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/llvm



Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Jan 20 14:27:22 UTC 2025

Modified Files:
        pkgsrc/lang/llvm: Makefile

Log Message:
lang/llvm: Fix Python dependency.

This ships a script llvm-lit with a Python interpreter baked into it
now, so Python is no longer tool-only.  Hack around the #! line for
cross-builds when PYTHONBIN != TOOL_PYTHONBIN.

If the intent is to ship llvm without a runtime Python dependency, we
either need to nix llvm-lit or split it into a separate package.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 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.102 pkgsrc/lang/llvm/Makefile:1.103
--- pkgsrc/lang/llvm/Makefile:1.102     Thu Nov 14 22:20:28 2024
+++ pkgsrc/lang/llvm/Makefile   Mon Jan 20 14:27:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2024/11/14 22:20:28 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2025/01/20 14:27:22 riastradh Exp $
 #
 # When updating this, please also update:
 # devel/include-what-you-use
@@ -23,7 +23,7 @@
 # Always update all */buildlink3.mk to require the latest stable release
 # version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility.
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "version.mk"
 
 DISTNAME=      llvm-${LLVM_VERSION}.src
@@ -38,7 +38,7 @@ LICENSE=      apache-2.0
 USE_CXX_FEATURES=      c++14
 USE_LANGUAGES=         c c++
 GCC_REQD+=             7
-PYTHON_FOR_BUILD_ONLY= tool
+PYTHON_FOR_BUILD_ONLY= no
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -85,6 +85,14 @@ LDFLAGS.SunOS+=              -lsocket -lnsl
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+# Fix the runtime Python path.
+SUBST_CLASSES+=                python
+SUBST_STAGE.python=    post-build
+SUBST_FILES.python=    ${CMAKE_BUILD_DIR}/bin/llvm-lit
+SUBST_SED.python+=     '1s,\#!.*python.*,\#!${PYTHONBIN},'
+.endif
+
 PLIST_VARS+=   notdylib
 .if ${SHLIB_TYPE} == "dylib"
 SOEXT=         dylib



Home | Main Index | Thread Index | Old Index