summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2024-01-02 14:27:27 +0100
committerSlávek Banko <slavek.banko@axis.cz>2024-01-02 19:19:16 +0100
commitcb114d7c7a492f3153465efbfad2d22551da8a1a (patch)
treeb10add76947127846dcea7245908547f28375668
parentb652e694f6654387a22bce26b3aa72f13c3abd4c (diff)
downloadtde-packaging-cb114d7c7a492f3153465efbfad2d22551da8a1a.tar.gz
tde-packaging-cb114d7c7a492f3153465efbfad2d22551da8a1a.zip
DEB sip4-tqt: Prefer dist-packages folder for a particular version of Python before shared.
Use sysconfig instead of distutil to detect paths. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 3e3beab0c7e44d8886f9251612856311d2cd8a89)
-rwxr-xr-xdebian/_base/dependencies/sip4-tqt/debian/rules10
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py4
-rwxr-xr-xdilos/dependencies/sip4-tqt/debian/rules10
-rw-r--r--dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py4
-rwxr-xr-xubuntu/_base/dependencies/sip4-tqt/debian/rules10
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py4
6 files changed, 27 insertions, 15 deletions
diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules
index 346d81ca0..7050c5431 100755
--- a/debian/_base/dependencies/sip4-tqt/debian/rules
+++ b/debian/_base/dependencies/sip4-tqt/debian/rules
@@ -115,11 +115,11 @@ install-arch-3.%:
install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py
install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py
install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py
- mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
- mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
- debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
+ mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/
+ mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \
+ debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h
mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
index 5aa6d22c1..a937df69a 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
+++ b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
@@ -1,6 +1,10 @@
# import the sip_tqt_config.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:
diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules
index 2acbad3d6..9f54ca009 100755
--- a/dilos/dependencies/sip4-tqt/debian/rules
+++ b/dilos/dependencies/sip4-tqt/debian/rules
@@ -119,11 +119,11 @@ install-arch-3.%:
install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py
install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py
# install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py
- mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
-# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
-# ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
-# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
+ mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/
+# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')
+# ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \
+# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h
mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
index 5aa6d22c1..a937df69a 100644
--- a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
+++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
@@ -1,6 +1,10 @@
# import the sip_tqt_config.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:
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 346d81ca0..7050c5431 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -115,11 +115,11 @@ install-arch-3.%:
install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py
install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py
install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py
- mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
- mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
- debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
+ mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/
+ mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \
+ debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h
mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
index 5aa6d22c1..a937df69a 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
@@ -1,6 +1,10 @@
# import the sip_tqt_config.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: