summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/libraries/pytde
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2024-01-28 11:05:00 +0100
committerSlávek Banko <slavek.banko@axis.cz>2024-01-31 13:07:33 +0100
commit639b8c3e80778124458d61ba546a16d1c7661b3d (patch)
treee374202929c748cfeff0feb304e7d9fcb74b2abe /ubuntu/_base/libraries/pytde
parent72f1328d206e603f47a6afc3085e483474189c48 (diff)
downloadtde-packaging-639b8c3e80778124458d61ba546a16d1c7661b3d.tar.gz
tde-packaging-639b8c3e80778124458d61ba546a16d1c7661b3d.zip
DEB pytde: Fix support for multiple Python3 installed in parallel.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu/_base/libraries/pytde')
-rw-r--r--ubuntu/_base/libraries/pytde/debian/pytdeconfig.py8
-rwxr-xr-xubuntu/_base/libraries/pytde/debian/rules2
2 files changed, 8 insertions, 2 deletions
diff --git a/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
index 4536b9ff5..c12c20788 100644
--- a/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
+++ b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
@@ -1,11 +1,17 @@
# import the sipconfig.py for the normal or the debug build
+import os
import sys
+import sysconfig
+
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages'))
if 'd' in sys.abiflags:
try:
from pytdeconfig_d import *
+ from pytdeconfig_d import _pkg_config, _default_macros
except ImportError as msg:
- raise ImportError('No module named pytdeconfig; package python-trinity-dbg not installed')
+ raise ImportError('No module named pytdeconfig; package python3-pytde-dbg not installed')
else:
from pytdeconfig_nd import *
+ from pytdeconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/libraries/pytde/debian/rules b/ubuntu/_base/libraries/pytde/debian/rules
index bd0d34271..7f50df023 100755
--- a/ubuntu/_base/libraries/pytde/debian/rules
+++ b/ubuntu/_base/libraries/pytde/debian/rules
@@ -114,7 +114,7 @@ install-indep:
dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$'
for version in ${PYTHONS};\
do\
- pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\
+ pylib=$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))");\
mkdir -p debian/pytde-dev/$$pylib;\
install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\
install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\