Skip to content
Snippets Groups Projects
Unverified Commit 6d979d74 authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

Rebase python interpreter patch

parent 039918d5
No related branches found
No related tags found
1 merge request!123Turris OS 5.0 (HBK)
From 13c5d314410b44543d9c5dad16cc995dfc6757f6 Mon Sep 17 00:00:00 2001
From 412d2785bb3be65045043e78a99faac24bc3d5e1 Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Mon, 27 Aug 2018 12:29:49 +0200
Subject: [PATCH 10/12] pythons: intepreter in scripts fix
Subject: [PATCH] pythons: intepreter in scripts fix
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
---
......@@ -10,10 +10,10 @@ Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk
index 66a4929..5d48709 100644
index 9990d53..f86b6a3 100644
--- a/lang/python/python-package.mk
+++ b/lang/python/python-package.mk
@@ -97,7 +97,6 @@ define Build/Compile/HostPyRunTarget
@@ -96,7 +96,6 @@ define Build/Compile/HostPyRunTarget
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON_INC_DIR)" \
LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)" \
_PYTHON_HOST_PLATFORM=linux2 \
......@@ -21,9 +21,9 @@ index 66a4929..5d48709 100644
$(3) \
, \
$(2) \
@@ -119,6 +118,16 @@ endef
PYTHON_PKG_SETUP_ARGS:=--single-version-externally-managed
PYTHON_PKG_SETUP_VARS:=
@@ -118,6 +117,16 @@ PYTHON_PKG_SETUP_DIR ?=
PYTHON_PKG_SETUP_ARGS ?= --single-version-externally-managed
PYTHON_PKG_SETUP_VARS ?=
+define python_fix_interpreter_paths
+ # iterate files and if the first line contains path to host python interpreter
......@@ -47,10 +47,10 @@ index 66a4929..5d48709 100644
PyBuild/Compile=$(PyBuild/Compile/Default)
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 9e473b5..7f47370 100644
index e52a152..5cdc456 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -96,7 +96,6 @@ define Build/Compile/HostPy3RunTarget
@@ -95,7 +95,6 @@ define Build/Compile/HostPy3RunTarget
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \
LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \
_PYTHON_HOST_PLATFORM=linux2 \
......@@ -58,9 +58,9 @@ index 9e473b5..7f47370 100644
$(3) \
, \
$(2) \
@@ -118,6 +117,16 @@ endef
PYTHON3_PKG_SETUP_ARGS:=--single-version-externally-managed
PYTHON3_PKG_SETUP_VARS:=
@@ -117,6 +116,16 @@ PYTHON3_PKG_SETUP_DIR ?=
PYTHON3_PKG_SETUP_ARGS ?= --single-version-externally-managed
PYTHON3_PKG_SETUP_VARS ?=
+define python3_fix_interpreter_paths
+ # iterate files and if the first line contains path to host python interpreter
......@@ -91,5 +91,5 @@ index 9e473b5..7f47370 100644
define Build/Compile
$(call Py3Build/Compile)
--
2.19.1
2.20.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment