Skip to content

Commit

Permalink
Make colcon python package builds use correct shebang for merge installs
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Street <stephen@redrocketcomputing.com>
  • Loading branch information
sgstreet committed Oct 3, 2024
1 parent 2734272 commit 6c93749
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/colcon_core/task/python/build.py b/colcon_core/task/python/build.py
index 7181d20..eb82058 100644
--- a/colcon_core/task/python/build.py
+++ b/colcon_core/task/python/build.py
@@ -73,7 +73,7 @@ class PythonBuildTask(TaskExtensionPoint):
os.path.realpath(args.build_base),
os.path.realpath(args.path)),
'build', '--build-base', os.path.join(
- args.build_base, 'build'),
+ args.build_base, 'build'), '--executable', '/usr/bin/env python3',
'install', '--prefix', args.install_base,
'--record', os.path.join(args.build_base, 'install.log'),
# prevent installation of dependencies specified in setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://setup.cfg;beginline=22;endline=22;md5=3d0bd1ac53c1dd5

SRC_URI += "file://0001-Remove-optional-pytest-dependencies.patch \
file://0002-Fix-regression-when-enitre-workspace-is-symlinked.patch \
file://0003-Force-shebang-to-usr-bin-env-python3.patch \
"
SRC_URI[sha256sum] = "fc14534b2ce745fcc332afc0bb0ddf3e45d5d69c15da15b9471cfb7b0b9edbe9"

Expand Down

0 comments on commit 6c93749

Please sign in to comment.